From b2d30b72bfaa1f36808151e5825073cdff2e7ea7 Mon Sep 17 00:00:00 2001
From: Eduard Burtescu <edy.burt@gmail.com>
Date: Fri, 7 Feb 2014 00:38:33 +0200
Subject: Removed @self and @Trait.

---
 src/libstd/any.rs     | 26 --------------------------
 src/libstd/reflect.rs |  4 ++--
 2 files changed, 2 insertions(+), 28 deletions(-)

(limited to 'src/libstd')

diff --git a/src/libstd/any.rs b/src/libstd/any.rs
index 72ccf6be023..4433bd9096f 100644
--- a/src/libstd/any.rs
+++ b/src/libstd/any.rs
@@ -177,15 +177,6 @@ mod tests {
         assert_eq!(b.as_void_ptr(), b_r.as_void_ptr());
         assert_eq!(c.as_void_ptr(), c_r.as_void_ptr());
 
-        let (a, b, c) = (@5u as @Any, @TEST as @Any, @Test as @Any);
-        let a_r: &Any = a;
-        let b_r: &Any = b;
-        let c_r: &Any = c;
-
-        assert_eq!(a.as_void_ptr(), a_r.as_void_ptr());
-        assert_eq!(b.as_void_ptr(), b_r.as_void_ptr());
-        assert_eq!(c.as_void_ptr(), c_r.as_void_ptr());
-
         let (a, b, c) = (&5u as &Any, &TEST as &Any, &Test as &Any);
         let a_r: &Any = a;
         let b_r: &Any = b;
@@ -303,23 +294,6 @@ mod tests {
         assert!(c.is::<Test>());
     }
 
-    #[test]
-    fn any_managed() {
-        let (a, b, c) = (@5u as @Any, @TEST as @Any, @Test as @Any);
-
-        assert!(a.is::<uint>());
-        assert!(!b.is::<uint>());
-        assert!(!c.is::<uint>());
-
-        assert!(!a.is::<&'static str>());
-        assert!(b.is::<&'static str>());
-        assert!(!c.is::<&'static str>());
-
-        assert!(!a.is::<Test>());
-        assert!(!b.is::<Test>());
-        assert!(c.is::<Test>());
-    }
-
     #[test]
     fn any_as_ref() {
         let a = &5u as &Any;
diff --git a/src/libstd/reflect.rs b/src/libstd/reflect.rs
index 168ed583570..e441ea6ec74 100644
--- a/src/libstd/reflect.rs
+++ b/src/libstd/reflect.rs
@@ -424,9 +424,9 @@ impl<V:TyVisitor + MovePtr> TyVisitor for MovePtrAdaptor<V> {
     }
 
     fn visit_trait(&mut self, name: &str) -> bool {
-        self.align_to::<@TyVisitor>();
+        self.align_to::<~TyVisitor>();
         if ! self.inner.visit_trait(name) { return false; }
-        self.bump_past::<@TyVisitor>();
+        self.bump_past::<~TyVisitor>();
         true
     }
 
-- 
cgit 1.4.1-3-g733a5