alloc: less static mut + some cleanup #142520
Merged
+55
−106
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
the
T-libs
| unsafe { | ||
| DROPS += 1; | ||
| } | ||
| DROPS.with(|drops| drops.update(|v| v + 1)); |
There was a problem hiding this comment.
Could be written as DROPS.set(DROPS.get() + 1) thanks to the convenience methods in LocalKey<Cell<T>>. Debatable if that’s better in this case but definitely nicer for cases where you only read or only write.
There was a problem hiding this comment.
I think it's already nicer even in this case, thanks!
And you think the thread-local is appropriate here?
There was a problem hiding this comment.
Sorry, I don't have enough context to say whether the overall approach is right, I just had a drive-by comment about the way it's implemented.
There was a problem hiding this comment.
thread_local should be fine here, or just an atomic
rust-cloud-vms
bot
force-pushed
the
less-static-mut
branch
from
023da2b to
c0297cc
Compare
rust-cloud-vms
bot
force-pushed
the
less-static-mut
branch
from
c0297cc to
bcef6db
Compare
rustbot
added
the
S-waiting-on-review
tgross35
approved these changes
Jun 16, 2025
| static mut DROPS: i32 = 0; | ||
| macro_rules! struct_with_counted_drop { | ||
| ($struct_name:ident$(($elt_ty:ty))?, $drop_counter:ident $(=> $drop_stmt:expr)?) => { | ||
| thread_local! {static $drop_counter: Cell<i32> = Cell::new(0);} |
There was a problem hiding this comment.
Preexisting, but any reason this was i32 not u32?
There was a problem hiding this comment.
I kept it on the thought that if things went really badly, this could perhaps become negative, but I suppose since it is only ever incremented, that was silly, so I'll change to u32.
rust-cloud-vms
bot
force-pushed
the
less-static-mut
branch
from
bcef6db to
2d3a37d
Compare
|
Thank you! @bors r+ |
bors
added
S-waiting-on-bors
|
@bors rollup |
bors
added a commit
that referenced
this pull request
Jun 18, 2025
Rollup of 14 pull requests Successful merges: - #141574 (impl `Default` for `array::IntoIter`) - #141608 (Add support for repetition to `proc_macro::quote`) - #142100 (rustdoc: make srcIndex no longer a global variable) - #142371 (avoid `&mut P<T>` in `visit_expr` etc methods) - #142517 (Windows: Use anonymous pipes in Command) - #142520 (alloc: less static mut + some cleanup) - #142588 (Generic ctx imprv) - #142605 (Don't unwrap in enzyme builds in case of missing llvm-config) - #142608 (Refresh module-level docs for `rustc_target::spec`) - #142618 (Lint about `console` calls in rustdoc JS) - #142620 (Remove a panicking branch in `BorrowedCursor::advance`) - #142631 (Dont suggest remove semi inside macro expansion for redundant semi lint) - #142632 (Update cargo) - #142635 (Temporarily add back -Zwasm-c-abi=spec) r? `@ghost` `@rustbot` modify labels: rollup
lnicola
pushed a commit
to lnicola/rust-analyzer
that referenced
this pull request
Jun 18, 2025
Rollup of 14 pull requests Successful merges: - rust-lang/rust#141574 (impl `Default` for `array::IntoIter`) - rust-lang/rust#141608 (Add support for repetition to `proc_macro::quote`) - rust-lang/rust#142100 (rustdoc: make srcIndex no longer a global variable) - rust-lang/rust#142371 (avoid `&mut P<T>` in `visit_expr` etc methods) - rust-lang/rust#142517 (Windows: Use anonymous pipes in Command) - rust-lang/rust#142520 (alloc: less static mut + some cleanup) - rust-lang/rust#142588 (Generic ctx imprv) - rust-lang/rust#142605 (Don't unwrap in enzyme builds in case of missing llvm-config) - rust-lang/rust#142608 (Refresh module-level docs for `rustc_target::spec`) - rust-lang/rust#142618 (Lint about `console` calls in rustdoc JS) - rust-lang/rust#142620 (Remove a panicking branch in `BorrowedCursor::advance`) - rust-lang/rust#142631 (Dont suggest remove semi inside macro expansion for redundant semi lint) - rust-lang/rust#142632 (Update cargo) - rust-lang/rust#142635 (Temporarily add back -Zwasm-c-abi=spec) r? `@ghost` `@rustbot` modify labels: rollup
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.
I'm looking into #125035 and would like some feedback on my approach.