Auto merge of #112346 - saethlin:no-comment, r=oli-obk

Remove comments from mir-opt MIR dumps

See https://rust-lang.zulipchat.com/#narrow/stream/189540-t-compiler.2Fwg-mir-opt/topic/Line.20numbers.20in.20mir-opt.20tests/near/363849874

In https://github.com/rust-lang/rust/pull/99780 there is mention that "there has been a zulip conversation about disabling line numbers with mixed opinions" which to me means that some people opposed this. I can't find the referenced conversation so... here we go.

The current situation is quite chaotic. It's not hard to find MIR diffs which contain

* Absolute line numbers
* Relative line numbers
* Substituted line numbers (LL)
For example: https://github.com/rust-lang/rust/blob/408bbd040613f6776e0a7d05d582c81f4ddc189a/tests/mir-opt/inline/inline_shims.drop.Inline.diff#L10-L17

And sometimes adding a comment at the top of a mir-opt test generates a diff in the test because a line number changed: https://github.com/rust-lang/rust/pull/98112/files#diff-b8cf4bcce95078e6a3faf075e9abf6864872fb28a64d95c04f04513b9e3bbd81

And irrelevant changes to the standard library can generate diffs in mir-opt tests: https://github.com/rust-lang/rust/pull/110694/files#diff-bf96b0e7c67b8b272814536888fd9428c314991e155beae1f0a2a67f0ac47b2c
https://github.com/rust-lang/rust/commit/769886cc35ce08b76839f4cf72b8af1161c432e1

I think we should, specifically in mir-opt tests, completely remove the comments, or insert placeholders for all line and column numbers.

1 files changed, 36 insertions, 36 deletions

diff --git a/tests/mir-opt/dataflow-const-prop/struct.main.DataflowConstProp.diff b/tests/mir-opt/dataflow-const-prop/struct.main.DataflowConstProp.diff
index 53c62c08173..914bc8ac47e 100644
--- a/tests/mir-opt/dataflow-const-prop/struct.main.DataflowConstProp.diff
+++ b/tests/mir-opt/dataflow-const-prop/struct.main.DataflowConstProp.diff
@@ -2,50 +2,50 @@
 + // MIR for `main` after DataflowConstProp
   
   fn main() -> () {
-      let mut _0: ();                      // return place in scope 0 at $DIR/struct.rs:+0:11: +0:11
-      let mut _1: S;                       // in scope 0 at $DIR/struct.rs:+1:9: +1:14
-      let mut _3: i32;                     // in scope 0 at $DIR/struct.rs:+2:13: +2:16
-      let mut _5: i32;                     // in scope 0 at $DIR/struct.rs:+4:13: +4:14
-      let mut _6: i32;                     // in scope 0 at $DIR/struct.rs:+4:17: +4:20
+      let mut _0: ();
+      let mut _1: S;
+      let mut _3: i32;
+      let mut _5: i32;
+      let mut _6: i32;
       scope 1 {
-          debug s => _1;                   // in scope 1 at $DIR/struct.rs:+1:9: +1:14
-          let _2: i32;                     // in scope 1 at $DIR/struct.rs:+2:9: +2:10
+          debug s => _1;
+          let _2: i32;
           scope 2 {
-              debug a => _2;               // in scope 2 at $DIR/struct.rs:+2:9: +2:10
-              let _4: i32;                 // in scope 2 at $DIR/struct.rs:+4:9: +4:10
+              debug a => _2;
+              let _4: i32;
               scope 3 {
-                  debug b => _4;           // in scope 3 at $DIR/struct.rs:+4:9: +4:10
+                  debug b => _4;
               }
           }
       }
   
       bb0: {
-          StorageLive(_1);                 // scope 0 at $DIR/struct.rs:+1:9: +1:14
-          _1 = S(const 1_i32);             // scope 0 at $DIR/struct.rs:+1:17: +1:21
-          StorageLive(_2);                 // scope 1 at $DIR/struct.rs:+2:9: +2:10
-          StorageLive(_3);                 // scope 1 at $DIR/struct.rs:+2:13: +2:16
--         _3 = (_1.0: i32);                // scope 1 at $DIR/struct.rs:+2:13: +2:16
--         _2 = Add(move _3, const 2_i32);  // scope 1 at $DIR/struct.rs:+2:13: +2:20
-+         _3 = const 1_i32;                // scope 1 at $DIR/struct.rs:+2:13: +2:16
-+         _2 = const 3_i32;                // scope 1 at $DIR/struct.rs:+2:13: +2:20
-          StorageDead(_3);                 // scope 1 at $DIR/struct.rs:+2:19: +2:20
-          (_1.0: i32) = const 3_i32;       // scope 2 at $DIR/struct.rs:+3:5: +3:12
-          StorageLive(_4);                 // scope 2 at $DIR/struct.rs:+4:9: +4:10
-          StorageLive(_5);                 // scope 2 at $DIR/struct.rs:+4:13: +4:14
--         _5 = _2;                         // scope 2 at $DIR/struct.rs:+4:13: +4:14
-+         _5 = const 3_i32;                // scope 2 at $DIR/struct.rs:+4:13: +4:14
-          StorageLive(_6);                 // scope 2 at $DIR/struct.rs:+4:17: +4:20
--         _6 = (_1.0: i32);                // scope 2 at $DIR/struct.rs:+4:17: +4:20
--         _4 = Add(move _5, move _6);      // scope 2 at $DIR/struct.rs:+4:13: +4:20
-+         _6 = const 3_i32;                // scope 2 at $DIR/struct.rs:+4:17: +4:20
-+         _4 = const 6_i32;                // scope 2 at $DIR/struct.rs:+4:13: +4:20
-          StorageDead(_6);                 // scope 2 at $DIR/struct.rs:+4:19: +4:20
-          StorageDead(_5);                 // scope 2 at $DIR/struct.rs:+4:19: +4:20
-          _0 = const ();                   // scope 0 at $DIR/struct.rs:+0:11: +5:2
-          StorageDead(_4);                 // scope 2 at $DIR/struct.rs:+5:1: +5:2
-          StorageDead(_2);                 // scope 1 at $DIR/struct.rs:+5:1: +5:2
-          StorageDead(_1);                 // scope 0 at $DIR/struct.rs:+5:1: +5:2
-          return;                          // scope 0 at $DIR/struct.rs:+5:2: +5:2
+          StorageLive(_1);
+          _1 = S(const 1_i32);
+          StorageLive(_2);
+          StorageLive(_3);
+-         _3 = (_1.0: i32);
+-         _2 = Add(move _3, const 2_i32);
++         _3 = const 1_i32;
++         _2 = const 3_i32;
+          StorageDead(_3);
+          (_1.0: i32) = const 3_i32;
+          StorageLive(_4);
+          StorageLive(_5);
+-         _5 = _2;
++         _5 = const 3_i32;
+          StorageLive(_6);
+-         _6 = (_1.0: i32);
+-         _4 = Add(move _5, move _6);
++         _6 = const 3_i32;
++         _4 = const 6_i32;
+          StorageDead(_6);
+          StorageDead(_5);
+          _0 = const ();
+          StorageDead(_4);
+          StorageDead(_2);
+          StorageDead(_1);
+          return;
       }
   }