Skip to content

Commit 88d94dc

Browse files
authored
Merge pull request #4279 from rust-lang/rustup-2025-04-18
Automatic Rustup
2 parents 446ec2f + a30fecb commit 88d94dc

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
883f9f72e87ccb6838d528d8158ea6323baacc65
1+
1f76d219c906f0112bb1872f33aa977164c53fa6

tests/pass/tls/tls_leak_main_thread_allowed.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pub fn main() {
1313
TLS.set(Some(Box::leak(Box::new(123))));
1414

1515
// We can only ignore leaks on targets that use `#[thread_local]` statics to implement
16-
// `thread_local!`. Ignore the test on targest that don't.
16+
// `thread_local!`. Ignore the test on targets that don't.
1717
if cfg!(target_thread_local) {
1818
thread_local! {
1919
static TLS_KEY: Cell<Option<&'static i32>> = Cell::new(None);

0 commit comments

Comments
 (0)