diff options
| author | bors <bors@rust-lang.org> | 2022-10-14 16:43:46 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-10-14 16:43:46 +0000 |
| commit | 5819f419a7b9fcda92b74ab2c48010a778eaec40 (patch) | |
| tree | 2f988c8cb12dabcb2f6d76595bfcbabcf1ab2016 /library/std/src/sys | |
| parent | ee1c3b385b6673b6ef37d80dfabe048e993c2ae2 (diff) | |
| parent | 5218e24f2c590a434de53e9ad3a68b4516e4938b (diff) | |
| download | rust-5819f419a7b9fcda92b74ab2c48010a778eaec40.tar.gz rust-5819f419a7b9fcda92b74ab2c48010a778eaec40.zip | |
Auto merge of #102783 - RalfJung:tls, r=thomcc
sync thread_local key conditions exactly with what the macro uses This makes the `cfg` in `mod.rs` syntactically the same as those in `local.rs`. I don't think this should actually change anything, but seems better to be consistent? I looked into this due to https://github.com/rust-lang/rust/issues/102549, but this PR would make it *less* likely that `__OsLocalKeyInner` is going to get provided, so this cannot help with that issue. r? `@thomcc`
Diffstat (limited to 'library/std/src/sys')
| -rw-r--r-- | library/std/src/sys/unix/thread_local_dtor.rs | 1 | ||||
| -rw-r--r-- | library/std/src/sys/unsupported/thread_local_dtor.rs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/library/std/src/sys/unix/thread_local_dtor.rs b/library/std/src/sys/unix/thread_local_dtor.rs index 6e8be2a91de..d7fd2130f7c 100644 --- a/library/std/src/sys/unix/thread_local_dtor.rs +++ b/library/std/src/sys/unix/thread_local_dtor.rs @@ -17,6 +17,7 @@ target_os = "redox", target_os = "emscripten" ))] +#[cfg_attr(target_family = "wasm", allow(unused))] // might remain unused depending on target details (e.g. wasm32-unknown-emscripten) pub unsafe fn register_dtor(t: *mut u8, dtor: unsafe extern "C" fn(*mut u8)) { use crate::mem; use crate::sys_common::thread_local_dtor::register_dtor_fallback; diff --git a/library/std/src/sys/unsupported/thread_local_dtor.rs b/library/std/src/sys/unsupported/thread_local_dtor.rs index 85d66098302..84660ea5881 100644 --- a/library/std/src/sys/unsupported/thread_local_dtor.rs +++ b/library/std/src/sys/unsupported/thread_local_dtor.rs @@ -1,5 +1,6 @@ #![unstable(feature = "thread_local_internals", issue = "none")] +#[cfg_attr(target_family = "wasm", allow(unused))] // unused on wasm32-unknown-unknown pub unsafe fn register_dtor(_t: *mut u8, _dtor: unsafe extern "C" fn(*mut u8)) { // FIXME: right now there is no concept of "thread exit", but this is likely // going to show up at some point in the form of an exported symbol that the |