Rollup of 4 pull requests #151158
Merged
Rollup of 4 pull requests #151158
+557
−439
Conversation
This file contains hidden or 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
But still keep it report-in-deps. To revert after ~February 27 2026, when Rust 1.95 branches out from the main branch.
include `HirId`s directly in the THIR, not wrapped in `LintLevel`s Occurrences of `LintLevel` in the THIR were always `LintLevel::Explicit`, containing a `HirId`, so we don't need to make it possible to put `LintLevel::Inherited` there. Removing the unused case where `HirId`s aren't present in the THIR slightly simplifies diagnostics/lints/tools that want to map from the THIR back to the HIR, e.g. rust-lang#145569. Since `LintLevel` is no longer present in the THIR, I've moved it in the second commit to live in `rustc_mir_build`; that's where it's actually used. I'm not sure exactly where exactly it should live there, but I put it in the `builder::scope` module since it's used by `Builder::in_scope` for determining when to introduce source scopes. r? lcnr as the reviewer of rust-lang#145569, since this was discussed there
Avoid ICEs after bad patterns, for the other syntactic variants This PR introduces changes equivalent to the ones in rust-lang#126320, but also for struct and tuple patterns, instead of tuple struct patterns only. Fixes rust-lang#150507.
…enkov mir_build: Simplify length-determination and indexing for array/slice patterns The existing length-determination code in `prefix_slice_suffix` has ended up overly complicated, partly because it doesn't know in advance whether the pattern is supposed to be an array pattern or a slice pattern. Pulling most of that step out into the `PatKind::Array` arm makes the whole thing a bit nicer overall. There should (hopefully) be no change to compiler output. The biggest “functional” change is that we now discard the subpatterns of an array pattern of unknowable length, instead of treating it as a slice pattern. I'm not aware of any way for this to make an observable difference, and it can only occur when compilation is already doomed to fail.
resolve: Downgrade `ambiguous_glob_imports` to warn-by-default But still keep it report-in-deps, as decided in rust-lang#149845 (comment). This will need to be reverted after ~February 27 2026, when Rust 1.95 branches out from the main branch. Closes rust-lang#149845.
rustbot
added
S-waiting-on-review
Member
Author
|
Rollup of everything. @bors r+ rollup=never p=5 |
Contributor
rust-bors
bot
added
S-waiting-on-bors
This comment has been minimized.
This comment has been minimized.
rust-bors
bot
added
merged-by-bors
Contributor
Collaborator
|
📌 Perf builds for each rolled up PR:
previous master: a6acf0f07f In the case of a perf regression, run the following command for each PR you suspect might be the cause: |
Contributor
What is this?This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.Comparing a6acf0f (parent) -> 7704328 (this PR) Test differencesShow 52 test diffs52 doctest diffs were found. These are ignored, as they are noisy. Test dashboardRun cargo run --manifest-path src/ci/citool/Cargo.toml -- \
test-dashboard 7704328ba5ae8d6ce0ac303c9d5a1a1605906766 --output-dir test-dashboardAnd then open Job duration changes
How to interpret the job duration changes?Job durations can vary a lot, based on the actual runner instance |
This was referenced Jan 15, 2026
Collaborator
|
Finished benchmarking commit (7704328): comparison URL. Overall result: ✅ improvements - no action needed@rustbot label: -perf-regression Instruction countOur most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.
Max RSS (memory usage)This benchmark run did not return any relevant results for this metric. CyclesResults (primary -2.5%, secondary 2.7%)A less reliable metric. May be of interest, but not used to determine the overall result above.
Binary sizeThis benchmark run did not return any relevant results for this metric. Bootstrap: 473.873s -> 471.886s (-0.42%) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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:
HirIds directly in the THIR, not wrapped inLintLevels #150846 (includeHirIds directly in the THIR, not wrapped inLintLevels)ambiguous_glob_importsto warn-by-default #151130 (resolve: Downgradeambiguous_glob_importsto warn-by-default)r? @ghost
Create a similar rollup