resolve: Relax some asserts in glob overwriting and add tests #150939

petrochenkov · 2026-01-10T22:39:33Z

Fixes #150927.
Fixes #150928.
Fixes #150929.
Fixes #150976.
Fixes #150977.
Fixes #151008.
Fixes #151037.
Fixes rust-lang/rust-clippy#16398.
r? @yaahc

This update deliberately skips latest nighly-2026-01-11 which contains a regression which is supposed to be fixed by not yet merged rust-lang/rust#150939 Approved by: rust (implicit)

theemathas · 2026-01-13T04:56:16Z

Other potentially-related issues: #151028, #151037, #151044

petrochenkov · 2026-01-13T06:53:39Z

#151028 is unrelated, it's a regression from recent doc link changes.

estebank

Feel free to r=me unless you're waiting on @yaahc's review specifically.

View changes since this review

The opposite ordering was a consistent source of confusion during debuggingю `report_conflict` actually used an incorrect order due to similar confusion.

Also avoid losing some glob ambiguities when re-fetching globs

rustbot · 2026-01-14T17:13:05Z

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

petrochenkov · 2026-01-14T17:13:25Z

@bors r=estebank

rust-bors · 2026-01-14T17:13:30Z

📌 Commit 83c5f2c has been approved by estebank

It is now in the queue for this repository.

@yaahc

resolve: Relax some asserts in glob overwriting and add tests Fixes rust-lang#150927. Fixes rust-lang#150928. Fixes rust-lang#150929. Fixes rust-lang#150976. Fixes rust-lang#150977. Fixes rust-lang#151008. Fixes rust-lang#151037. Fixes rust-lang/rust-clippy#16398. r? @yaahc

@ghost

…uwer Rollup of 12 pull requests Successful merges: - #150585 (Add a context-consistency check before emitting redundant generic-argument suggestions) - #150586 (rustdoc: Fix intra-doc link bugs involving type aliases and associated items) - #150590 (Don't try to recover keyword as non-keyword identifier ) - #150817 (cleanup: remove borrowck handling for inline const patterns) - #150939 (resolve: Relax some asserts in glob overwriting and add tests) - #150966 (rustc_target: Remove unused Arch::PowerPC64LE) - #150971 (Disallow eii in statement position) - #151016 (fix: WASI threading regression by disabling pthread usage) - #151046 (compiler: Make Externally Implementable Item (eii) macros "semiopaque") - #151103 (mir_build: Simplify length-determination and indexing for array/slice patterns) - #151117 (Avoid serde dependency in build_helper when not necessary) - #151127 (Delete `MetaItemOrLitParser::Err`) r? @ghost

@yaahc

resolve: Relax some asserts in glob overwriting and add tests Fixes rust-lang#150927. Fixes rust-lang#150928. Fixes rust-lang#150929. Fixes rust-lang#150976. Fixes rust-lang#150977. Fixes rust-lang#151008. Fixes rust-lang#151037. Fixes rust-lang/rust-clippy#16398. r? @yaahc

@ghost

…uwer Rollup of 16 pull requests Successful merges: - #150585 (Add a context-consistency check before emitting redundant generic-argument suggestions) - #150586 (rustdoc: Fix intra-doc link bugs involving type aliases and associated items) - #150590 (Don't try to recover keyword as non-keyword identifier ) - #150817 (cleanup: remove borrowck handling for inline const patterns) - #150939 (resolve: Relax some asserts in glob overwriting and add tests) - #150962 (Remove `FeedConstTy` and provide ty when lowering const arg) - #150966 (rustc_target: Remove unused Arch::PowerPC64LE) - #150971 (Disallow eii in statement position) - #151016 (fix: WASI threading regression by disabling pthread usage) - #151046 (compiler: Make Externally Implementable Item (eii) macros "semiopaque") - #151099 (Recover parse gracefully from `<const N>`) - #151117 (Avoid serde dependency in build_helper when not necessary) - #151127 (Delete `MetaItemOrLitParser::Err`) - #151128 (Add temporary new bors e-mail address to the mailmap) - #151130 (resolve: Downgrade `ambiguous_glob_imports` to warn-by-default) - #151138 (Rename `rust.use-lld` to `rust.bootstrap-override-lld` in INSTALL.md) r? @ghost

@ghost

…uwer Rollup of 15 pull requests Successful merges: - #150585 (Add a context-consistency check before emitting redundant generic-argument suggestions) - #150586 (rustdoc: Fix intra-doc link bugs involving type aliases and associated items) - #150590 (Don't try to recover keyword as non-keyword identifier ) - #150817 (cleanup: remove borrowck handling for inline const patterns) - #150939 (resolve: Relax some asserts in glob overwriting and add tests) - #150962 (Remove `FeedConstTy` and provide ty when lowering const arg) - #150966 (rustc_target: Remove unused Arch::PowerPC64LE) - #150971 (Disallow eii in statement position) - #151016 (fix: WASI threading regression by disabling pthread usage) - #151046 (compiler: Make Externally Implementable Item (eii) macros "semiopaque") - #151099 (Recover parse gracefully from `<const N>`) - #151117 (Avoid serde dependency in build_helper when not necessary) - #151127 (Delete `MetaItemOrLitParser::Err`) - #151128 (Add temporary new bors e-mail address to the mailmap) - #151138 (Rename `rust.use-lld` to `rust.bootstrap-override-lld` in INSTALL.md) r? @ghost

workingjubilee · 2026-01-14T21:42:50Z

We want this in sooner rather than later so it doesn't miss the beta cut (since we definitely have to backport it if it does).

@bors p=1

@yaahc

Rollup merge of #150939 - impasse, r=estebank resolve: Relax some asserts in glob overwriting and add tests Fixes #150927. Fixes #150928. Fixes #150929. Fixes #150976. Fixes #150977. Fixes #151008. Fixes #151037. Fixes rust-lang/rust-clippy#16398. r? @yaahc

@ghost

…uwer Rollup of 11 pull requests Successful merges: - rust-lang/rust#149408 (refactor: remove Ord bound from BinaryHeap::new etc) - rust-lang/rust#150406 (Change some `matches!(.., .. if ..)` with let-chains) - rust-lang/rust#150723 (std: move `errno` and related functions into `sys::io`) - rust-lang/rust#150877 (resolve: Refactor away the side table `decl_parent_modules`) - rust-lang/rust#150902 (Update to_uppercase docs to avoid ß->SS example) - rust-lang/rust#151034 (std: Change UEFI env vars to volatile storage) - rust-lang/rust#151036 (Better handle when trying to iterate on a `Range` of a type that isn't `Step`) - rust-lang/rust#151067 (Avoid should-fail in two ui tests and a codegen-llvm test) - rust-lang/rust#151072 (also handle ENOTTY ioctl errors when checking pidfd -> pid support) - rust-lang/rust#151077 (Recognize potential `impl<const N: usize>` to `impl<N>` mistake) - rust-lang/rust#151096 (Remove `Deref`/`DerefMut` impl for `Providers`.) Failed merges: - rust-lang/rust#150939 (resolve: Relax some asserts in glob overwriting and add tests) r? @ghost

@ghost

…uwer Rollup of 15 pull requests Successful merges: - rust-lang/rust#150585 (Add a context-consistency check before emitting redundant generic-argument suggestions) - rust-lang/rust#150586 (rustdoc: Fix intra-doc link bugs involving type aliases and associated items) - rust-lang/rust#150590 (Don't try to recover keyword as non-keyword identifier ) - rust-lang/rust#150817 (cleanup: remove borrowck handling for inline const patterns) - rust-lang/rust#150939 (resolve: Relax some asserts in glob overwriting and add tests) - rust-lang/rust#150962 (Remove `FeedConstTy` and provide ty when lowering const arg) - rust-lang/rust#150966 (rustc_target: Remove unused Arch::PowerPC64LE) - rust-lang/rust#150971 (Disallow eii in statement position) - rust-lang/rust#151016 (fix: WASI threading regression by disabling pthread usage) - rust-lang/rust#151046 (compiler: Make Externally Implementable Item (eii) macros "semiopaque") - rust-lang/rust#151099 (Recover parse gracefully from `<const N>`) - rust-lang/rust#151117 (Avoid serde dependency in build_helper when not necessary) - rust-lang/rust#151127 (Delete `MetaItemOrLitParser::Err`) - rust-lang/rust#151128 (Add temporary new bors e-mail address to the mailmap) - rust-lang/rust#151138 (Rename `rust.use-lld` to `rust.bootstrap-override-lld` in INSTALL.md) r? @ghost

rustbot assigned yaahc Jan 10, 2026

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 10, 2026

petrochenkov force-pushed the impasse branch from 29595fb to 7ecc9f8 Compare January 11, 2026 19:44

This comment has been minimized.

Sign in to view

This comment was marked as resolved.

Sign in to view

petrochenkov force-pushed the impasse branch from 7ecc9f8 to 6b987cc Compare January 11, 2026 19:45

petrochenkov mentioned this pull request Jan 11, 2026

ICE !d1.warn_ambiguity.get() #150977

Closed

petrochenkov mentioned this pull request Jan 12, 2026

assertion failed: !deep_decl.is_glob_import() #151008

Closed

zerosnacks mentioned this pull request Jan 12, 2026

reminder(ci): unpin nightly toolchain from 2026-01-10 to regular nightly alloy-rs/alloy#3505

Open

seqre mentioned this pull request Jan 12, 2026

refactor!: extract framework core to cot-core cot-rs/cot#444

Open

petrochenkov mentioned this pull request Jan 13, 2026

ICE building chumsky crate in nightly #151044

Closed

petrochenkov mentioned this pull request Jan 13, 2026

ICE: assertion failed: !deep_decl.is_glob_import() - when compiling polars-plan #151037

Closed

jieyouxu self-assigned this Jan 13, 2026

LorrensP-2158466 mentioned this pull request Jan 13, 2026

Resolver: Batched Import Resolution #145108

Open

petrochenkov mentioned this pull request Jan 13, 2026

assertion failed: !deep_decl.is_glob_import() #151081

Closed

estebank approved these changes Jan 13, 2026

View reviewed changes

jieyouxu assigned estebank and unassigned jieyouxu Jan 14, 2026

petrochenkov force-pushed the impasse branch from 40c4fe9 to 409f5af Compare January 14, 2026 06:33

petrochenkov mentioned this pull request Jan 14, 2026

ICE clippy linting tmux-rs on mac os rust-lang/rust-clippy#16398

Open

rust-bors bot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 14, 2026

This comment was marked as resolved.

Sign in to view

petrochenkov added 4 commits January 14, 2026 19:57

resolve: Relax some asserts in glob overwriting and add tests

8b52c73

resolve: Consistently use old decls before new decls in interfaces

81ef42d

The opposite ordering was a consistent source of confusion during debuggingю `report_conflict` actually used an incorrect order due to similar confusion.

Add a test for issue 150977

1c3841b

resolve: Relax one more assert in glob overwriting and add a test

83c5f2c

Also avoid losing some glob ambiguities when re-fetching globs

petrochenkov force-pushed the impasse branch from 409f5af to 83c5f2c Compare January 14, 2026 17:12

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 14, 2026

samueltardieu mentioned this pull request Jan 14, 2026

Rollup of 10 pull requests #151125

Closed

JonathanBrouwer mentioned this pull request Jan 14, 2026

Rollup of 12 pull requests #151129

Closed

JonathanBrouwer mentioned this pull request Jan 14, 2026

Rollup of 16 pull requests #151139

Closed

JonathanBrouwer mentioned this pull request Jan 14, 2026

Rollup of 15 pull requests #151144

Merged

rust-bors bot merged commit 6cdcef5 into rust-lang:main Jan 15, 2026
11 checks passed

rustbot added this to the 1.94.0 milestone Jan 15, 2026

SpriteOvO mentioned this pull request Jan 16, 2026

ICE when compiling chumsky #151180

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

resolve: Relax some asserts in glob overwriting and add tests #150939

resolve: Relax some asserts in glob overwriting and add tests #150939

Uh oh!

petrochenkov commented Jan 10, 2026 •

edited by samueltardieu

Loading

Uh oh!

This comment has been minimized.

This comment was marked as resolved.

theemathas commented Jan 13, 2026

Uh oh!

petrochenkov commented Jan 13, 2026

Uh oh!

estebank left a comment •

edited by rustbot

Loading

Uh oh!

This comment was marked as resolved.

rustbot commented Jan 14, 2026

Uh oh!

petrochenkov commented Jan 14, 2026

Uh oh!

rust-bors bot commented Jan 14, 2026

Uh oh!

workingjubilee commented Jan 14, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Uh oh!

resolve: Relax some asserts in glob overwriting and add tests #150939

resolve: Relax some asserts in glob overwriting and add tests #150939

Uh oh!

Conversation

petrochenkov commented Jan 10, 2026 • edited by samueltardieu Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment has been minimized.

This comment was marked as resolved.

theemathas commented Jan 13, 2026

Uh oh!

petrochenkov commented Jan 13, 2026

Uh oh!

estebank left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

This comment was marked as resolved.

rustbot commented Jan 14, 2026

Uh oh!

petrochenkov commented Jan 14, 2026

Uh oh!

rust-bors bot commented Jan 14, 2026

Uh oh!

workingjubilee commented Jan 14, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

petrochenkov commented Jan 10, 2026 •

edited by samueltardieu

Loading

estebank left a comment •

edited by rustbot

Loading