Fix ICE when macro-expanded extern crate shadows std#153187
Merged
rust-bors[bot] merged 1 commit intorust-lang:mainfrom Feb 28, 2026
Merged
Fix ICE when macro-expanded extern crate shadows std#153187rust-bors[bot] merged 1 commit intorust-lang:mainfrom
rust-bors[bot] merged 1 commit intorust-lang:mainfrom
Conversation
rustbot
added
the
S-waiting-on-review
rustbot
added
the
T-compiler
Collaborator
|
r? @jieyouxu rustbot has assigned @jieyouxu. Use Why was this reviewer chosen?The reviewer was selected based on:
|
Member
|
r? petrochenkov |
Contributor
|
@bors r+ rollup |
Contributor
rust-bors
bot
added
S-waiting-on-bors
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Feb 28, 2026
…ng, r=petrochenkov Fix ICE when macro-expanded extern crate shadows std Fixes rust-lang#152895 This PR fixes an ICE that occurs when a macro-expanded `extern crate` shadows a prelude name, which leaves the resolver in an inconsistent state due to `issue_145575_hack`. I disabled the assertion when the `issue_145575_hack` flag is enabled. The fix is applied in two locations to cover both cases (whether `is_error_from_last_segment` is true or false). This approach was inspired by the context and fix discussed in rust-lang#151213.
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Feb 28, 2026
…ng, r=petrochenkov Fix ICE when macro-expanded extern crate shadows std Fixes rust-lang#152895 This PR fixes an ICE that occurs when a macro-expanded `extern crate` shadows a prelude name, which leaves the resolver in an inconsistent state due to `issue_145575_hack`. I disabled the assertion when the `issue_145575_hack` flag is enabled. The fix is applied in two locations to cover both cases (whether `is_error_from_last_segment` is true or false). This approach was inspired by the context and fix discussed in rust-lang#151213.
This was referenced Feb 28, 2026
rust-bors bot
pushed a commit
that referenced
this pull request
Feb 28, 2026
…uwer Rollup of 12 pull requests Successful merges: - #153211 (`rust-analyzer` subtree update) - #149027 (Improve cross-crate trait impl param mismatch suggestions ) - #152730 (add field representing types) - #153136 (Correctly handle `#[doc(alias = "...")]` attribute on inlined reexports) - #152165 (Normalize capture place `ty`s to prevent ICE) - #152615 (refactor 'valid for read/write' definition: exclude null) - #153109 (Fix LegacyKeyValueFormat report from docker build: aarch64-gnu-debug) - #153172 (Fix comment about placeholders) - #153187 (Fix ICE when macro-expanded extern crate shadows std) - #153190 (Don't allow subdiagnostic to use variables from their parent) - #153200 (Remove redundant clone) - #153216 (mark two polonius tests as known-bug)
rust-timer
added a commit
that referenced
this pull request
Feb 28, 2026
Rollup merge of #153187 - is57primenumber:fix-ice-on-shadowing, r=petrochenkov Fix ICE when macro-expanded extern crate shadows std Fixes #152895 This PR fixes an ICE that occurs when a macro-expanded `extern crate` shadows a prelude name, which leaves the resolver in an inconsistent state due to `issue_145575_hack`. I disabled the assertion when the `issue_145575_hack` flag is enabled. The fix is applied in two locations to cover both cases (whether `is_error_from_last_segment` is true or false). This approach was inspired by the context and fix discussed in #151213.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
Fixes #152895
This PR fixes an ICE that occurs when a macro-expanded
extern crateshadows a prelude name, which leaves the resolver in an inconsistent state due toissue_145575_hack.I disabled the assertion when the
issue_145575_hackflag is enabled.The fix is applied in two locations to cover both cases (whether
is_error_from_last_segmentis true or false).This approach was inspired by the context and fix discussed in #151213.