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

diff --git a/src/test/mir-opt/inline/inline_cycle.one.Inline.diff b/src/test/mir-opt/inline/inline_cycle.one.Inline.diff
index 8128797d27e..a6d65928da7 100644
--- a/src/test/mir-opt/inline/inline_cycle.one.Inline.diff
+++ b/src/test/mir-opt/inline/inline_cycle.one.Inline.diff
@@ -2,8 +2,8 @@
 + // MIR for `one` after Inline
   
   fn one() -> () {
-      let mut _0: ();                      // return place in scope 0 at $DIR/inline-cycle.rs:13:10: 13:10
-      let _1: ();                          // in scope 0 at $DIR/inline-cycle.rs:14:5: 14:24
+      let mut _0: ();                      // return place in scope 0 at $DIR/inline-cycle.rs:+0:10: +0:10
+      let _1: ();                          // in scope 0 at $DIR/inline-cycle.rs:+1:5: +1:24
 +     scope 1 (inlined <C as Call>::call) { // at $DIR/inline-cycle.rs:14:5: 14:24
 +         scope 2 (inlined <A<C> as Call>::call) { // at $DIR/inline-cycle.rs:43:9: 43:23
 +             scope 3 (inlined <B<C> as Call>::call) { // at $DIR/inline-cycle.rs:28:9: 28:31
@@ -12,9 +12,9 @@
 +     }
   
       bb0: {
-          StorageLive(_1);                 // scope 0 at $DIR/inline-cycle.rs:14:5: 14:24
--         _1 = <C as Call>::call() -> bb1; // scope 0 at $DIR/inline-cycle.rs:14:5: 14:24
-+         _1 = <C as Call>::call() -> bb1; // scope 3 at $DIR/inline-cycle.rs:36:9: 36:28
+          StorageLive(_1);                 // scope 0 at $DIR/inline-cycle.rs:+1:5: +1:24
+-         _1 = <C as Call>::call() -> bb1; // scope 0 at $DIR/inline-cycle.rs:+1:5: +1:24
++         _1 = <C as Call>::call() -> bb1; // scope 3 at $DIR/inline-cycle.rs:+23:9: +23:28
                                            // mir::Constant
 -                                          // + span: $DIR/inline-cycle.rs:14:5: 14:22
 +                                          // + span: $DIR/inline-cycle.rs:36:9: 36:26
@@ -22,13 +22,13 @@
       }
   
       bb1: {
-          StorageDead(_1);                 // scope 0 at $DIR/inline-cycle.rs:14:24: 14:25
-          _0 = const ();                   // scope 0 at $DIR/inline-cycle.rs:13:10: 15:2
-          return;                          // scope 0 at $DIR/inline-cycle.rs:15:2: 15:2
+          StorageDead(_1);                 // scope 0 at $DIR/inline-cycle.rs:+1:24: +1:25
+          _0 = const ();                   // scope 0 at $DIR/inline-cycle.rs:+0:10: +2:2
+          return;                          // scope 0 at $DIR/inline-cycle.rs:+2:2: +2:2
 +     }
 + 
 +     bb2 (cleanup): {
-+         resume;                          // scope 0 at $DIR/inline-cycle.rs:13:1: 15:2
++         resume;                          // scope 0 at $DIR/inline-cycle.rs:+0:1: +2:2
       }
   }