Removed @self and @Trait.

9 files changed, 0 insertions, 339 deletions

diff --git a/src/test/debug-info/generic-method-on-generic-struct.rs b/src/test/debug-info/generic-method-on-generic-struct.rs
index 767293c3dc8..f71106cacb1 100644
--- a/src/test/debug-info/generic-method-on-generic-struct.rs
+++ b/src/test/debug-info/generic-method-on-generic-struct.rs
@@ -64,38 +64,6 @@
 // check:$15 = -10.5
 // debugger:continue
 
-// MANAGED BY REF
-// debugger:finish
-// debugger:print *self
-// check:$16 = {x = -1}
-// debugger:print arg1
-// check:$17 = -11
-// debugger:print arg2
-// check:$18 = -12.5
-// debugger:continue
-
-// MANAGED BY VAL
-// debugger:finish
-// debugger:print self
-// check:$19 = {x = -1}
-// debugger:print arg1
-// check:$20 = -13
-// debugger:print *arg2
-// check:$21 = {-14, 14}
-// debugger:continue
-
-// MANAGED SELF
-// debugger:finish
-// debugger:print self->val
-// check:$22 = {x = -1}
-// debugger:print arg1
-// check:$23 = -15
-// debugger:print *arg2
-// check:$24 = {-16, 16.5}
-// debugger:continue
-
-#[feature(managed_boxes)];
-
 struct Struct<T> {
     x: T
 }
@@ -116,11 +84,6 @@ impl<T1> Struct<T1> {
         zzz();
         arg1
     }
-
-    fn self_managed<T2>(@self, arg1: int, arg2: T2) -> int {
-        zzz();
-        arg1
-    }
 }
 
 fn main() {
@@ -132,11 +95,6 @@ fn main() {
     let _ = owned.self_by_ref(-5, -6_i32);
     let _ = owned.self_by_val(-7, -8_i64);
     let _ = owned.self_owned(-9, -10.5_f32);
-
-    let managed = @Struct { x: -1_i16 };
-    let _ = managed.self_by_ref(-11, -12.5_f64);
-    let _ = managed.self_by_val(-13, &(-14, 14));
-    let _ = managed.self_managed(-15, &(-16, 16.5));
 }
 
 fn zzz() {()}
diff --git a/src/test/debug-info/method-on-enum.rs b/src/test/debug-info/method-on-enum.rs
index 272da1690fd..79594c5d389 100644
--- a/src/test/debug-info/method-on-enum.rs
+++ b/src/test/debug-info/method-on-enum.rs
@@ -64,37 +64,6 @@
 // check:$15 = -10
 // debugger:continue
 
-// MANAGED BY REF
-// debugger:finish
-// debugger:print *self
-// check:$16 = {{Variant2, [...]}, {Variant2, 117901063}}
-// debugger:print arg1
-// check:$17 = -11
-// debugger:print arg2
-// check:$18 = -12
-// debugger:continue
-
-// MANAGED BY VAL
-// debugger:finish
-// debugger:print self
-// check:$19 = {{Variant2, [...]}, {Variant2, 117901063}}
-// debugger:print arg1
-// check:$20 = -13
-// debugger:print arg2
-// check:$21 = -14
-// debugger:continue
-
-// MANAGED SELF
-// debugger:finish
-// debugger:print self->val
-// check:$22 = {{Variant2, [...]}, {Variant2, 117901063}}
-// debugger:print arg1
-// check:$23 = -15
-// debugger:print arg2
-// check:$24 = -16
-// debugger:continue
-
-#[feature(managed_boxes)];
 #[feature(struct_variant)];
 
 enum Enum {
@@ -118,11 +87,6 @@ impl Enum {
         zzz();
         arg1 + arg2
     }
-
-    fn self_managed(@self, arg1: int, arg2: int) -> int {
-        zzz();
-        arg1 + arg2
-    }
 }
 
 fn main() {
@@ -134,11 +98,6 @@ fn main() {
     let _ = owned.self_by_ref(-5, -6);
     let _ = owned.self_by_val(-7, -8);
     let _ = owned.self_owned(-9, -10);
-
-    let managed = @Variant2(117901063);
-    let _ = managed.self_by_ref(-11, -12);
-    let _ = managed.self_by_val(-13, -14);
-    let _ = managed.self_managed(-15, -16);
 }
 
 fn zzz() {()}
diff --git a/src/test/debug-info/method-on-generic-struct.rs b/src/test/debug-info/method-on-generic-struct.rs
index ebfdea04377..fc78aba707f 100644
--- a/src/test/debug-info/method-on-generic-struct.rs
+++ b/src/test/debug-info/method-on-generic-struct.rs
@@ -64,38 +64,6 @@
 // check:$15 = -10
 // debugger:continue
 
-// MANAGED BY REF
-// debugger:finish
-// debugger:print *self
-// check:$16 = {x = -1}
-// debugger:print arg1
-// check:$17 = -11
-// debugger:print arg2
-// check:$18 = -12
-// debugger:continue
-
-// MANAGED BY VAL
-// debugger:finish
-// debugger:print self
-// check:$19 = {x = -1}
-// debugger:print arg1
-// check:$20 = -13
-// debugger:print arg2
-// check:$21 = -14
-// debugger:continue
-
-// MANAGED SELF
-// debugger:finish
-// debugger:print self->val
-// check:$22 = {x = -1}
-// debugger:print arg1
-// check:$23 = -15
-// debugger:print arg2
-// check:$24 = -16
-// debugger:continue
-
-#[feature(managed_boxes)];
-
 struct Struct<T> {
     x: T
 }
@@ -116,11 +84,6 @@ impl<T> Struct<T> {
         zzz();
         arg1 + arg2
     }
-
-    fn self_managed(@self, arg1: int, arg2: int) -> int {
-        zzz();
-        arg1 + arg2
-    }
 }
 
 fn main() {
@@ -132,11 +95,6 @@ fn main() {
     let _ = owned.self_by_ref(-5, -6);
     let _ = owned.self_by_val(-7, -8);
     let _ = owned.self_owned(-9, -10);
-
-    let managed = @Struct { x: -1_i16 };
-    let _ = managed.self_by_ref(-11, -12);
-    let _ = managed.self_by_val(-13, -14);
-    let _ = managed.self_managed(-15, -16);
 }
 
 fn zzz() {()}
diff --git a/src/test/debug-info/method-on-struct.rs b/src/test/debug-info/method-on-struct.rs
index e88e5a5ca63..035ebf9caeb 100644
--- a/src/test/debug-info/method-on-struct.rs
+++ b/src/test/debug-info/method-on-struct.rs
@@ -64,38 +64,6 @@
 // check:$15 = -10
 // debugger:continue
 
-// MANAGED BY REF
-// debugger:finish
-// debugger:print *self
-// check:$16 = {x = 300}
-// debugger:print arg1
-// check:$17 = -11
-// debugger:print arg2
-// check:$18 = -12
-// debugger:continue
-
-// MANAGED BY VAL
-// debugger:finish
-// debugger:print self
-// check:$19 = {x = 300}
-// debugger:print arg1
-// check:$20 = -13
-// debugger:print arg2
-// check:$21 = -14
-// debugger:continue
-
-// MANAGED SELF
-// debugger:finish
-// debugger:print self->val
-// check:$22 = {x = 300}
-// debugger:print arg1
-// check:$23 = -15
-// debugger:print arg2
-// check:$24 = -16
-// debugger:continue
-
-#[feature(managed_boxes)];
-
 struct Struct {
     x: int
 }
@@ -116,11 +84,6 @@ impl Struct {
         zzz();
         self.x + arg1 + arg2
     }
-
-    fn self_managed(@self, arg1: int, arg2: int) -> int {
-        zzz();
-        self.x + arg1 + arg2
-    }
 }
 
 fn main() {
@@ -132,11 +95,6 @@ fn main() {
     let _ = owned.self_by_ref(-5, -6);
     let _ = owned.self_by_val(-7, -8);
     let _ = owned.self_owned(-9, -10);
-
-    let managed = @Struct { x: 300 };
-    let _ = managed.self_by_ref(-11, -12);
-    let _ = managed.self_by_val(-13, -14);
-    let _ = managed.self_managed(-15, -16);
 }
 
 fn zzz() {()}
diff --git a/src/test/debug-info/method-on-trait.rs b/src/test/debug-info/method-on-trait.rs
index fd58cc1a7d3..7cd5a845cba 100644
--- a/src/test/debug-info/method-on-trait.rs
+++ b/src/test/debug-info/method-on-trait.rs
@@ -64,38 +64,6 @@
 // check:$15 = -10
 // debugger:continue
 
-// MANAGED BY REF
-// debugger:finish
-// debugger:print *self
-// check:$16 = {x = 300}
-// debugger:print arg1
-// check:$17 = -11
-// debugger:print arg2
-// check:$18 = -12
-// debugger:continue
-
-// MANAGED BY VAL
-// debugger:finish
-// debugger:print self
-// check:$19 = {x = 300}
-// debugger:print arg1
-// check:$20 = -13
-// debugger:print arg2
-// check:$21 = -14
-// debugger:continue
-
-// MANAGED SELF
-// debugger:finish
-// debugger:print self->val
-// check:$22 = {x = 300}
-// debugger:print arg1
-// check:$23 = -15
-// debugger:print arg2
-// check:$24 = -16
-// debugger:continue
-
-#[feature(managed_boxes)];
-
 struct Struct {
     x: int
 }
@@ -104,7 +72,6 @@ trait Trait {
     fn self_by_ref(&self, arg1: int, arg2: int) -> int;
     fn self_by_val(self, arg1: int, arg2: int) -> int;
     fn self_owned(~self, arg1: int, arg2: int) -> int;
-    fn self_managed(@self, arg1: int, arg2: int) -> int;
 }
 
 impl Trait for Struct {
@@ -123,11 +90,6 @@ impl Trait for Struct {
         zzz();
         self.x + arg1 + arg2
     }
-
-    fn self_managed(@self, arg1: int, arg2: int) -> int {
-        zzz();
-        self.x + arg1 + arg2
-    }
 }
 
 fn main() {
@@ -139,11 +101,6 @@ fn main() {
     let _ = owned.self_by_ref(-5, -6);
     let _ = owned.self_by_val(-7, -8);
     let _ = owned.self_owned(-9, -10);
-
-    let managed = @Struct { x: 300 };
-    let _ = managed.self_by_ref(-11, -12);
-    let _ = managed.self_by_val(-13, -14);
-    let _ = managed.self_managed(-15, -16);
 }
 
 fn zzz() {()}
diff --git a/src/test/debug-info/method-on-tuple-struct.rs b/src/test/debug-info/method-on-tuple-struct.rs
index 98dbff988e7..029a5cd4c91 100644
--- a/src/test/debug-info/method-on-tuple-struct.rs
+++ b/src/test/debug-info/method-on-tuple-struct.rs
@@ -64,38 +64,6 @@
 // check:$15 = -10
 // debugger:continue
 
-// MANAGED BY REF
-// debugger:finish
-// debugger:print *self
-// check:$16 = {300, -300.5}
-// debugger:print arg1
-// check:$17 = -11
-// debugger:print arg2
-// check:$18 = -12
-// debugger:continue
-
-// MANAGED BY VAL
-// debugger:finish
-// debugger:print self
-// check:$19 = {300, -300.5}
-// debugger:print arg1
-// check:$20 = -13
-// debugger:print arg2
-// check:$21 = -14
-// debugger:continue
-
-// MANAGED SELF
-// debugger:finish
-// debugger:print self->val
-// check:$22 = {300, -300.5}
-// debugger:print arg1
-// check:$23 = -15
-// debugger:print arg2
-// check:$24 = -16
-// debugger:continue
-
-#[feature(managed_boxes)];
-
 struct TupleStruct(int, f64);
 
 impl TupleStruct {
@@ -114,11 +82,6 @@ impl TupleStruct {
         zzz();
         arg1 + arg2
     }
-
-    fn self_managed(@self, arg1: int, arg2: int) -> int {
-        zzz();
-        arg1 + arg2
-    }
 }
 
 fn main() {
@@ -130,11 +93,6 @@ fn main() {
     let _ = owned.self_by_ref(-5, -6);
     let _ = owned.self_by_val(-7, -8);
     let _ = owned.self_owned(-9, -10);
-
-    let managed = @TupleStruct(300, -300.5);
-    let _ = managed.self_by_ref(-11, -12);
-    let _ = managed.self_by_val(-13, -14);
-    let _ = managed.self_managed(-15, -16);
 }
 
 fn zzz() {()}
diff --git a/src/test/debug-info/self-in-default-method.rs b/src/test/debug-info/self-in-default-method.rs
index d5f735e77f4..9f0b0ea8414 100644
--- a/src/test/debug-info/self-in-default-method.rs
+++ b/src/test/debug-info/self-in-default-method.rs
@@ -64,38 +64,6 @@
 // check:$15 = -10
 // debugger:continue
 
-// MANAGED BY REF
-// debugger:finish
-// debugger:print *self
-// check:$16 = {x = 300}
-// debugger:print arg1
-// check:$17 = -11
-// debugger:print arg2
-// check:$18 = -12
-// debugger:continue
-
-// MANAGED BY VAL
-// debugger:finish
-// debugger:print self
-// check:$19 = {x = 300}
-// debugger:print arg1
-// check:$20 = -13
-// debugger:print arg2
-// check:$21 = -14
-// debugger:continue
-
-// MANAGED SELF
-// debugger:finish
-// debugger:print self->val
-// check:$22 = {x = 300}
-// debugger:print arg1
-// check:$23 = -15
-// debugger:print arg2
-// check:$24 = -16
-// debugger:continue
-
-#[feature(managed_boxes)];
-
 struct Struct {
     x: int
 }
@@ -115,11 +83,6 @@ trait Trait {
         zzz();
         arg1 + arg2
     }
-
-    fn self_managed(@self, arg1: int, arg2: int) -> int {
-        zzz();
-        arg1 + arg2
-    }
 }
 
 impl Trait for Struct {}
@@ -133,11 +96,6 @@ fn main() {
     let _ = owned.self_by_ref(-5, -6);
     let _ = owned.self_by_val(-7, -8);
     let _ = owned.self_owned(-9, -10);
-
-    let managed = @Struct { x: 300 };
-    let _ = managed.self_by_ref(-11, -12);
-    let _ = managed.self_by_val(-13, -14);
-    let _ = managed.self_managed(-15, -16);
 }
 
 fn zzz() {()}
diff --git a/src/test/debug-info/self-in-generic-default-method.rs b/src/test/debug-info/self-in-generic-default-method.rs
index e7a6ee77610..5ae88b3d0ce 100644
--- a/src/test/debug-info/self-in-generic-default-method.rs
+++ b/src/test/debug-info/self-in-generic-default-method.rs
@@ -64,38 +64,6 @@
 // check:$15 = -10.5
 // debugger:continue
 
-// MANAGED BY REF
-// debugger:finish
-// debugger:print *self
-// check:$16 = {x = 897}
-// debugger:print arg1
-// check:$17 = -11
-// debugger:print arg2
-// check:$18 = -12.5
-// debugger:continue
-
-// MANAGED BY VAL
-// debugger:finish
-// debugger:print self
-// check:$19 = {x = 897}
-// debugger:print arg1
-// check:$20 = -13
-// debugger:print *arg2
-// check:$21 = {-14, 14}
-// debugger:continue
-
-// MANAGED SELF
-// debugger:finish
-// debugger:print self->val
-// check:$22 = {x = 897}
-// debugger:print arg1
-// check:$23 = -15
-// debugger:print *arg2
-// check:$24 = {-16, 16.5}
-// debugger:continue
-
-#[feature(managed_boxes)];
-
 struct Struct {
     x: int
 }
@@ -116,11 +84,6 @@ trait Trait {
         zzz();
         arg1
     }
-
-    fn self_managed<T>(@self, arg1: int, arg2: T) -> int {
-        zzz();
-        arg1
-    }
 }
 
 impl Trait for Struct {}
@@ -134,11 +97,6 @@ fn main() {
     let _ = owned.self_by_ref(-5, -6_i32);
     let _ = owned.self_by_val(-7, -8_i64);
     let _ = owned.self_owned(-9, -10.5_f32);
-
-    let managed = @Struct { x: 897 };
-    let _ = managed.self_by_ref(-11, -12.5_f64);
-    let _ = managed.self_by_val(-13, &(-14, 14));
-    let _ = managed.self_managed(-15, &(-16, 16.5));
 }
 
 fn zzz() {()}
diff --git a/src/test/debug-info/trait-pointers.rs b/src/test/debug-info/trait-pointers.rs
index 4bdfc6bfaf6..de46e1aea58 100644
--- a/src/test/debug-info/trait-pointers.rs
+++ b/src/test/debug-info/trait-pointers.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[feature(managed_boxes)];
-
 // xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info
@@ -32,6 +30,5 @@ impl Trait for Struct {}
 fn main() {
     let stack_struct = Struct { a:0, b: 1.0 };
     let reference: &Trait = &stack_struct as &Trait;
-    let managed: @Trait = @Struct { a:2, b: 3.0 } as @Trait;
     let unique: ~Trait = ~Struct { a:2, b: 3.0 } as ~Trait;
 }