3 files changed, 12 insertions, 22 deletions
diff --git a/src/test/debug-info/struct-in-struct.rs b/src/test/debug-info/struct-in-struct.rs
index cfd8c24caa2..04c5eec610b 100644
--- a/src/test/debug-info/struct-in-struct.rs
+++ b/src/test/debug-info/struct-in-struct.rs
@@ -111,20 +111,15 @@ fn main() {
     };
 
     let bag = Bag { x: Simple { x: 22 } };
-    let bag_in_bag = BagInBag
-    {
-        x: Bag
-        {
+    let bag_in_bag = BagInBag {
+        x: Bag {
             x: Simple { x: 23 }
         }
     };
 
-    let tjo = ThatsJustOverkill
-    {
-        x: BagInBag
-        {
-            x: Bag
-            {
+    let tjo = ThatsJustOverkill {
+        x: BagInBag {
+            x: Bag {
                 x: Simple { x: 24 }
             }
         }
@@ -132,16 +127,13 @@ fn main() {
 
     let tree = Tree {
         x: Simple { x: 25 },
-        y: InternalPaddingParent
-        {
+        y: InternalPaddingParent {
             x: InternalPadding { x: 26, y: 27 },
             y: InternalPadding { x: 28, y: 29 },
             z: InternalPadding { x: 30, y: 31 }
         },
-        z: BagInBag
-        {
-            x: Bag
-            {
+        z: BagInBag {
+            x: Bag {
                 x: Simple { x: 32 }
             }
         }
diff --git a/src/test/debug-info/struct-with-destructor.rs b/src/test/debug-info/struct-with-destructor.rs
index b5ae4bbe8fb..c023e3c2ccb 100644
--- a/src/test/debug-info/struct-with-destructor.rs
+++ b/src/test/debug-info/struct-with-destructor.rs
@@ -37,14 +37,12 @@ impl Drop for WithDestructor {
     fn finalize(&self) {}
 }
 
-struct NoDestructorGuarded
-{
+struct NoDestructorGuarded {
     a: NoDestructor,
     guard: i64
 }
 
-struct WithDestructorGuarded
-{
+struct WithDestructorGuarded {
     a: WithDestructor,
     guard: i64
 }
diff --git a/src/test/debug-info/variable-scope.rs b/src/test/debug-info/variable-scope.rs
index a9177ac1966..dd3a1671b78 100644
--- a/src/test/debug-info/variable-scope.rs
+++ b/src/test/debug-info/variable-scope.rs
@@ -19,12 +19,12 @@
 // debugger:print y
 // check:$2 = true
 
-// debugger:run
+// debugger:continue
 // debugger:finish
 // debugger:print x
 // check:$3 = 10
 
-// debugger:run
+// debugger:continue
 // debugger:finish
 // debugger:print x
 // check:$4 = false