diff options
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/lib.rs | 1 | ||||
| -rw-r--r-- | src/libcore/num/int_macros.rs | 18 | ||||
| -rw-r--r-- | src/libcore/num/uint_macros.rs | 13 | ||||
| -rw-r--r-- | src/libcore/sync/atomic.rs | 28 |
4 files changed, 14 insertions, 46 deletions
diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs index a054e41b208..f2a297b7630 100644 --- a/src/libcore/lib.rs +++ b/src/libcore/lib.rs @@ -43,7 +43,6 @@ // Since libcore defines many fundamental lang items, all tests live in a // separate crate, libcoretest, to avoid bizarre issues. -#![cfg_attr(stage0, allow(unused_attributes))] #![crate_name = "core"] #![stable(feature = "core", since = "1.6.0")] #![crate_type = "rlib"] diff --git a/src/libcore/num/int_macros.rs b/src/libcore/num/int_macros.rs index fb1a3bbe3b4..bd6cfc427af 100644 --- a/src/libcore/num/int_macros.rs +++ b/src/libcore/num/int_macros.rs @@ -10,24 +10,6 @@ #![doc(hidden)] -#[cfg(stage0)] -macro_rules! int_module { ($T:ty, $bits:expr) => ( - -// FIXME(#11621): Should be deprecated once CTFE is implemented in favour of -// calling the `Bounded::min_value` function. -#[stable(feature = "rust1", since = "1.0.0")] -#[allow(missing_docs)] -pub const MIN: $T = (-1 as $T) << ($bits - 1); -// FIXME(#9837): Compute MIN like this so the high bits that shouldn't exist are 0. -// FIXME(#11621): Should be deprecated once CTFE is implemented in favour of -// calling the `Bounded::max_value` function. -#[stable(feature = "rust1", since = "1.0.0")] -#[allow(missing_docs)] -pub const MAX: $T = !MIN; - -) } - -#[cfg(not(stage0))] macro_rules! int_module { ($T:ident, $bits:expr) => ( #[stable(feature = "rust1", since = "1.0.0")] diff --git a/src/libcore/num/uint_macros.rs b/src/libcore/num/uint_macros.rs index af6b1b89f96..2ab2f9548ef 100644 --- a/src/libcore/num/uint_macros.rs +++ b/src/libcore/num/uint_macros.rs @@ -10,19 +10,6 @@ #![doc(hidden)] -#[cfg(stage0)] -macro_rules! uint_module { ($T:ty, $bits:expr) => ( - -#[stable(feature = "rust1", since = "1.0.0")] -#[allow(missing_docs)] -pub const MIN: $T = 0 as $T; -#[stable(feature = "rust1", since = "1.0.0")] -#[allow(missing_docs)] -pub const MAX: $T = !0 as $T; - -) } - -#[cfg(not(stage0))] macro_rules! uint_module { ($T:ident, $bits:expr) => ( #[stable(feature = "rust1", since = "1.0.0")] diff --git a/src/libcore/sync/atomic.rs b/src/libcore/sync/atomic.rs index d0a64de07e5..658b1312c49 100644 --- a/src/libcore/sync/atomic.rs +++ b/src/libcore/sync/atomic.rs @@ -88,13 +88,13 @@ use default::Default; use fmt; /// A boolean type which can be safely shared between threads. -#[cfg(any(stage0, target_has_atomic = "8"))] +#[cfg(target_has_atomic = "8")] #[stable(feature = "rust1", since = "1.0.0")] pub struct AtomicBool { v: UnsafeCell<u8>, } -#[cfg(any(stage0, target_has_atomic = "8"))] +#[cfg(target_has_atomic = "8")] #[stable(feature = "rust1", since = "1.0.0")] impl Default for AtomicBool { fn default() -> Self { @@ -103,18 +103,18 @@ impl Default for AtomicBool { } // Send is implicitly implemented for AtomicBool. -#[cfg(any(stage0, target_has_atomic = "8"))] +#[cfg(target_has_atomic = "8")] #[stable(feature = "rust1", since = "1.0.0")] unsafe impl Sync for AtomicBool {} /// A raw pointer type which can be safely shared between threads. -#[cfg(any(stage0, target_has_atomic = "ptr"))] +#[cfg(target_has_atomic = "ptr")] #[stable(feature = "rust1", since = "1.0.0")] pub struct AtomicPtr<T> { p: UnsafeCell<*mut T>, } -#[cfg(any(stage0, target_has_atomic = "ptr"))] +#[cfg(target_has_atomic = "ptr")] #[stable(feature = "rust1", since = "1.0.0")] impl<T> Default for AtomicPtr<T> { fn default() -> AtomicPtr<T> { @@ -122,10 +122,10 @@ impl<T> Default for AtomicPtr<T> { } } -#[cfg(any(stage0, target_has_atomic = "ptr"))] +#[cfg(target_has_atomic = "ptr")] #[stable(feature = "rust1", since = "1.0.0")] unsafe impl<T> Send for AtomicPtr<T> {} -#[cfg(any(stage0, target_has_atomic = "ptr"))] +#[cfg(target_has_atomic = "ptr")] #[stable(feature = "rust1", since = "1.0.0")] unsafe impl<T> Sync for AtomicPtr<T> {} @@ -167,11 +167,11 @@ pub enum Ordering { } /// An `AtomicBool` initialized to `false`. -#[cfg(any(stage0, target_has_atomic = "8"))] +#[cfg(target_has_atomic = "8")] #[stable(feature = "rust1", since = "1.0.0")] pub const ATOMIC_BOOL_INIT: AtomicBool = AtomicBool::new(false); -#[cfg(any(stage0, target_has_atomic = "8"))] +#[cfg(target_has_atomic = "8")] impl AtomicBool { /// Creates a new `AtomicBool`. /// @@ -508,7 +508,7 @@ impl AtomicBool { } } -#[cfg(any(stage0, target_has_atomic = "ptr"))] +#[cfg(target_has_atomic = "ptr")] impl<T> AtomicPtr<T> { /// Creates a new `AtomicPtr`. /// @@ -1106,14 +1106,14 @@ atomic_int! { unstable(feature = "integer_atomics", issue = "32976"), u64 AtomicU64 ATOMIC_U64_INIT } -#[cfg(any(stage0, target_has_atomic = "ptr"))] +#[cfg(target_has_atomic = "ptr")] atomic_int!{ stable(feature = "rust1", since = "1.0.0"), stable(feature = "extended_compare_and_swap", since = "1.10.0"), stable(feature = "atomic_debug", since = "1.3.0"), isize AtomicIsize ATOMIC_ISIZE_INIT } -#[cfg(any(stage0, target_has_atomic = "ptr"))] +#[cfg(target_has_atomic = "ptr")] atomic_int!{ stable(feature = "rust1", since = "1.0.0"), stable(feature = "extended_compare_and_swap", since = "1.10.0"), @@ -1311,7 +1311,7 @@ pub fn fence(order: Ordering) { } -#[cfg(any(stage0, target_has_atomic = "8"))] +#[cfg(target_has_atomic = "8")] #[stable(feature = "atomic_debug", since = "1.3.0")] impl fmt::Debug for AtomicBool { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { @@ -1319,7 +1319,7 @@ impl fmt::Debug for AtomicBool { } } -#[cfg(any(stage0, target_has_atomic = "ptr"))] +#[cfg(target_has_atomic = "ptr")] #[stable(feature = "atomic_debug", since = "1.3.0")] impl<T> fmt::Debug for AtomicPtr<T> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { |
