Skip to content

Commit dae1999

Browse files
committed
Auto merge of #3263 - rust-lang:rustup-2024-01-10, r=saethlin
Automatic Rustup
2 parents 245fc3a + f8425f5 commit dae1999

File tree

4 files changed

+8
-1
lines changed

4 files changed

+8
-1
lines changed

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5bcd86d89b2b7b6a490f7e075dd4eb346deb5f98
1+
94807670a6a3834cc9b71b0b803d49d307c9ba5d

tests/fail/tls/tls_static_dealloc.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
//! Ensure that thread-local statics get deallocated when the thread dies.
22
33
#![feature(thread_local)]
4+
// FIXME: Use `SyncUnsafeCell` instead of allowing `static_mut_ref` lint
5+
#![allow(static_mut_ref)]
46

57
#[thread_local]
68
static mut TLS: u8 = 0;

tests/pass/static_mut.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
static mut FOO: i32 = 42;
2+
3+
// FIXME: Use `SyncUnsafeCell` instead of allowing `static_mut_ref` lint
4+
#[allow(static_mut_ref)]
25
static BAR: Foo = Foo(unsafe { &FOO as *const _ });
36

47
#[allow(dead_code)]

tests/pass/tls/tls_static.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
//! test, we also check that thread-locals act as per-thread statics.
99
1010
#![feature(thread_local)]
11+
// FIXME: Use `SyncUnsafeCell` instead of allowing `static_mut_ref` lint
12+
#![allow(static_mut_ref)]
1113

1214
use std::thread;
1315

0 commit comments

Comments
 (0)