Remove comments from mir-opt MIR dumps

1 files changed, 34 insertions, 40 deletions

diff --git a/tests/mir-opt/unreachable_diverging.main.UnreachablePropagation.panic-unwind.diff b/tests/mir-opt/unreachable_diverging.main.UnreachablePropagation.panic-unwind.diff
index 94bc633613b..9d54a2f234b 100644
--- a/tests/mir-opt/unreachable_diverging.main.UnreachablePropagation.panic-unwind.diff
+++ b/tests/mir-opt/unreachable_diverging.main.UnreachablePropagation.panic-unwind.diff
@@ -2,70 +2,64 @@
 + // MIR for `main` after UnreachablePropagation
   
   fn main() -> () {
-      let mut _0: ();                      // return place in scope 0 at $DIR/unreachable_diverging.rs:+0:11: +0:11
-      let _1: bool;                        // in scope 0 at $DIR/unreachable_diverging.rs:+1:9: +1:10
-      let mut _2: std::option::Option<Empty>; // in scope 0 at $DIR/unreachable_diverging.rs:+2:25: +2:32
-      let mut _3: isize;                   // in scope 0 at $DIR/unreachable_diverging.rs:+2:12: +2:22
-      let _5: ();                          // in scope 0 at $DIR/unreachable_diverging.rs:+3:9: +5:10
-      let mut _6: bool;                    // in scope 0 at $DIR/unreachable_diverging.rs:+3:12: +3:13
-      let mut _7: !;                       // in scope 0 at $DIR/unreachable_diverging.rs:+6:9: +6:22
+      let mut _0: ();
+      let _1: bool;
+      let mut _2: std::option::Option<Empty>;
+      let mut _3: isize;
+      let _5: ();
+      let mut _6: bool;
+      let mut _7: !;
       scope 1 {
-          debug x => _1;                   // in scope 1 at $DIR/unreachable_diverging.rs:+1:9: +1:10
+          debug x => _1;
           scope 2 {
-              debug bomb => _4;            // in scope 2 at $DIR/unreachable_diverging.rs:+2:17: +2:21
-              let _4: Empty;               // in scope 2 at $DIR/unreachable_diverging.rs:+2:17: +2:21
+              debug bomb => _4;
+              let _4: Empty;
           }
       }
   
       bb0: {
-          StorageLive(_1);                 // scope 0 at $DIR/unreachable_diverging.rs:+1:9: +1:10
-          _1 = const true;                 // scope 0 at $DIR/unreachable_diverging.rs:+1:13: +1:17
-          StorageLive(_2);                 // scope 2 at $DIR/unreachable_diverging.rs:+2:25: +2:32
-          _2 = empty() -> bb1;             // scope 2 at $DIR/unreachable_diverging.rs:+2:25: +2:32
-                                           // mir::Constant
-                                           // + span: $DIR/unreachable_diverging.rs:15:25: 15:30
-                                           // + literal: Const { ty: fn() -> Option<Empty> {empty}, val: Value(<ZST>) }
+          StorageLive(_1);
+          _1 = const true;
+          StorageLive(_2);
+          _2 = empty() -> bb1;
       }
   
       bb1: {
-          _3 = discriminant(_2);           // scope 2 at $DIR/unreachable_diverging.rs:+2:12: +2:22
-          switchInt(move _3) -> [1: bb2, otherwise: bb6]; // scope 2 at $DIR/unreachable_diverging.rs:+2:12: +2:22
+          _3 = discriminant(_2);
+          switchInt(move _3) -> [1: bb2, otherwise: bb6];
       }
   
       bb2: {
-          StorageLive(_4);                 // scope 2 at $DIR/unreachable_diverging.rs:+2:17: +2:21
-          _4 = move ((_2 as Some).0: Empty); // scope 2 at $DIR/unreachable_diverging.rs:+2:17: +2:21
-          StorageLive(_5);                 // scope 2 at $DIR/unreachable_diverging.rs:+3:9: +5:10
-          StorageLive(_6);                 // scope 2 at $DIR/unreachable_diverging.rs:+3:12: +3:13
-          _6 = _1;                         // scope 2 at $DIR/unreachable_diverging.rs:+3:12: +3:13
-          switchInt(move _6) -> [0: bb4, otherwise: bb3]; // scope 2 at $DIR/unreachable_diverging.rs:+3:12: +3:13
+          StorageLive(_4);
+          _4 = move ((_2 as Some).0: Empty);
+          StorageLive(_5);
+          StorageLive(_6);
+          _6 = _1;
+          switchInt(move _6) -> [0: bb4, otherwise: bb3];
       }
   
       bb3: {
-          _5 = loop_forever() -> bb5;      // scope 2 at $DIR/unreachable_diverging.rs:+4:13: +4:27
-                                           // mir::Constant
-                                           // + span: $DIR/unreachable_diverging.rs:17:13: 17:25
-                                           // + literal: Const { ty: fn() {loop_forever}, val: Value(<ZST>) }
+          _5 = loop_forever() -> bb5;
       }
   
       bb4: {
--         _5 = const ();                   // scope 2 at $DIR/unreachable_diverging.rs:+5:10: +5:10
--         goto -> bb5;                     // scope 2 at $DIR/unreachable_diverging.rs:+3:9: +5:10
-+         unreachable;                     // scope 2 at $DIR/unreachable_diverging.rs:+3:9: +5:10
+-         _5 = const ();
+-         goto -> bb5;
++         unreachable;
       }
   
       bb5: {
--         StorageDead(_6);                 // scope 2 at $DIR/unreachable_diverging.rs:+5:9: +5:10
--         StorageDead(_5);                 // scope 2 at $DIR/unreachable_diverging.rs:+5:9: +5:10
--         StorageLive(_7);                 // scope 2 at $DIR/unreachable_diverging.rs:+6:9: +6:22
-          unreachable;                     // scope 2 at $DIR/unreachable_diverging.rs:+6:15: +6:19
+-         StorageDead(_6);
+-         StorageDead(_5);
+-         StorageLive(_7);
+          unreachable;
       }
   
       bb6: {
-          _0 = const ();                   // scope 1 at $DIR/unreachable_diverging.rs:+7:6: +7:6
-          StorageDead(_1);                 // scope 0 at $DIR/unreachable_diverging.rs:+8:1: +8:2
-          StorageDead(_2);                 // scope 0 at $DIR/unreachable_diverging.rs:+8:1: +8:2
-          return;                          // scope 0 at $DIR/unreachable_diverging.rs:+8:2: +8:2
+          _0 = const ();
+          StorageDead(_1);
+          StorageDead(_2);
+          return;
       }
   }