resolve: Make disambiguators for underscore bindings module-local #144013

petrochenkov · 2025-07-16T07:47:44Z

Disambiguators attached to underscore name bindings (like const _: u8 = something;) do not need to be globally unique, they just need to be unique inside the module in which they live, because the bindings in a module are basically kept as Map<BindingKey, SomeData>.

Also, the specific values of the disambiguators are not important, so a glob import of const _ may have a different disambiguator than the original const _ itself.

So in this PR the disambiguator is just set to the current number of bindings in the module.
This removes one more piece of global mutable state from resolver and unblocks #143884.

rustbot · 2025-07-16T07:47:48Z

r? @oli-obk

rustbot has assigned @oli-obk.
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

petrochenkov · 2025-07-16T07:50:26Z

compiler/rustc_resolve/src/macros.rs

@@ -531,7 +531,7 @@ impl<'ra, 'tcx> ResolverExpand for Resolver<'ra, 'tcx> {
        target_trait.for_each_child(self, |this, ident, ns, _binding| {
            // FIXME: Adjust hygiene for idents from globs, like for glob imports.
            if let Some(overriding_keys) = this.impl_binding_keys.get(&impl_def_id)
-                && overriding_keys.contains(&BindingKey::new(ident.normalize_to_macros_2_0(), ns))
+                && overriding_keys.contains(&BindingKey::new(ident, ns))


Drive-by cleanup, the normalization already happens inside BindingKey::new.

oli-obk

r=me with nit and comment

compiler/rustc_resolve/src/lib.rs

compiler/rustc_resolve/src/build_reduced_graph.rs

petrochenkov · 2025-07-17T14:36:35Z

Didn't rename any BindingKey methods, only added some comments.
@bors r=oli-obk

bors · 2025-07-17T14:36:47Z

📌 Commit 998df3a has been approved by oli-obk

It is now in the queue for this repository.

resolve: Make disambiguators for underscore bindings module-local Disambiguators attached to underscore name bindings (like `const _: u8 = something;`) do not need to be globally unique, they just need to be unique inside the module in which they live, because the bindings in a module are basically kept as `Map<BindingKey, SomeData>`. Also, the specific values of the disambiguators are not important, so a glob import of `const _` may have a different disambiguator than the original `const _` itself. So in this PR the disambiguator is just set to the current number of bindings in the module. This removes one more piece of global mutable state from resolver and unblocks rust-lang#143884.

Rollup of 12 pull requests Successful merges: - #143280 (Remove duplicate error about raw underscore lifetime) - #143649 (Add test for `default_field_values` and `const_default`) - #143699 (Make `AsyncDrop` check that it's being implemented on a local ADT) - #143704 (Be a bit more careful around exotic cycles in in the inliner) - #143908 (`tests/ui`: A New Order [0/28] ) - #143909 (docs(alloc::fmt): Make type optional, instead of matching empty string) - #143925 (Make slice comparisons const) - #143997 (Use $crate in macros for rustc_public (aka stable_mir)) - #144013 (resolve: Make disambiguators for underscore bindings module-local) - #144029 (Fix wrong messages from methods with the same name from different traits) - #144063 (Add myself to the `infra-ci` reviewer group and adjust some infra auto-labels) - #144069 (ci: use windows 22 for all free runners) r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 11 pull requests Successful merges: - #143280 (Remove duplicate error about raw underscore lifetime) - #143649 (Add test for `default_field_values` and `const_default`) - #143699 (Make `AsyncDrop` check that it's being implemented on a local ADT) - #143908 (`tests/ui`: A New Order [0/28] ) - #143909 (docs(alloc::fmt): Make type optional, instead of matching empty string) - #143925 (Make slice comparisons const) - #143997 (Use $crate in macros for rustc_public (aka stable_mir)) - #144013 (resolve: Make disambiguators for underscore bindings module-local) - #144029 (Fix wrong messages from methods with the same name from different traits) - #144063 (Add myself to the `infra-ci` reviewer group and adjust some infra auto-labels) - #144069 (ci: use windows 22 for all free runners) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #144013 - petrochenkov:disambunder, r=oli-obk resolve: Make disambiguators for underscore bindings module-local Disambiguators attached to underscore name bindings (like `const _: u8 = something;`) do not need to be globally unique, they just need to be unique inside the module in which they live, because the bindings in a module are basically kept as `Map<BindingKey, SomeData>`. Also, the specific values of the disambiguators are not important, so a glob import of `const _` may have a different disambiguator than the original `const _` itself. So in this PR the disambiguator is just set to the current number of bindings in the module. This removes one more piece of global mutable state from resolver and unblocks #143884.

Prepare revert of 144013 This is a possible revert for #144013 causing issue #144168 (imo p-crit) to give us time to figure out a correct fix for #144013 without pressure. Feel free to close if it's an easy fix instead: r? `@petrochenkov`

Prepare revert of 144013 This is a possible revert for rust-lang/rust#144013 causing issue rust-lang/rust#144168 (imo p-crit) to give us time to figure out a correct fix for rust-lang/rust#144013 without pressure. Feel free to close if it's an easy fix instead: r? `@petrochenkov`

petrochenkov · 2025-07-21T20:09:13Z

Second attempt - #144272.

resolve: Make disambiguators for underscore bindings module-local Disambiguators attached to underscore name bindings (like `const _: u8 = something;`) do not need to be globally unique, they just need to be unique inside the module in which they live, because the bindings in a module are basically kept as `Map<BindingKey, SomeData>`. Also, the specific values of the disambiguators are not important, so a glob import of `const _` may have a different disambiguator than the original `const _` itself. So in this PR the disambiguator is just set to the current number of bindings in the module. This removes one more piece of global mutable state from resolver and unblocks rust-lang#143884.

Prepare revert of 144013 This is a possible revert for rust-lang#144013 causing issue rust-lang#144168 (imo p-crit) to give us time to figure out a correct fix for rust-lang#144013 without pressure. Feel free to close if it's an easy fix instead: r? `@petrochenkov`

…iaskrgr Rollup of 11 pull requests Successful merges: - rust-lang#143280 (Remove duplicate error about raw underscore lifetime) - rust-lang#143649 (Add test for `default_field_values` and `const_default`) - rust-lang#143699 (Make `AsyncDrop` check that it's being implemented on a local ADT) - rust-lang#143908 (`tests/ui`: A New Order [0/28] ) - rust-lang#143909 (docs(alloc::fmt): Make type optional, instead of matching empty string) - rust-lang#143925 (Make slice comparisons const) - rust-lang#143997 (Use $crate in macros for rustc_public (aka stable_mir)) - rust-lang#144013 (resolve: Make disambiguators for underscore bindings module-local) - rust-lang#144029 (Fix wrong messages from methods with the same name from different traits) - rust-lang#144063 (Add myself to the `infra-ci` reviewer group and adjust some infra auto-labels) - rust-lang#144069 (ci: use windows 22 for all free runners) r? `@ghost` `@rustbot` modify labels: rollup

resolve: Make disambiguators for underscore bindings module-local (take 2) The difference with rust-lang#144013 can be seen in the second commit. Now we just keep a separate disambiguator counter in every `Module`, instead of a global counter in `Resolver`. This will be ok for parallel import resolution because we'll need to lock the module anyway when updating `resolutions` and other fields in it. And for external modules the disabmiguator could be just passed as an argument to `define_extern`, without using any cells or locks, once rust-lang#143884 lands. Unblocks rust-lang#143884.

resolve: Make disambiguators for underscore bindings module-local (take 2) The difference with #144013 can be seen in the second commit. Now we just keep a separate disambiguator counter in every `Module`, instead of a global counter in `Resolver`. This will be ok for parallel import resolution because we'll need to lock the module anyway when updating `resolutions` and other fields in it. And for external modules the disabmiguator could be just passed as an argument to `define_extern`, without using any cells or locks, once #143884 lands. Unblocks #143884.

resolve: Make disambiguators for underscore bindings module-local (take 2) The difference with rust-lang/rust#144013 can be seen in the second commit. Now we just keep a separate disambiguator counter in every `Module`, instead of a global counter in `Resolver`. This will be ok for parallel import resolution because we'll need to lock the module anyway when updating `resolutions` and other fields in it. And for external modules the disabmiguator could be just passed as an argument to `define_extern`, without using any cells or locks, once rust-lang/rust#143884 lands. Unblocks rust-lang/rust#143884.

Rollup of 11 pull requests Successful merges: - rust-lang/rust#143280 (Remove duplicate error about raw underscore lifetime) - rust-lang/rust#143649 (Add test for `default_field_values` and `const_default`) - rust-lang/rust#143699 (Make `AsyncDrop` check that it's being implemented on a local ADT) - rust-lang/rust#143908 (`tests/ui`: A New Order [0/28] ) - rust-lang/rust#143909 (docs(alloc::fmt): Make type optional, instead of matching empty string) - rust-lang/rust#143925 (Make slice comparisons const) - rust-lang/rust#143997 (Use $crate in macros for rustc_public (aka stable_mir)) - rust-lang/rust#144013 (resolve: Make disambiguators for underscore bindings module-local) - rust-lang/rust#144029 (Fix wrong messages from methods with the same name from different traits) - rust-lang/rust#144063 (Add myself to the `infra-ci` reviewer group and adjust some infra auto-labels) - rust-lang/rust#144069 (ci: use windows 22 for all free runners) r? `@ghost` `@rustbot` modify labels: rollup

resolve: Make disambiguators for underscore bindings module-local (take 2) The difference with rust-lang/rust#144013 can be seen in the second commit. Now we just keep a separate disambiguator counter in every `Module`, instead of a global counter in `Resolver`. This will be ok for parallel import resolution because we'll need to lock the module anyway when updating `resolutions` and other fields in it. And for external modules the disabmiguator could be just passed as an argument to `define_extern`, without using any cells or locks, once rust-lang/rust#143884 lands. Unblocks rust-lang/rust#143884.

Rollup of 11 pull requests Successful merges: - rust-lang/rust#143280 (Remove duplicate error about raw underscore lifetime) - rust-lang/rust#143649 (Add test for `default_field_values` and `const_default`) - rust-lang/rust#143699 (Make `AsyncDrop` check that it's being implemented on a local ADT) - rust-lang/rust#143908 (`tests/ui`: A New Order [0/28] ) - rust-lang/rust#143909 (docs(alloc::fmt): Make type optional, instead of matching empty string) - rust-lang/rust#143925 (Make slice comparisons const) - rust-lang/rust#143997 (Use $crate in macros for rustc_public (aka stable_mir)) - rust-lang/rust#144013 (resolve: Make disambiguators for underscore bindings module-local) - rust-lang/rust#144029 (Fix wrong messages from methods with the same name from different traits) - rust-lang/rust#144063 (Add myself to the `infra-ci` reviewer group and adjust some infra auto-labels) - rust-lang/rust#144069 (ci: use windows 22 for all free runners) r? `@ghost` `@rustbot` modify labels: rollup

resolve: Make disambiguators for underscore bindings module-local (take 2) The difference with rust-lang/rust#144013 can be seen in the second commit. Now we just keep a separate disambiguator counter in every `Module`, instead of a global counter in `Resolver`. This will be ok for parallel import resolution because we'll need to lock the module anyway when updating `resolutions` and other fields in it. And for external modules the disabmiguator could be just passed as an argument to `define_extern`, without using any cells or locks, once rust-lang/rust#143884 lands. Unblocks rust-lang/rust#143884.

rustbot assigned oli-obk Jul 16, 2025

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 Jul 16, 2025

petrochenkov commented Jul 16, 2025

View reviewed changes

petrochenkov mentioned this pull request Jul 16, 2025

Resolve: refactor define into define_local and define_extern #143884

Merged

oli-obk approved these changes Jul 16, 2025

View reviewed changes

compiler/rustc_resolve/src/lib.rs Outdated Show resolved Hide resolved

compiler/rustc_resolve/src/build_reduced_graph.rs Outdated Show resolved Hide resolved

petrochenkov 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-review Status: Awaiting review from the assignee but also interested parties. labels Jul 16, 2025

resolve: Make disambiguators for underscore bindings module-local

998df3a

petrochenkov force-pushed the disambunder branch from 6a70a41 to 998df3a Compare July 17, 2025 14:34

bors 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 Jul 17, 2025

matthiaskrgr mentioned this pull request Jul 18, 2025

Rollup of 12 pull requests #144110

Closed

matthiaskrgr mentioned this pull request Jul 18, 2025

Rollup of 11 pull requests #144130

Merged

bors merged commit d3bc06e into rust-lang:master Jul 18, 2025
11 checks passed

rustbot added this to the 1.90.0 milestone Jul 18, 2025

This was referenced Jul 19, 2025

zerocopy-0.8.25 no longer builds on nightly #144168

Closed

Prepare revert of 144013 #144172

Merged

petrochenkov mentioned this pull request Jul 21, 2025

resolve: Make disambiguators for underscore bindings module-local (take 2) #144272

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

resolve: Make disambiguators for underscore bindings module-local #144013

resolve: Make disambiguators for underscore bindings module-local #144013

petrochenkov commented Jul 16, 2025

Uh oh!

rustbot commented Jul 16, 2025

Uh oh!

petrochenkov Jul 16, 2025

Uh oh!

oli-obk left a comment

Uh oh!

Uh oh!

Uh oh!

petrochenkov commented Jul 17, 2025

Uh oh!

bors commented Jul 17, 2025

Uh oh!

Uh oh!

petrochenkov commented Jul 21, 2025

Uh oh!

Uh oh!

resolve: Make disambiguators for underscore bindings module-local #144013

resolve: Make disambiguators for underscore bindings module-local #144013

Conversation

petrochenkov commented Jul 16, 2025

Uh oh!

rustbot commented Jul 16, 2025

Uh oh!

petrochenkov Jul 16, 2025

Choose a reason for hiding this comment

Uh oh!

oli-obk left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

petrochenkov commented Jul 17, 2025

Uh oh!

bors commented Jul 17, 2025

Uh oh!

Uh oh!

petrochenkov commented Jul 21, 2025

Uh oh!

Uh oh!