From 683a3db01fcd00998a36e494ee39209b3105cfb9 Mon Sep 17 00:00:00 2001
From: Mark Rousskov <mark.simulacrum@gmail.com>
Date: Wed, 1 Aug 2018 07:37:38 -0600
Subject: Switch to bootstrapping from 1.29 beta

---
 src/liballoc/task.rs | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'src/liballoc/task.rs')

diff --git a/src/liballoc/task.rs b/src/liballoc/task.rs
index 9792d52dd66..7a4eda21a60 100644
--- a/src/liballoc/task.rs
+++ b/src/liballoc/task.rs
@@ -12,16 +12,10 @@
 
 pub use core::task::*;
 
-#[cfg(any(
-    all(stage0, target_has_atomic = "ptr"),
-    all(not(stage0), target_has_atomic = "ptr", target_has_atomic = "cas")
-))]
+#[cfg(all(target_has_atomic = "ptr", target_has_atomic = "cas"))]
 pub use self::if_arc::*;
 
-#[cfg(any(
-    all(stage0, target_has_atomic = "ptr"),
-    all(not(stage0), target_has_atomic = "ptr", target_has_atomic = "cas")
-))]
+#[cfg(all(target_has_atomic = "ptr", target_has_atomic = "cas"))]
 mod if_arc {
     use super::*;
     use core::marker::PhantomData;
@@ -53,10 +47,7 @@ mod if_arc {
         }
     }
 
-    #[cfg(any(
-        all(stage0, target_has_atomic = "ptr"),
-        all(not(stage0), target_has_atomic = "ptr", target_has_atomic = "cas")
-    ))]
+    #[cfg(all(target_has_atomic = "ptr", target_has_atomic = "cas"))]
     struct ArcWrapped<T>(PhantomData<T>);
 
     unsafe impl<T: Wake + 'static> UnsafeWake for ArcWrapped<T> {
-- 
cgit 1.4.1-3-g733a5