Rollup of 5 pull requests #97989
Merged
Rollup of 5 pull requests #97989
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…al-path=no` The test relies on library/std/src/error.rs not corresponding to a local path, but remapping might still find the related local file of a remapped path. To fix the test, this adds a new -Z flag to disable finding the corresponding local path of a remapped path.
validating the vtable can lead to Stacked Borrows errors Fixes rust-lang/miri#2123
…r=cjgillot Fix rust-lang#71363's test by adding `-Z translate-remapped-path-to-local-path=no` The test relies on `library/std/src/error.rs` not corresponding to a local path, but remapping might still find the related local file of a remapped path. To fix the test, this PR adds a new `-Z` flag to disable finding the corresponding local path of a remapped path.
…r-id, r=nikomatsakis Wrap `HirId`s of locals into `LocalVarId`s for THIR nodes This is the first effort to decouple `HirId`s from THIR. `HirId` is not very relevant in building THIR and MIR. Based on the changeset, I think there are a few other pending refactoring that we could perform after this, in case we want to eliminate use of `HirId` in THIR. - `TypeckResults::closure_min_captures` could be remapped from the variable `HirId`s to `LocalVarId` while the THIR is getting built. - Use of `ScopeTree::var_scope` could be eliminated as well, since we will consider deprecating `ScopeTree` in the future.
Fix typos in Provider API docs
…acro, r=Dylan-DPC remove an unnecessary `String`
rustbot
added
T-compiler
|
@bors r+ rollup=never p=5 |
|
📌 Commit b3c9a2f has been approved by |
bors
added
the
S-waiting-on-bors
|
⌛ Testing commit b3c9a2f with merge 9599982dfac048670a6828e86237ae9cf8e85af0... |
|
💔 Test failed - checks-actions |
bors
added
S-waiting-on-review
|
@bors retry (spurious) |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
|
Finished benchmarking commit (85a26a9): comparison url. Instruction count
Max RSS (memory usage)Results
CyclesThis benchmark run did not return any relevant results for this metric. If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf. @rustbot label: -perf-regression Footnotes |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Successful merges:
-Z translate-remapped-path-to-local-path=no#97789 (Fix Regression in spacing of left margin in diagnostics #71363's test by adding-Z translate-remapped-path-to-local-path=no)HirIds of locals intoLocalVarIds for THIR nodes #97913 (WrapHirIds of locals intoLocalVarIds for THIR nodes)String#97987 (remove an unnecessaryString)Failed merges:
r? @ghost
@rustbot modify labels: rollup
Create a similar rollup