resolve: Use primitives for conditional mutability more consistently #147539
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-review
|
r? @SparrowLii rustbot has assigned @SparrowLii. Use |
petrochenkov
commented
Oct 9, 2025
| // because they can be fetched by glob imports from those modules, and bring traits | ||
| // into scope both directly and through glob imports. | ||
| let key = BindingKey::new_disambiguated(ident, ns, || { | ||
| // FIXME(batched): Will be fixed in batched resolution. |
There was a problem hiding this comment.
Removed all these scattered FIXMEs in favor of one FIXME on mod ref_mut.
| } | ||
|
|
||
| impl<T: Copy> Clone for CmCell<T> { | ||
| #[inline] |
There was a problem hiding this comment.
All these functions are private and available for optimizer to analyze, no need for #[inline] unless proven by benchmarks.
|
Nice! This makes it more clear what should be migrated and how, thanks! |
|
@bors r+ |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Oct 15, 2025
Rollup of 7 pull requests Successful merges: - #146841 (Stabilise `rotate_left` and `rotate_right` in `[_]` as `const fn` items.) - #146949 (Add vsx register support for ppc inline asm, and implement preserves_flag option) - #147539 (resolve: Use primitives for conditional mutability more consistently) - #147685 (remove span calls from deprecated attribute checking) - #147699 (Clairify docs for `AttributeKind::DocComment`) - #147706 (Add myself to review rotation) - #147711 (Clarify that UB will occur, not can/may in GlobalAlloc docs) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
that referenced
this pull request
Oct 15, 2025
Rollup merge of #147539 - petrochenkov:cmresolve, r=eholk resolve: Use primitives for conditional mutability more consistently No bare `(Ref)Cell`s remain in `rustc_resolve`, only `Cm(Ref)Cell`s checking that nothing is modified during speculative resolution, and `Cache(Ref)Cell` aliases for cells that need to be migrated to mutexes/atomics. cc `@LorrensP-2158466`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 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.
No bare
(Ref)Cells remain inrustc_resolve, onlyCm(Ref)Cells checking that nothing is modified during speculative resolution, andCache(Ref)Cellaliases for cells that need to be migrated to mutexes/atomics.cc @LorrensP-2158466