Skip to content

Commit

Permalink
Remove SNAP comments
Browse files Browse the repository at this point in the history
  • Loading branch information
nrc committed May 13, 2015
1 parent 31bb4ab commit 4446d44
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 26 deletions.
6 changes: 3 additions & 3 deletions src/liballoc/boxed.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ use core::ops::{Deref, DerefMut};
use core::ptr::{Unique};
use core::raw::{TraitObject};

#[cfg(not(stage0))] // SNAP c64d671
#[cfg(not(stage0))]
use core::marker::Unsize;
#[cfg(not(stage0))] // SNAP c64d671
#[cfg(not(stage0))]
use core::ops::CoerceUnsized;

/// A value that represents the heap. This is the default place that the `box`
Expand Down Expand Up @@ -396,5 +396,5 @@ impl<'a,A,R> FnOnce<A> for Box<FnBox<A,Output=R>+Send+'a> {
}
}

#[cfg(not(stage0))] // SNAP c64d671
#[cfg(not(stage0))]
impl<T: ?Sized+Unsize<U>, U: ?Sized> CoerceUnsized<Box<U>> for Box<T> {}
10 changes: 5 additions & 5 deletions src/liballoc/rc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ impl<T> !marker::Sync for Rc<T> {}
#[cfg(not(stage0))]
impl<T: ?Sized> !marker::Sync for Rc<T> {}

#[cfg(not(stage0))] // SNAP c64d671
#[cfg(not(stage0))]
impl<T: ?Sized+Unsize<U>, U: ?Sized> CoerceUnsized<Rc<U>> for Rc<T> {}

impl<T> Rc<T> {
Expand Down Expand Up @@ -459,7 +459,7 @@ impl<T: ?Sized> Deref for Rc<T> {
}
}

#[cfg(stage0)] // SNAP c64d671
#[cfg(stage0)]
#[stable(feature = "rust1", since = "1.0.0")]
impl<T> Drop for Rc<T> {
/// Drops the `Rc<T>`.
Expand Down Expand Up @@ -510,7 +510,7 @@ impl<T> Drop for Rc<T> {
}
}

#[cfg(not(stage0))] // SNAP c64d671
#[cfg(not(stage0))]
#[stable(feature = "rust1", since = "1.0.0")]
impl<T: ?Sized> Drop for Rc<T> {
/// Drops the `Rc<T>`.
Expand Down Expand Up @@ -930,7 +930,7 @@ impl<T: ?Sized> Weak<T> {
}
}

#[cfg(stage0)] // SNAP c64d671
#[cfg(stage0)]
#[stable(feature = "rust1", since = "1.0.0")]
impl<T> Drop for Weak<T> {
/// Drops the `Weak<T>`.
Expand Down Expand Up @@ -975,7 +975,7 @@ impl<T> Drop for Weak<T> {
}
}

#[cfg(not(stage0))] // SNAP c64d671
#[cfg(not(stage0))]
#[stable(feature = "rust1", since = "1.0.0")]
impl<T: ?Sized> Drop for Weak<T> {
/// Drops the `Weak<T>`.
Expand Down
2 changes: 1 addition & 1 deletion src/libcore/marker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions src/libcore/mem.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 {
Expand Down Expand Up @@ -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 {
Expand All @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions src/libcore/nonzero.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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> {}
22 changes: 11 additions & 11 deletions src/libcore/ops.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 {}

0 comments on commit 4446d44

Please sign in to comment.