auto merge of #13188 : FlaPer87/rust/master, r=alexcrichton

2 files changed, 0 insertions, 27 deletions

diff --git a/src/libstd/cmp.rs b/src/libstd/cmp.rs
index a8d5aa6e38e..2fa8ff80d86 100644
--- a/src/libstd/cmp.rs
+++ b/src/libstd/cmp.rs
@@ -42,7 +42,6 @@ pub trait Eq {
 }
 
 /// Trait for equality comparisons where `a == b` and `a != b` are strict inverses.
-#[cfg(not(stage0))]
 pub trait TotalEq: Eq {
     // FIXME #13101: this method is used solely by #[deriving] to
     // assert that every component of a type implements #[deriving]
@@ -56,15 +55,6 @@ pub trait TotalEq: Eq {
     fn assert_receiver_is_total_eq(&self) {}
 }
 
-#[cfg(stage0)]
-pub trait TotalEq: Eq {
-    /// This method must return the same value as `eq`. It exists to prevent
-    /// deriving `TotalEq` from fields not implementing the `TotalEq` trait.
-    fn equals(&self, other: &Self) -> bool {
-        self.eq(other)
-    }
-}
-
 macro_rules! totaleq_impl(
     ($t:ty) => {
         impl TotalEq for $t {}
diff --git a/src/libstd/kinds.rs b/src/libstd/kinds.rs
index c01b09dd5ac..76aa0d42548 100644
--- a/src/libstd/kinds.rs
+++ b/src/libstd/kinds.rs
@@ -33,14 +33,6 @@ pub trait Sized {
 }
 
 /// Types that can be copied by simply copying bits (i.e. `memcpy`).
-#[cfg(stage0)]
-#[lang="pod"]
-pub trait Copy {
-    // Empty.
-}
-
-/// Types that can be copied by simply copying bits (i.e. `memcpy`).
-#[cfg(not(stage0))]
 #[lang="copy"]
 pub trait Copy {
     // Empty.
@@ -270,19 +262,10 @@ pub mod marker {
     /// A type which is considered "not POD", meaning that it is not
     /// implicitly copyable. This is typically embedded in other types to
     /// ensure that they are never copied, even if they lack a destructor.
-    #[cfg(not(stage0))]
     #[lang="no_copy_bound"]
     #[deriving(Eq,Clone)]
     pub struct NoCopy;
 
-    /// A type which is considered "not POD", meaning that it is not
-    /// implicitly copyable. This is typically embedded in other types to
-    /// ensure that they are never copied, even if they lack a destructor.
-    #[cfg(stage0)]
-    #[lang="no_pod_bound"]
-    #[deriving(Eq,Clone)]
-    pub struct NoCopy;
-
     /// A type which is considered "not sharable", meaning that
     /// its contents are not threadsafe, hence they cannot be
     /// shared between tasks.