Auto merge of #99780 - Nilstrieb:mir-opt-test-line-no, r=oli-obk

Use line numbers relative to the function in mir-opt tests

As shown in #99770, the line numbers can be a big source of needless and confusing diffs. This PR adds a new flag `-Zmir-pretty-relative-line-numbers` to make them relative to the function declaration, which avoids most needless diffs from attribute changes.

`@JakobDegen` told me that there has been a zulip conversation about disabling line numbers with mixed opinions, so I'd like to get some feedback here, for this hopefully better solution.

r? rust-lang/wg-mir-opt

1 files changed, 17 insertions, 17 deletions

diff --git a/src/test/mir-opt/simplify_match.main.ConstProp.diff b/src/test/mir-opt/simplify_match.main.ConstProp.diff
index 6314abe6f39..e4f9a4c12d9 100644
--- a/src/test/mir-opt/simplify_match.main.ConstProp.diff
+++ b/src/test/mir-opt/simplify_match.main.ConstProp.diff
@@ -2,39 +2,39 @@
 + // MIR for `main` after ConstProp
   
   fn main() -> () {
-      let mut _0: ();                      // return place in scope 0 at $DIR/simplify_match.rs:5:11: 5:11
-      let mut _1: bool;                    // in scope 0 at $DIR/simplify_match.rs:6:11: 6:31
-      let _2: bool;                        // in scope 0 at $DIR/simplify_match.rs:6:17: 6:18
+      let mut _0: ();                      // return place in scope 0 at $DIR/simplify_match.rs:+0:11: +0:11
+      let mut _1: bool;                    // in scope 0 at $DIR/simplify_match.rs:+1:11: +1:31
+      let _2: bool;                        // in scope 0 at $DIR/simplify_match.rs:+1:17: +1:18
       scope 1 {
-          debug x => _2;                   // in scope 1 at $DIR/simplify_match.rs:6:17: 6:18
+          debug x => _2;                   // in scope 1 at $DIR/simplify_match.rs:+1:17: +1:18
       }
   
       bb0: {
-          StorageLive(_1);                 // scope 0 at $DIR/simplify_match.rs:6:11: 6:31
-          StorageLive(_2);                 // scope 0 at $DIR/simplify_match.rs:6:17: 6:18
-          _2 = const false;                // scope 0 at $DIR/simplify_match.rs:6:21: 6:26
--         _1 = _2;                         // scope 1 at $DIR/simplify_match.rs:6:28: 6:29
-+         _1 = const false;                // scope 1 at $DIR/simplify_match.rs:6:28: 6:29
-          StorageDead(_2);                 // scope 0 at $DIR/simplify_match.rs:6:30: 6:31
--         switchInt(_1) -> [false: bb1, otherwise: bb2]; // scope 0 at $DIR/simplify_match.rs:6:5: 6:31
-+         switchInt(const false) -> [false: bb1, otherwise: bb2]; // scope 0 at $DIR/simplify_match.rs:6:5: 6:31
+          StorageLive(_1);                 // scope 0 at $DIR/simplify_match.rs:+1:11: +1:31
+          StorageLive(_2);                 // scope 0 at $DIR/simplify_match.rs:+1:17: +1:18
+          _2 = const false;                // scope 0 at $DIR/simplify_match.rs:+1:21: +1:26
+-         _1 = _2;                         // scope 1 at $DIR/simplify_match.rs:+1:28: +1:29
++         _1 = const false;                // scope 1 at $DIR/simplify_match.rs:+1:28: +1:29
+          StorageDead(_2);                 // scope 0 at $DIR/simplify_match.rs:+1:30: +1:31
+-         switchInt(_1) -> [false: bb1, otherwise: bb2]; // scope 0 at $DIR/simplify_match.rs:+1:5: +1:31
++         switchInt(const false) -> [false: bb1, otherwise: bb2]; // scope 0 at $DIR/simplify_match.rs:+1:5: +1:31
       }
   
       bb1: {
-          nop;                             // scope 0 at $DIR/simplify_match.rs:8:18: 8:20
-          goto -> bb3;                     // scope 0 at $DIR/simplify_match.rs:8:18: 8:20
+          nop;                             // scope 0 at $DIR/simplify_match.rs:+3:18: +3:20
+          goto -> bb3;                     // scope 0 at $DIR/simplify_match.rs:+3:18: +3:20
       }
   
       bb2: {
-          _0 = noop() -> bb3;              // scope 0 at $DIR/simplify_match.rs:7:17: 7:23
+          _0 = noop() -> bb3;              // scope 0 at $DIR/simplify_match.rs:+2:17: +2:23
                                            // mir::Constant
                                            // + span: $DIR/simplify_match.rs:7:17: 7:21
                                            // + literal: Const { ty: fn() {noop}, val: Value(<ZST>) }
       }
   
       bb3: {
-          StorageDead(_1);                 // scope 0 at $DIR/simplify_match.rs:10:1: 10:2
-          return;                          // scope 0 at $DIR/simplify_match.rs:10:2: 10:2
+          StorageDead(_1);                 // scope 0 at $DIR/simplify_match.rs:+5:1: +5:2
+          return;                          // scope 0 at $DIR/simplify_match.rs:+5:2: +5:2
       }
   }