diff options
| author | bors <bors@rust-lang.org> | 2025-04-05 03:09:33 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-04-05 03:09:33 +0000 |
| commit | 1e008dd5d83e782ad37fc9cf6824733f824cc8cd (patch) | |
| tree | f41496f629002b9a8f91afa2b50206a7d485e72f /library/std/src | |
| parent | bad13a970a136389187dd1cf2f2fc737a8bea5fc (diff) | |
| parent | e31ce50698b40f36056f1e13f7f320ebdb38a102 (diff) | |
| download | rust-1e008dd5d83e782ad37fc9cf6824733f824cc8cd.tar.gz rust-1e008dd5d83e782ad37fc9cf6824733f824cc8cd.zip | |
Auto merge of #139396 - Zalathar:rollup-lmoqvru, r=Zalathar
Rollup of 11 pull requests Successful merges: - #136457 (Expose algebraic floating point intrinsics) - #137880 (Autodiff batching) - #137897 (fix pthread-based tls on apple targets) - #138024 (Allow optimizing out `panic_bounds_check` in Unicode checks.) - #138546 (Add integer to string formatting tests) - #138826 (StableMIR: Add `associated_items`.) - #138950 (replace extra_filename with strict version hash in metrics file names) - #139274 (Rustdoc: typecheck settings.js) - #139285 (use lower case to match other error messages) - #139341 (Apply `Recovery::Forbidden` when reparsing pasted macro fragments.) - #139389 (make `Arguments::as_statically_known_str` doc(hidden)) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/lib.rs | 1 | ||||
| -rw-r--r-- | library/std/src/sys/thread_local/mod.rs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs index 9dcedaa13f6..5c381181218 100644 --- a/library/std/src/lib.rs +++ b/library/std/src/lib.rs @@ -341,6 +341,7 @@ #![feature(exact_size_is_empty)] #![feature(exclusive_wrapper)] #![feature(extend_one)] +#![feature(float_algebraic)] #![feature(float_gamma)] #![feature(float_minimum_maximum)] #![feature(fmt_internals)] diff --git a/library/std/src/sys/thread_local/mod.rs b/library/std/src/sys/thread_local/mod.rs index 1ff13154b7b..b7ce6fcdc05 100644 --- a/library/std/src/sys/thread_local/mod.rs +++ b/library/std/src/sys/thread_local/mod.rs @@ -138,6 +138,7 @@ pub(crate) mod key { not(target_family = "wasm"), target_family = "unix", ), + all(not(target_thread_local), target_vendor = "apple"), target_os = "teeos", all(target_os = "wasi", target_env = "p1", target_feature = "atomics"), ))] { |