diff options
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/marker.rs | 2 | ||||
| -rw-r--r-- | src/libcore/mem.rs | 8 | ||||
| -rw-r--r-- | src/libcore/nonzero.rs | 4 | ||||
| -rw-r--r-- | src/libcore/ops.rs | 22 |
4 files changed, 18 insertions, 18 deletions
diff --git a/src/libcore/marker.rs b/src/libcore/marker.rs index 968f68a78a7..5909c5cc30e 100644 --- a/src/libcore/marker.rs +++ b/src/libcore/marker.rs @@ -55,7 +55,7 @@ pub trait Sized { /// Types that can be "unsized" to a dynamically sized type. #[unstable(feature = "core")] -#[cfg(not(stage0))] // SNAP c64d671 +#[cfg(not(stage0))] #[lang="unsize"] pub trait Unsize<T> { // Empty. diff --git a/src/libcore/mem.rs b/src/libcore/mem.rs index bb94cd886d7..173b73fdb09 100644 --- a/src/libcore/mem.rs +++ b/src/libcore/mem.rs @@ -95,7 +95,7 @@ pub fn size_of<T>() -> usize { /// /// assert_eq!(4, mem::size_of_val(&5i32)); /// ``` -#[cfg(not(stage0))] // SNAP c64d671 +#[cfg(not(stage0))] #[inline] #[stable(feature = "rust1", since = "1.0.0")] pub fn size_of_val<T: ?Sized>(val: &T) -> usize { @@ -111,7 +111,7 @@ pub fn size_of_val<T: ?Sized>(val: &T) -> usize { /// /// assert_eq!(4, mem::size_of_val(&5i32)); /// ``` -#[cfg(stage0)] // SNAP c64d671 +#[cfg(stage0)] #[inline] #[stable(feature = "rust1", since = "1.0.0")] pub fn size_of_val<T>(_val: &T) -> usize { @@ -144,7 +144,7 @@ pub fn min_align_of<T>() -> usize { /// /// assert_eq!(4, mem::min_align_of_val(&5i32)); /// ``` -#[cfg(not(stage0))] // SNAP c64d671 +#[cfg(not(stage0))] #[inline] #[stable(feature = "rust1", since = "1.0.0")] pub fn min_align_of_val<T: ?Sized>(val: &T) -> usize { @@ -160,7 +160,7 @@ pub fn min_align_of_val<T: ?Sized>(val: &T) -> usize { /// /// assert_eq!(4, mem::min_align_of_val(&5i32)); /// ``` -#[cfg(stage0)] // SNAP c64d671 +#[cfg(stage0)] #[inline] #[stable(feature = "rust1", since = "1.0.0")] pub fn min_align_of_val<T>(_val: &T) -> usize { diff --git a/src/libcore/nonzero.rs b/src/libcore/nonzero.rs index 85957382826..59819fd500d 100644 --- a/src/libcore/nonzero.rs +++ b/src/libcore/nonzero.rs @@ -12,7 +12,7 @@ use marker::Sized; use ops::Deref; -#[cfg(not(stage0))] // SNAP c64d671 +#[cfg(not(stage0))] use ops::CoerceUnsized; /// Unsafe trait to indicate what types are usable with the NonZero struct @@ -57,5 +57,5 @@ impl<T: Zeroable> Deref for NonZero<T> { } } -#[cfg(not(stage0))] // SNAP c64d671 +#[cfg(not(stage0))] impl<T: Zeroable+CoerceUnsized<U>, U: Zeroable> CoerceUnsized<NonZero<U>> for NonZero<T> {} diff --git a/src/libcore/ops.rs b/src/libcore/ops.rs index 9396adc0fe5..f16614cfd09 100644 --- a/src/libcore/ops.rs +++ b/src/libcore/ops.rs @@ -70,7 +70,7 @@ use marker::Sized; use fmt; -#[cfg(not(stage0))] // SNAP c64d671 +#[cfg(not(stage0))] use marker::Unsize; /// The `Drop` trait is used to run some code when a value goes out of scope. This @@ -1214,39 +1214,39 @@ mod impls { /// Trait that indicates that this is a pointer or a wrapper for one, /// where unsizing can be performed on the pointee. #[unstable(feature = "core")] -#[cfg(not(stage0))] // SNAP c64d671 +#[cfg(not(stage0))] #[lang="coerce_unsized"] pub trait CoerceUnsized<T> { // Empty. } // &mut T -> &mut U -#[cfg(not(stage0))] // SNAP c64d671 +#[cfg(not(stage0))] impl<'a, T: ?Sized+Unsize<U>, U: ?Sized> CoerceUnsized<&'a mut U> for &'a mut T {} // &mut T -> &U -#[cfg(not(stage0))] // SNAP c64d671 +#[cfg(not(stage0))] impl<'a, 'b: 'a, T: ?Sized+Unsize<U>, U: ?Sized> CoerceUnsized<&'a U> for &'b mut T {} // &mut T -> *mut U -#[cfg(not(stage0))] // SNAP c64d671 +#[cfg(not(stage0))] impl<'a, T: ?Sized+Unsize<U>, U: ?Sized> CoerceUnsized<*mut U> for &'a mut T {} // &mut T -> *const U -#[cfg(not(stage0))] // SNAP c64d671 +#[cfg(not(stage0))] impl<'a, T: ?Sized+Unsize<U>, U: ?Sized> CoerceUnsized<*const U> for &'a mut T {} // &T -> &U -#[cfg(not(stage0))] // SNAP c64d671 +#[cfg(not(stage0))] impl<'a, 'b: 'a, T: ?Sized+Unsize<U>, U: ?Sized> CoerceUnsized<&'a U> for &'b T {} // &T -> *const U -#[cfg(not(stage0))] // SNAP c64d671 +#[cfg(not(stage0))] impl<'a, T: ?Sized+Unsize<U>, U: ?Sized> CoerceUnsized<*const U> for &'a T {} // *mut T -> *mut U -#[cfg(not(stage0))] // SNAP c64d671 +#[cfg(not(stage0))] impl<T: ?Sized+Unsize<U>, U: ?Sized> CoerceUnsized<*mut U> for *mut T {} // *mut T -> *const U -#[cfg(not(stage0))] // SNAP c64d671 +#[cfg(not(stage0))] impl<T: ?Sized+Unsize<U>, U: ?Sized> CoerceUnsized<*const U> for *mut T {} // *const T -> *const U -#[cfg(not(stage0))] // SNAP c64d671 +#[cfg(not(stage0))] impl<T: ?Sized+Unsize<U>, U: ?Sized> CoerceUnsized<*const U> for *const T {} |