Rollup of 4 pull requests #151192
Closed
Rollup of 4 pull requests #151192
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
Makes the use expressions significantly shorter.
Sometimes the middle frames of the ICE backtrace becomes `<unknown>` on `i686-pc-windows-msvc` which then makes this test flaky.
THIR patterns: Always use type `str` for string-constant-value nodes Historically, constants and literals of type `&str` have been represented in THIR patterns as `PatKind::Const` nodes with type `&str`. That's fine for stable Rust, but `feature(deref_patterns)` also created a need to have string literal patterns of type `str` in some cases, which resulted in a number of additional special cases and inconsistencies in typechecking and in HIR-to-THIR-to-MIR lowering of patterns. We can avoid several of those special cases by having THIR treat string-constant-values as fundamentally being of type `str`, and then using `PatKind::Deref` to represent the additional `&` layer in the common case where it is needed. This allows bare `str` patterns to require very little special treatment. Existing tests should already do a good job of demonstrating that this implementation change does not affect the stable language.
fix: Do not delay E0107 when there exists an assoc ty with the same name Fixes rust-lang#148121 When we have the following code: ```rust trait Foo<T> {} impl Foo<T: Default> for String {} ``` we delay `E0107: wrong number of generic args` to suggest moving `T: Default` bound to the impl block's param declaration. The delay is determined by whether all the missing generic parameters are mentioned by those *wrong* assoc item constraints. But this delay is wrong when there exist any *correct* assoc item constraints, i.e. when we have an assoc type whose identifier is same with a missing generic parameter like in the following code: ```rust pub trait Super<X> { type X; } pub trait A {} impl A for dyn Super<X = ()> {} ```
Use default field values in a few more cases Makes the use expressions significantly shorter.
Disable `dump-ice-to-disk` on `i686-pc-windows-msvc` Sometimes the middle frames of the ICE backtrace becomes `<unknown>` on `i686-pc-windows-msvc` which then makes this test flaky. Noticed in rust-lang#150925 (comment). Originally expanded in rust-lang#142563 to see if it's still flaky for other `*-windows-*` targets, unfortunately the answer is yes for `i686-pc-windows-msvc` as well. r? @dianqk (or compiler or anyone really)
rustbot
added
A-run-make
Member
Author
|
@bors r+ rollup=never p=5 |
Contributor
rust-bors
bot
added
S-waiting-on-bors
Contributor
|
⌛ Testing commit 36d4a6d with merge 336efc6... Workflow: https://github.com/rust-lang/rust/actions/runs/21057860975 |
rust-bors bot
pushed a commit
that referenced
this pull request
Jan 16, 2026
Rollup of 4 pull requests Successful merges: - #151155 (THIR patterns: Always use type `str` for string-constant-value nodes) - #151166 (fix: Do not delay E0107 when there exists an assoc ty with the same name) - #151172 (Use default field values in a few more cases) - #151185 (Disable `dump-ice-to-disk` on `i686-pc-windows-msvc`) r? @ghost
Member
rust-bors
bot
added
S-waiting-on-author
Contributor
|
Commit 36d4a6d has been unapproved. Auto build cancelled due to unapproval. Cancelled workflows: |
rustbot
removed
the
S-waiting-on-author
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 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:
strfor string-constant-value nodes #151155 (THIR patterns: Always use typestrfor string-constant-value nodes)dump-ice-to-diskoni686-pc-windows-msvc#151185 (Disabledump-ice-to-diskoni686-pc-windows-msvc)r? @ghost
Create a similar rollup