auto merge of #17725 : alexcrichton/rust/rollup, r=alexcrichton

1 files changed, 16 insertions, 114 deletions

diff --git a/src/test/debuginfo/recursive-struct.rs b/src/test/debuginfo/recursive-struct.rs
index 76722b743d7..40c056f5cd2 100644
--- a/src/test/debuginfo/recursive-struct.rs
+++ b/src/test/debuginfo/recursive-struct.rs
@@ -29,85 +29,52 @@
 // gdb-command:print unique_unique->next.RUST$ENCODED$ENUM$0$Empty.val->value
 // gdb-check:$4 = 3
 
-// gdb-command:print box_unique->val.value
-// gdb-check:$5 = 4
-// gdb-command:print box_unique->val.next.RUST$ENCODED$ENUM$0$Empty.val->value
-// gdb-check:$6 = 5
-
 // gdb-command:print vec_unique[0].value
-// gdb-check:$7 = 6.5
+// gdb-check:$5 = 6.5
 // gdb-command:print vec_unique[0].next.RUST$ENCODED$ENUM$0$Empty.val->value
-// gdb-check:$8 = 7.5
+// gdb-check:$6 = 7.5
 
 // gdb-command:print borrowed_unique->value
-// gdb-check:$9 = 8.5
+// gdb-check:$7 = 8.5
 // gdb-command:print borrowed_unique->next.RUST$ENCODED$ENUM$0$Empty.val->value
-// gdb-check:$10 = 9.5
-
-// MANAGED
-// gdb-command:print stack_managed.value
-// gdb-check:$11 = 10
-// gdb-command:print stack_managed.next.RUST$ENCODED$ENUM$0$Empty.val->val.value
-// gdb-check:$12 = 11
-
-// gdb-command:print unique_managed->value
-// gdb-check:$13 = 12
-// gdb-command:print unique_managed->next.RUST$ENCODED$ENUM$0$Empty.val->val.value
-// gdb-check:$14 = 13
-
-// gdb-command:print box_managed.val->value
-// gdb-check:$15 = 14
-// gdb-command:print box_managed->val->next.RUST$ENCODED$ENUM$0$Empty.val->val.value
-// gdb-check:$16 = 15
-
-// gdb-command:print vec_managed[0].value
-// gdb-check:$17 = 16.5
-// gdb-command:print vec_managed[0].next.RUST$ENCODED$ENUM$0$Empty.val->val.value
-// gdb-check:$18 = 17.5
-
-// gdb-command:print borrowed_managed->value
-// gdb-check:$19 = 18.5
-// gdb-command:print borrowed_managed->next.RUST$ENCODED$ENUM$0$Empty.val->val.value
-// gdb-check:$20 = 19.5
+// gdb-check:$8 = 9.5
 
 // LONG CYCLE
 // gdb-command:print long_cycle1.value
-// gdb-check:$21 = 20
+// gdb-check:$9 = 20
 // gdb-command:print long_cycle1.next->value
-// gdb-check:$22 = 21
+// gdb-check:$10 = 21
 // gdb-command:print long_cycle1.next->next->value
-// gdb-check:$23 = 22
+// gdb-check:$11 = 22
 // gdb-command:print long_cycle1.next->next->next->value
-// gdb-check:$24 = 23
+// gdb-check:$12 = 23
 
 // gdb-command:print long_cycle2.value
-// gdb-check:$25 = 24
+// gdb-check:$13 = 24
 // gdb-command:print long_cycle2.next->value
-// gdb-check:$26 = 25
+// gdb-check:$14 = 25
 // gdb-command:print long_cycle2.next->next->value
-// gdb-check:$27 = 26
+// gdb-check:$15 = 26
 
 // gdb-command:print long_cycle3.value
-// gdb-check:$28 = 27
+// gdb-check:$16 = 27
 // gdb-command:print long_cycle3.next->value
-// gdb-check:$29 = 28
+// gdb-check:$17 = 28
 
 // gdb-command:print long_cycle4.value
-// gdb-check:$30 = 29.5
+// gdb-check:$18 = 29.5
 
 // gdb-command:print (*****long_cycle_w_anonymous_types).value
-// gdb-check:$31 = 30
+// gdb-check:$19 = 30
 
 // gdb-command:print (*****((*****long_cycle_w_anonymous_types).next.RUST$ENCODED$ENUM$0$Empty.val)).value
-// gdb-check:$32 = 31
+// gdb-check:$20 = 31
 
 // gdb-command:continue
 
 #![allow(unused_variable)]
 #![feature(struct_variant)]
 
-use std::gc::{Gc, GC};
-
 enum Opt<T> {
     Empty,
     Val { val: T }
@@ -118,11 +85,6 @@ struct UniqueNode<T> {
     value: T
 }
 
-struct ManagedNode<T> {
-    next: Opt<Gc<ManagedNode<T>>>,
-    value: T
-}
-
 struct LongCycle1<T> {
     next: Box<LongCycle2<T>>,
     value: T,
@@ -184,16 +146,6 @@ fn main() {
         value: 2,
     };
 
-    let box_unique: Gc<UniqueNode<u64>> = box(GC) UniqueNode {
-        next: Val {
-            val: box UniqueNode {
-                next: Empty,
-                value: 5,
-            }
-        },
-        value: 4,
-    };
-
     let vec_unique: [UniqueNode<f32>, ..1] = [UniqueNode {
         next: Val {
             val: box UniqueNode {
@@ -214,56 +166,6 @@ fn main() {
         value: 8.5,
     };
 
-    let stack_managed: ManagedNode<u16> = ManagedNode {
-        next: Val {
-            val: box(GC) ManagedNode {
-                next: Empty,
-                value: 11,
-            }
-        },
-        value: 10,
-    };
-
-    let unique_managed: Box<ManagedNode<u32>> = box ManagedNode {
-        next: Val {
-            val: box(GC) ManagedNode {
-                next: Empty,
-                value: 13,
-            }
-        },
-        value: 12,
-    };
-
-    let box_managed: Gc<ManagedNode<u64>> = box(GC) ManagedNode {
-        next: Val {
-            val: box(GC) ManagedNode {
-                next: Empty,
-                value: 15,
-            }
-        },
-        value: 14,
-    };
-
-    let vec_managed: [ManagedNode<f32>, ..1] = [ManagedNode {
-        next: Val {
-            val: box(GC) ManagedNode {
-                next: Empty,
-                value: 17.5,
-            }
-        },
-        value: 16.5,
-    }];
-
-    let borrowed_managed: &ManagedNode<f64> = &ManagedNode {
-        next: Val {
-            val: box(GC) ManagedNode {
-                next: Empty,
-                value: 19.5,
-            }
-        },
-        value: 18.5,
-    };
-
     // LONG CYCLE
     let long_cycle1: LongCycle1<u16> = LongCycle1 {
         next: box LongCycle2 {