about summary refs log tree commit diff
path: root/src/libstd/sync
diff options
context:
space:
mode:
authorMark Rousskov <mark.simulacrum@gmail.com>2020-06-03 15:15:53 -0400
committerMark Rousskov <mark.simulacrum@gmail.com>2020-06-03 15:27:51 -0400
commit71393422495b8d3c7a6e4ded3e64adaec45dca6d (patch)
tree570760bdbfd5143a9cdb6f2735c984dddaf9c4d4 /src/libstd/sync
parent6f4888845674837fd4b55adb66d9322e1973d7db (diff)
downloadrust-71393422495b8d3c7a6e4ded3e64adaec45dca6d.tar.gz
rust-71393422495b8d3c7a6e4ded3e64adaec45dca6d.zip
Bump to 1.46
Diffstat (limited to 'src/libstd/sync')
-rw-r--r--src/libstd/sync/mpsc/shared.rs6
-rw-r--r--src/libstd/sync/mpsc/sync.rs6
2 files changed, 2 insertions, 10 deletions
diff --git a/src/libstd/sync/mpsc/shared.rs b/src/libstd/sync/mpsc/shared.rs
index d1a46c51757..898654f21f2 100644
--- a/src/libstd/sync/mpsc/shared.rs
+++ b/src/libstd/sync/mpsc/shared.rs
@@ -354,11 +354,7 @@ impl<T> Packet<T> {
 
         // See comments on Arc::clone() on why we do this (for `mem::forget`).
         if old_count > MAX_REFCOUNT {
-            // remove `unsafe` on bootstrap bump
-            #[cfg_attr(not(bootstrap), allow(unused_unsafe))]
-            unsafe {
-                abort();
-            }
+            abort();
         }
     }
 
diff --git a/src/libstd/sync/mpsc/sync.rs b/src/libstd/sync/mpsc/sync.rs
index 603764922c5..733761671a0 100644
--- a/src/libstd/sync/mpsc/sync.rs
+++ b/src/libstd/sync/mpsc/sync.rs
@@ -358,11 +358,7 @@ impl<T> Packet<T> {
 
         // See comments on Arc::clone() on why we do this (for `mem::forget`).
         if old_count > MAX_REFCOUNT {
-            // remove `unsafe` on bootstrap bump
-            #[cfg_attr(not(bootstrap), allow(unused_unsafe))]
-            unsafe {
-                abort();
-            }
+            abort();
         }
     }