diff options
| author | bors <bors@rust-lang.org> | 2020-06-05 11:11:26 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-06-05 11:11:26 +0000 |
| commit | 84ec8238b14b4cf89e82eae11907b59629baff2c (patch) | |
| tree | 663eaea0128817e74861767f19eb284cd16b2ff0 /src/liballoc/sync.rs | |
| parent | 219380d840877de97b0e17674be7212ebc929d51 (diff) | |
| parent | 71393422495b8d3c7a6e4ded3e64adaec45dca6d (diff) | |
| download | rust-84ec8238b14b4cf89e82eae11907b59629baff2c.tar.gz rust-84ec8238b14b4cf89e82eae11907b59629baff2c.zip | |
Auto merge of #72957 - Mark-Simulacrum:bootstrap-bump, r=sfackler
Bump bootstrap compiler to 1.45 Pretty standard update.
Diffstat (limited to 'src/liballoc/sync.rs')
| -rw-r--r-- | src/liballoc/sync.rs | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/liballoc/sync.rs b/src/liballoc/sync.rs index 5de3cac9d53..cd4172d6a2d 100644 --- a/src/liballoc/sync.rs +++ b/src/liballoc/sync.rs @@ -1093,11 +1093,7 @@ impl<T: ?Sized> Clone for Arc<T> { // We abort because such a program is incredibly degenerate, and we // don't care to support it. if old_size > MAX_REFCOUNT { - // remove `unsafe` on bootstrap bump - #[cfg_attr(not(bootstrap), allow(unused_unsafe))] - unsafe { - abort(); - } + abort(); } Self::from_inner(self.ptr) @@ -1616,11 +1612,7 @@ impl<T: ?Sized> Weak<T> { // See comments in `Arc::clone` for why we do this (for `mem::forget`). if n > MAX_REFCOUNT { - // remove `unsafe` on bootstrap bump - #[cfg_attr(not(bootstrap), allow(unused_unsafe))] - unsafe { - abort(); - } + abort(); } // Relaxed is valid for the same reason it is on Arc's Clone impl @@ -1767,10 +1759,7 @@ impl<T: ?Sized> Clone for Weak<T> { // See comments in Arc::clone() for why we do this (for mem::forget). if old_size > MAX_REFCOUNT { - #[cfg_attr(not(bootstrap), allow(unused_unsafe))] // remove `unsafe` on bootstrap bump - unsafe { - abort(); - } + abort(); } Weak { ptr: self.ptr } |
