diff options
| author | Stefan Lankes <stlankes@users.noreply.github.com> | 2019-10-22 19:01:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-22 19:01:09 +0200 |
| commit | ddcd157d03a067419d7f5b4375cfaff5a474856a (patch) | |
| tree | c0b1bc8b196ff630dc9b7dfcf6f4e869e38b5e6c /src/libstd/panic.rs | |
| parent | 8a11c61a7af9ffa6585ee93b266e02fa1d642ba8 (diff) | |
| parent | 57bfb8096295150c06559da10adc5629e445a4ac (diff) | |
| download | rust-ddcd157d03a067419d7f5b4375cfaff5a474856a.tar.gz rust-ddcd157d03a067419d7f5b4375cfaff5a474856a.zip | |
Merge branch 'master' into rusty-hermit
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")] |