Skip to content

Conversation

@TaKO8Ki
Copy link
Member

@TaKO8Ki TaKO8Ki commented Jan 17, 2026

Fixes #151213 using issue_145575_hack_applied in the same way as in #149860.

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jan 17, 2026
@rustbot
Copy link
Collaborator

rustbot commented Jan 17, 2026

r? @mati865

rustbot has assigned @mati865.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@TaKO8Ki TaKO8Ki changed the title fix ICE on inconsistent import resolution with macro-attributed exter… Fix ICE on inconsistent import resolution with macro-attributed extern crate Jan 17, 2026
@mati865
Copy link
Member

mati865 commented Jan 18, 2026

Thanks.

@bors r+ rollup

@rust-bors
Copy link
Contributor

rust-bors bot commented Jan 18, 2026

📌 Commit 4d2f6a0 has been approved by mati865

It is now in the queue for this repository.

@rust-bors rust-bors bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 18, 2026
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Jan 18, 2026
…, r=mati865

Fix ICE on inconsistent import resolution with macro-attributed extern crate

Fixes rust-lang#151213 using issue_145575_hack_applied in the same way as in rust-lang#149860.
rust-bors bot pushed a commit that referenced this pull request Jan 18, 2026
…uwer

Rollup of 7 pull requests

Successful merges:

 - #150767 (Allow invoking all help options at once)
 - #150886 (Added mGCA related tests)
 - #151245 (Explicitly list crate level attrs)
 - #151268 (Fix ICE on inconsistent import resolution with macro-attributed extern crate)
 - #151275 (Normalize type_const items even with feature `generic_const_exprs`)
 - #151288 (Use `find_attr` instead of `attr::contains_name` in `lower_const_item_rhs`)
 - #151321 (Port #![no_main] to the attribute parser.)

r? @ghost
@rust-bors rust-bors bot merged commit 85d2cf3 into rust-lang:main Jan 18, 2026
11 checks passed
@rustbot rustbot added this to the 1.95.0 milestone Jan 18, 2026
rust-timer added a commit that referenced this pull request Jan 18, 2026
Rollup merge of #151268 - ice-inconsistent-resolution-151213, r=mati865

Fix ICE on inconsistent import resolution with macro-attributed extern crate

Fixes #151213 using issue_145575_hack_applied in the same way as in #149860.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

ICE: inconsistent resolution for an import

3 participants