Resolve: refactor define into define_local and define_extern
#143884
+121
−49
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
rustbot
added
S-waiting-on-author
This comment was marked as resolved.
This comment was marked as resolved.
|
Conflicts must be resolved in Petrochenkov's PRs, I think. I can then rebase off that. |
rustbot
added
S-blocked
This was referenced Jul 16, 2025
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jul 17, 2025
resolve: Use interior mutability for extern module map Module map for extern modules is a lazily populated cache, it's not *significantly* mutable. If some logic in name resolver is parallelized, then this cache can be populated from any thread, and without affecting results of any speculative resolution. Unblocks rust-lang#143884. This is a part of [#gsoc > Project: Parallel Macro Expansion](https://rust-lang.zulipchat.com/#narrow/channel/421156-gsoc/topic/Project.3A.20Parallel.20Macro.20Expansion/with/527348747). cc `@LorrensP-2158466`
rust-timer
added a commit
that referenced
this pull request
Jul 17, 2025
Rollup merge of #143550 - petrochenkov:lessmutres, r=lcnr resolve: Use interior mutability for extern module map Module map for extern modules is a lazily populated cache, it's not *significantly* mutable. If some logic in name resolver is parallelized, then this cache can be populated from any thread, and without affecting results of any speculative resolution. Unblocks #143884. This is a part of [#gsoc > Project: Parallel Macro Expansion](https://rust-lang.zulipchat.com/#narrow/channel/421156-gsoc/topic/Project.3A.20Parallel.20Macro.20Expansion/with/527348747). cc `@LorrensP-2158466`
LorrensP-2158466
force-pushed
the
resolve-split-define
branch
from
8515b3c to
1296920
Compare
This comment has been minimized.
This comment has been minimized.
LorrensP-2158466
force-pushed
the
resolve-split-define
branch
from
89cf98b to
4497a13
Compare
|
I couldn't find any more |
rustbot
added
the
S-waiting-on-review
LorrensP-2158466
changed the title
define into define_local and define_externdefine into define_local and define_extern
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jul 18, 2025
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.
github-actions bot
pushed a commit
to rust-lang/miri
that referenced
this pull request
Jul 18, 2025
resolve: Use interior mutability for extern module map Module map for extern modules is a lazily populated cache, it's not *significantly* mutable. If some logic in name resolver is parallelized, then this cache can be populated from any thread, and without affecting results of any speculative resolution. Unblocks rust-lang/rust#143884. This is a part of [#gsoc > Project: Parallel Macro Expansion](https://rust-lang.zulipchat.com/#narrow/channel/421156-gsoc/topic/Project.3A.20Parallel.20Macro.20Expansion/with/527348747). cc `@LorrensP-2158466`
|
Blocked on #144013. |
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jul 18, 2025
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.
petrochenkov
removed
the
S-waiting-on-review
rust-timer
added a commit
that referenced
this pull request
Jul 18, 2025
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.
|
☔ The latest upstream changes (presumably #144130) made this pull request unmergeable. Please resolve the merge conflicts. |
LorrensP-2158466
force-pushed
the
resolve-split-define
branch
from
4497a13 to
aa0c369
Compare
|
@rustbot ready |
rustbot
added
S-waiting-on-review
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Follow up on #143550 and part of #gsoc > Project: Parallel Macro Expansion.
Split up
defineintodefine_localanddefine_extern. Refactor usages ofdefineinto either one where it's "correct" (idk if everything is correct atm). Big part of this is thatresolutioncan now take a&Resolverinstead of a mutable one.Needed the module changes of #143550. Review will probably be easier when viewing my first commit instead of all the changes.
r? @petrochenkov