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, 32 insertions, 32 deletions

diff --git a/tests/mir-opt/lower_array_len.array_len_raw.NormalizeArrayLen.panic-unwind.diff b/tests/mir-opt/lower_array_len.array_len_raw.NormalizeArrayLen.panic-unwind.diff
index 8b35fd57fa0..c407482d17b 100644
--- a/tests/mir-opt/lower_array_len.array_len_raw.NormalizeArrayLen.panic-unwind.diff
+++ b/tests/mir-opt/lower_array_len.array_len_raw.NormalizeArrayLen.panic-unwind.diff
@@ -2,49 +2,49 @@
 + // MIR for `array_len_raw` after NormalizeArrayLen
   
   fn array_len_raw(_1: [u8; N]) -> usize {
-      debug arr => _1;                     // in scope 0 at $DIR/lower_array_len.rs:+0:38: +0:41
-      let mut _0: usize;                   // return place in scope 0 at $DIR/lower_array_len.rs:+0:55: +0:60
-      let _2: &[u8];                       // in scope 0 at $DIR/lower_array_len.rs:+1:9: +1:12
-      let mut _3: &[u8; N];                // in scope 0 at $DIR/lower_array_len.rs:+1:21: +1:25
-      let _4: &[u8; N];                    // in scope 0 at $DIR/lower_array_len.rs:+1:21: +1:25
-      let mut _6: &[u8];                   // in scope 0 at $DIR/lower_array_len.rs:+3:5: +3:27
-      let _7: &[u8];                       // in scope 0 at $DIR/lower_array_len.rs:+3:14: +3:19
+      debug arr => _1;
+      let mut _0: usize;
+      let _2: &[u8];
+      let mut _3: &[u8; N];
+      let _4: &[u8; N];
+      let mut _6: &[u8];
+      let _7: &[u8];
       scope 1 {
-          debug arr => _2;                 // in scope 1 at $DIR/lower_array_len.rs:+1:9: +1:12
-          let _5: *const [u8];             // in scope 1 at $DIR/lower_array_len.rs:+2:9: +2:12
+          debug arr => _2;
+          let _5: *const [u8];
           scope 2 {
-              debug arr => _5;             // in scope 2 at $DIR/lower_array_len.rs:+2:9: +2:12
+              debug arr => _5;
               scope 3 {
               }
           }
       }
   
       bb0: {
-          StorageLive(_2);                 // scope 0 at $DIR/lower_array_len.rs:+1:9: +1:12
-          StorageLive(_3);                 // scope 0 at $DIR/lower_array_len.rs:+1:21: +1:25
-          StorageLive(_4);                 // scope 0 at $DIR/lower_array_len.rs:+1:21: +1:25
-          _4 = &_1;                        // scope 0 at $DIR/lower_array_len.rs:+1:21: +1:25
-          _3 = &(*_4);                     // scope 0 at $DIR/lower_array_len.rs:+1:21: +1:25
-          _2 = move _3 as &[u8] (Pointer(Unsize)); // scope 0 at $DIR/lower_array_len.rs:+1:21: +1:25
-          StorageDead(_3);                 // scope 0 at $DIR/lower_array_len.rs:+1:24: +1:25
-          StorageDead(_4);                 // scope 0 at $DIR/lower_array_len.rs:+1:25: +1:26
-          StorageLive(_5);                 // scope 1 at $DIR/lower_array_len.rs:+2:9: +2:12
-          _5 = &raw const (*_2);           // scope 1 at $SRC_DIR/core/src/ptr/mod.rs:LL:COL
-          StorageLive(_6);                 // scope 2 at $DIR/lower_array_len.rs:+3:5: +3:27
-          StorageLive(_7);                 // scope 2 at $DIR/lower_array_len.rs:+3:14: +3:19
-          _7 = &(*_5);                     // scope 3 at $DIR/lower_array_len.rs:+3:14: +3:19
-          _6 = &(*_7);                     // scope 2 at $DIR/lower_array_len.rs:+3:5: +3:27
--         _0 = Len((*_6));                 // scope 2 at $DIR/lower_array_len.rs:+3:5: +3:27
-+         _0 = const N;                    // scope 2 at $DIR/lower_array_len.rs:+3:5: +3:27
-          goto -> bb1;                     // scope 2 at $DIR/lower_array_len.rs:+3:5: +3:27
+          StorageLive(_2);
+          StorageLive(_3);
+          StorageLive(_4);
+          _4 = &_1;
+          _3 = &(*_4);
+          _2 = move _3 as &[u8] (Pointer(Unsize));
+          StorageDead(_3);
+          StorageDead(_4);
+          StorageLive(_5);
+          _5 = &raw const (*_2);
+          StorageLive(_6);
+          StorageLive(_7);
+          _7 = &(*_5);
+          _6 = &(*_7);
+-         _0 = Len((*_6));
++         _0 = const N;
+          goto -> bb1;
       }
   
       bb1: {
-          StorageDead(_6);                 // scope 2 at $DIR/lower_array_len.rs:+3:26: +3:27
-          StorageDead(_5);                 // scope 1 at $DIR/lower_array_len.rs:+4:1: +4:2
-          StorageDead(_2);                 // scope 0 at $DIR/lower_array_len.rs:+4:1: +4:2
-          StorageDead(_7);                 // scope 0 at $DIR/lower_array_len.rs:+4:1: +4:2
-          return;                          // scope 0 at $DIR/lower_array_len.rs:+4:2: +4:2
+          StorageDead(_6);
+          StorageDead(_5);
+          StorageDead(_2);
+          StorageDead(_7);
+          return;
       }
   }