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

diff --git a/src/test/mir-opt/simplify_arm.id_try.SimplifyBranchSame.diff b/src/test/mir-opt/simplify_arm.id_try.SimplifyBranchSame.diff
index a993ea73665..22a2f85c09a 100644
--- a/src/test/mir-opt/simplify_arm.id_try.SimplifyBranchSame.diff
+++ b/src/test/mir-opt/simplify_arm.id_try.SimplifyBranchSame.diff
@@ -2,92 +2,92 @@
 + // MIR for `id_try` after SimplifyBranchSame
   
   fn id_try(_1: Result<u8, i32>) -> Result<u8, i32> {
-      debug r => _1;                       // in scope 0 at $DIR/simplify-arm.rs:35:11: 35:12
-      let mut _0: std::result::Result<u8, i32>; // return place in scope 0 at $DIR/simplify-arm.rs:35:34: 35:49
-      let _2: u8;                          // in scope 0 at $DIR/simplify-arm.rs:36:9: 36:10
-      let mut _3: std::result::Result<u8, i32>; // in scope 0 at $DIR/simplify-arm.rs:36:19: 36:33
-      let mut _4: std::result::Result<u8, i32>; // in scope 0 at $DIR/simplify-arm.rs:36:31: 36:32
-      let mut _5: isize;                   // in scope 0 at $DIR/simplify-arm.rs:37:9: 37:15
-      let _6: i32;                         // in scope 0 at $DIR/simplify-arm.rs:37:13: 37:14
-      let mut _7: !;                       // in scope 0 at $DIR/simplify-arm.rs:37:19: 37:51
-      let mut _8: i32;                     // in scope 0 at $DIR/simplify-arm.rs:37:37: 37:50
-      let mut _9: i32;                     // in scope 0 at $DIR/simplify-arm.rs:37:48: 37:49
-      let _10: u8;                         // in scope 0 at $DIR/simplify-arm.rs:38:12: 38:13
-      let mut _11: u8;                     // in scope 0 at $DIR/simplify-arm.rs:40:8: 40:9
+      debug r => _1;                       // in scope 0 at $DIR/simplify-arm.rs:+0:11: +0:12
+      let mut _0: std::result::Result<u8, i32>; // return place in scope 0 at $DIR/simplify-arm.rs:+0:34: +0:49
+      let _2: u8;                          // in scope 0 at $DIR/simplify-arm.rs:+1:9: +1:10
+      let mut _3: std::result::Result<u8, i32>; // in scope 0 at $DIR/simplify-arm.rs:+1:19: +1:33
+      let mut _4: std::result::Result<u8, i32>; // in scope 0 at $DIR/simplify-arm.rs:+1:31: +1:32
+      let mut _5: isize;                   // in scope 0 at $DIR/simplify-arm.rs:+2:9: +2:15
+      let _6: i32;                         // in scope 0 at $DIR/simplify-arm.rs:+2:13: +2:14
+      let mut _7: !;                       // in scope 0 at $DIR/simplify-arm.rs:+2:19: +2:51
+      let mut _8: i32;                     // in scope 0 at $DIR/simplify-arm.rs:+2:37: +2:50
+      let mut _9: i32;                     // in scope 0 at $DIR/simplify-arm.rs:+2:48: +2:49
+      let _10: u8;                         // in scope 0 at $DIR/simplify-arm.rs:+3:12: +3:13
+      let mut _11: u8;                     // in scope 0 at $DIR/simplify-arm.rs:+5:8: +5:9
       scope 1 {
-          debug x => _2;                   // in scope 1 at $DIR/simplify-arm.rs:36:9: 36:10
+          debug x => _2;                   // in scope 1 at $DIR/simplify-arm.rs:+1:9: +1:10
       }
       scope 2 {
-          debug e => _6;                   // in scope 2 at $DIR/simplify-arm.rs:37:13: 37:14
+          debug e => _6;                   // in scope 2 at $DIR/simplify-arm.rs:+2:13: +2:14
           scope 5 (inlined <i32 as From<i32>>::from) { // at $DIR/simplify-arm.rs:37:37: 37:50
               debug t => _9;               // in scope 5 at $SRC_DIR/core/src/convert/mod.rs:LL:COL
           }
           scope 6 (inlined from_error::<u8, i32>) { // at $DIR/simplify-arm.rs:37:26: 37:51
-              debug e => _8;               // in scope 6 at $DIR/simplify-arm.rs:27:21: 27:22
+              debug e => _8;               // in scope 6 at $DIR/simplify-arm.rs:+0:21: +0:22
           }
       }
       scope 3 {
-          debug v => _10;                  // in scope 3 at $DIR/simplify-arm.rs:38:12: 38:13
+          debug v => _10;                  // in scope 3 at $DIR/simplify-arm.rs:+3:12: +3:13
       }
       scope 4 (inlined into_result::<u8, i32>) { // at $DIR/simplify-arm.rs:36:19: 36:33
-          debug r => _4;                   // in scope 4 at $DIR/simplify-arm.rs:23:22: 23:23
+          debug r => _4;                   // in scope 4 at $DIR/simplify-arm.rs:+0:22: +0:23
       }
   
       bb0: {
-          StorageLive(_2);                 // scope 0 at $DIR/simplify-arm.rs:36:9: 36:10
-          StorageLive(_3);                 // scope 0 at $DIR/simplify-arm.rs:36:19: 36:33
-          StorageLive(_4);                 // scope 0 at $DIR/simplify-arm.rs:36:31: 36:32
-          _4 = _1;                         // scope 0 at $DIR/simplify-arm.rs:36:31: 36:32
-          _3 = move _4;                    // scope 4 at $DIR/simplify-arm.rs:24:5: 24:6
-          StorageDead(_4);                 // scope 0 at $DIR/simplify-arm.rs:36:32: 36:33
-          _5 = discriminant(_3);           // scope 0 at $DIR/simplify-arm.rs:36:19: 36:33
-          switchInt(move _5) -> [0_isize: bb1, 1_isize: bb3, otherwise: bb2]; // scope 0 at $DIR/simplify-arm.rs:36:13: 36:33
+          StorageLive(_2);                 // scope 0 at $DIR/simplify-arm.rs:+1:9: +1:10
+          StorageLive(_3);                 // scope 0 at $DIR/simplify-arm.rs:+1:19: +1:33
+          StorageLive(_4);                 // scope 0 at $DIR/simplify-arm.rs:+1:31: +1:32
+          _4 = _1;                         // scope 0 at $DIR/simplify-arm.rs:+1:31: +1:32
+          _3 = move _4;                    // scope 4 at $DIR/simplify-arm.rs:+0:5: +0:6
+          StorageDead(_4);                 // scope 0 at $DIR/simplify-arm.rs:+1:32: +1:33
+          _5 = discriminant(_3);           // scope 0 at $DIR/simplify-arm.rs:+1:19: +1:33
+          switchInt(move _5) -> [0_isize: bb1, 1_isize: bb3, otherwise: bb2]; // scope 0 at $DIR/simplify-arm.rs:+1:13: +1:33
       }
   
       bb1: {
-          StorageLive(_10);                // scope 0 at $DIR/simplify-arm.rs:38:12: 38:13
-          _10 = ((_3 as Ok).0: u8);        // scope 0 at $DIR/simplify-arm.rs:38:12: 38:13
-          _2 = _10;                        // scope 3 at $DIR/simplify-arm.rs:38:18: 38:19
-          StorageDead(_10);                // scope 0 at $DIR/simplify-arm.rs:38:18: 38:19
-          StorageDead(_3);                 // scope 0 at $DIR/simplify-arm.rs:39:6: 39:7
-          StorageLive(_11);                // scope 1 at $DIR/simplify-arm.rs:40:8: 40:9
-          _11 = _2;                        // scope 1 at $DIR/simplify-arm.rs:40:8: 40:9
-          Deinit(_0);                      // scope 1 at $DIR/simplify-arm.rs:40:5: 40:10
-          ((_0 as Ok).0: u8) = move _11;   // scope 1 at $DIR/simplify-arm.rs:40:5: 40:10
-          discriminant(_0) = 0;            // scope 1 at $DIR/simplify-arm.rs:40:5: 40:10
-          StorageDead(_11);                // scope 1 at $DIR/simplify-arm.rs:40:9: 40:10
-          StorageDead(_2);                 // scope 0 at $DIR/simplify-arm.rs:41:1: 41:2
-          goto -> bb4;                     // scope 0 at $DIR/simplify-arm.rs:41:2: 41:2
+          StorageLive(_10);                // scope 0 at $DIR/simplify-arm.rs:+3:12: +3:13
+          _10 = ((_3 as Ok).0: u8);        // scope 0 at $DIR/simplify-arm.rs:+3:12: +3:13
+          _2 = _10;                        // scope 3 at $DIR/simplify-arm.rs:+3:18: +3:19
+          StorageDead(_10);                // scope 0 at $DIR/simplify-arm.rs:+3:18: +3:19
+          StorageDead(_3);                 // scope 0 at $DIR/simplify-arm.rs:+4:6: +4:7
+          StorageLive(_11);                // scope 1 at $DIR/simplify-arm.rs:+5:8: +5:9
+          _11 = _2;                        // scope 1 at $DIR/simplify-arm.rs:+5:8: +5:9
+          Deinit(_0);                      // scope 1 at $DIR/simplify-arm.rs:+5:5: +5:10
+          ((_0 as Ok).0: u8) = move _11;   // scope 1 at $DIR/simplify-arm.rs:+5:5: +5:10
+          discriminant(_0) = 0;            // scope 1 at $DIR/simplify-arm.rs:+5:5: +5:10
+          StorageDead(_11);                // scope 1 at $DIR/simplify-arm.rs:+5:9: +5:10
+          StorageDead(_2);                 // scope 0 at $DIR/simplify-arm.rs:+6:1: +6:2
+          goto -> bb4;                     // scope 0 at $DIR/simplify-arm.rs:+6:2: +6:2
       }
   
       bb2: {
-          unreachable;                     // scope 0 at $DIR/simplify-arm.rs:36:19: 36:33
+          unreachable;                     // scope 0 at $DIR/simplify-arm.rs:+1:19: +1:33
       }
   
       bb3: {
-          StorageLive(_6);                 // scope 0 at $DIR/simplify-arm.rs:37:13: 37:14
-          _6 = ((_3 as Err).0: i32);       // scope 0 at $DIR/simplify-arm.rs:37:13: 37:14
-          StorageLive(_8);                 // scope 2 at $DIR/simplify-arm.rs:37:37: 37:50
-          StorageLive(_9);                 // scope 2 at $DIR/simplify-arm.rs:37:48: 37:49
-          _9 = _6;                         // scope 2 at $DIR/simplify-arm.rs:37:48: 37:49
+          StorageLive(_6);                 // scope 0 at $DIR/simplify-arm.rs:+2:13: +2:14
+          _6 = ((_3 as Err).0: i32);       // scope 0 at $DIR/simplify-arm.rs:+2:13: +2:14
+          StorageLive(_8);                 // scope 2 at $DIR/simplify-arm.rs:+2:37: +2:50
+          StorageLive(_9);                 // scope 2 at $DIR/simplify-arm.rs:+2:48: +2:49
+          _9 = _6;                         // scope 2 at $DIR/simplify-arm.rs:+2:48: +2:49
           _8 = move _9;                    // scope 5 at $SRC_DIR/core/src/convert/mod.rs:LL:COL
-          StorageDead(_9);                 // scope 2 at $DIR/simplify-arm.rs:37:49: 37:50
-          ((_0 as Err).0: i32) = move _8;  // scope 6 at $DIR/simplify-arm.rs:28:9: 28:10
-          Deinit(_0);                      // scope 6 at $DIR/simplify-arm.rs:28:5: 28:11
-          discriminant(_0) = 1;            // scope 6 at $DIR/simplify-arm.rs:28:5: 28:11
-          StorageDead(_8);                 // scope 2 at $DIR/simplify-arm.rs:37:50: 37:51
-          StorageDead(_6);                 // scope 0 at $DIR/simplify-arm.rs:37:50: 37:51
-          StorageDead(_3);                 // scope 0 at $DIR/simplify-arm.rs:39:6: 39:7
-          StorageDead(_2);                 // scope 0 at $DIR/simplify-arm.rs:41:1: 41:2
-          goto -> bb4;                     // scope 0 at $DIR/simplify-arm.rs:41:2: 41:2
+          StorageDead(_9);                 // scope 2 at $DIR/simplify-arm.rs:+2:49: +2:50
+          ((_0 as Err).0: i32) = move _8;  // scope 6 at $DIR/simplify-arm.rs:+0:9: +0:10
+          Deinit(_0);                      // scope 6 at $DIR/simplify-arm.rs:+0:5: +0:11
+          discriminant(_0) = 1;            // scope 6 at $DIR/simplify-arm.rs:+0:5: +0:11
+          StorageDead(_8);                 // scope 2 at $DIR/simplify-arm.rs:+2:50: +2:51
+          StorageDead(_6);                 // scope 0 at $DIR/simplify-arm.rs:+2:50: +2:51
+          StorageDead(_3);                 // scope 0 at $DIR/simplify-arm.rs:+4:6: +4:7
+          StorageDead(_2);                 // scope 0 at $DIR/simplify-arm.rs:+6:1: +6:2
+          goto -> bb4;                     // scope 0 at $DIR/simplify-arm.rs:+6:2: +6:2
       }
   
       bb4: {
-          return;                          // scope 0 at $DIR/simplify-arm.rs:41:2: 41:2
+          return;                          // scope 0 at $DIR/simplify-arm.rs:+6:2: +6:2
       }
   
       bb5 (cleanup): {
-          resume;                          // scope 0 at $DIR/simplify-arm.rs:35:1: 41:2
+          resume;                          // scope 0 at $DIR/simplify-arm.rs:+0:1: +6:2
       }
   }