diff options
| author | bors <bors@rust-lang.org> | 2025-04-05 18:54:05 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-04-05 18:54:05 +0000 |
| commit | 5e17a2a91dd7dbefd8b4a1087c2e42257457deeb (patch) | |
| tree | 313978663fd68c1fb16d9422c26334555aae6f02 /library/std/src/sys | |
| parent | 0c478fdfe138a8b09744798c85fe2be657768b00 (diff) | |
| parent | 91377bd4caf96efff28c8ae5844d47904f642d1d (diff) | |
Auto merge of #139417 - matthiaskrgr:rollup-ktf1d6s, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #136877 (Fix missing const for inherent pointer `replace` methods) - #138797 (Fix `ProvenVia` for global where clauses) - #139121 (Rename internal module from `statik` to `no_threads`) - #139319 (StableMIR: Prepare for refactoring) - #139404 (Small smir cleanup) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src/sys')
| -rw-r--r-- | library/std/src/sys/thread_local/mod.rs | 6 | ||||
| -rw-r--r-- | library/std/src/sys/thread_local/no_threads.rs (renamed from library/std/src/sys/thread_local/statik.rs) | 0 |
2 files changed, 3 insertions, 3 deletions
diff --git a/library/std/src/sys/thread_local/mod.rs b/library/std/src/sys/thread_local/mod.rs index b7ce6fcdc05..9fafac3aa5b 100644 --- a/library/std/src/sys/thread_local/mod.rs +++ b/library/std/src/sys/thread_local/mod.rs @@ -30,9 +30,9 @@ cfg_if::cfg_if! { target_os = "zkvm", target_os = "trusty", ))] { - mod statik; - pub use statik::{EagerStorage, LazyStorage, thread_local_inner}; - pub(crate) use statik::{LocalPointer, local_pointer}; + mod no_threads; + pub use no_threads::{EagerStorage, LazyStorage, thread_local_inner}; + pub(crate) use no_threads::{LocalPointer, local_pointer}; } else if #[cfg(target_thread_local)] { mod native; pub use native::{EagerStorage, LazyStorage, thread_local_inner}; diff --git a/library/std/src/sys/thread_local/statik.rs b/library/std/src/sys/thread_local/no_threads.rs index 4da01a84acf..4da01a84acf 100644 --- a/library/std/src/sys/thread_local/statik.rs +++ b/library/std/src/sys/thread_local/no_threads.rs |