diff options
| author | bors <bors@rust-lang.org> | 2019-10-22 00:20:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-10-22 00:20:12 +0000 |
| commit | 6576f4be5af31a5e61dfc0cf50b7130e6c6dfb35 (patch) | |
| tree | 2996f7c8eb4fb2727165a36eb2976ecd8fe684a4 /src/libstd/panic.rs | |
| parent | 10f12fe3e73f3b6f7e6d6f8bbd87b1a8b4e74a07 (diff) | |
| parent | 56756c28a03d794b55b9b725758045faf8fe8aed (diff) | |
| download | rust-6576f4be5af31a5e61dfc0cf50b7130e6c6dfb35.tar.gz rust-6576f4be5af31a5e61dfc0cf50b7130e6c6dfb35.zip | |
Auto merge of #65671 - Centril:rollup-00glhmb, r=Centril
Rollup of 7 pull requests Successful merges: - #62330 (Change untagged_unions to not allow union fields with drop) - #65092 (make is_power_of_two a const function) - #65621 (miri: add write_bytes method to Memory doing bounds-checks and supporting iterators) - #65647 (Remove unnecessary trait bounds and derivations) - #65653 (keep the root dir clean from debugging) - #65660 (Rename `ConstValue::Infer(InferConst::Canonical(..))` to `ConstValue::Bound(..)`) - #65663 (Fix typo from #65214) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd/panic.rs')
| -rw-r--r-- | src/libstd/panic.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/panic.rs b/src/libstd/panic.rs index 24c693790e8..577673b7e40 100644 --- a/src/libstd/panic.rs +++ b/src/libstd/panic.rs @@ -264,7 +264,7 @@ impl RefUnwindSafe for atomic::AtomicI128 {} #[cfg(target_has_atomic_load_store = "ptr")] #[stable(feature = "unwind_safe_atomic_refs", since = "1.14.0")] impl RefUnwindSafe for atomic::AtomicUsize {} -#[cfg(target_hastarget_has_atomic_load_store_atomic = "8")] +#[cfg(target_has_atomic_load_store = "8")] #[unstable(feature = "integer_atomics", issue = "32976")] impl RefUnwindSafe for atomic::AtomicU8 {} #[cfg(target_has_atomic_load_store = "16")] |