diff options
| author | bors <bors@rust-lang.org> | 2018-08-02 15:34:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-08-02 15:34:21 +0000 |
| commit | 03da14ba8cd22acbcfe1cca617f6c274999e5e9e (patch) | |
| tree | a33c2439348b38fceebbf1fc4604e06066c5e8a0 /src/liballoc | |
| parent | 5e92bf280b59fe0c187359743d7d430575fa30b1 (diff) | |
| parent | 683a3db01fcd00998a36e494ee39209b3105cfb9 (diff) | |
| download | rust-03da14ba8cd22acbcfe1cca617f6c274999e5e9e.tar.gz rust-03da14ba8cd22acbcfe1cca617f6c274999e5e9e.zip | |
Auto merge of #52949 - Mark-Simulacrum:snap, r=alexcrichton
Switch to bootstrapping from 1.29 beta r? @alexcrichton
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/lib.rs | 5 | ||||
| -rw-r--r-- | src/liballoc/task.rs | 15 |
2 files changed, 4 insertions, 16 deletions
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index ef619527e06..ca1b7507b5e 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -162,10 +162,7 @@ mod boxed { #[cfg(test)] mod boxed_test; pub mod collections; -#[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 mod sync; pub mod rc; pub mod raw_vec; 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> { |