about summary refs log tree commit diff
path: root/src/test/mir-opt/inline/inline_diverging.f.Inline.diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-07-28 16:22:19 +0000
committerbors <bors@rust-lang.org>2022-07-28 16:22:19 +0000
commit36f4f4aa38563d0c02bbdbbc03fb20145edef567 (patch)
tree9ccd853d5a9097d70f30a26016de023231841a96 /src/test/mir-opt/inline/inline_diverging.f.Inline.diff
parente5682615bb4fdb90e3a37b810a1b7bded2a1199e (diff)
parent11c0280798da8f4d65dec25764237d2354e65273 (diff)
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
Diffstat (limited to 'src/test/mir-opt/inline/inline_diverging.f.Inline.diff')
-rw-r--r--src/test/mir-opt/inline/inline_diverging.f.Inline.diff16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/test/mir-opt/inline/inline_diverging.f.Inline.diff b/src/test/mir-opt/inline/inline_diverging.f.Inline.diff
index 7cdc1a6b546..7ebc2ff5c45 100644
--- a/src/test/mir-opt/inline/inline_diverging.f.Inline.diff
+++ b/src/test/mir-opt/inline/inline_diverging.f.Inline.diff
@@ -2,27 +2,27 @@
 + // MIR for `f` after Inline
   
   fn f() -> () {
-      let mut _0: ();                      // return place in scope 0 at $DIR/inline-diverging.rs:7:12: 7:12
-      let mut _1: !;                       // in scope 0 at $DIR/inline-diverging.rs:7:12: 9:2
-      let _2: !;                           // in scope 0 at $DIR/inline-diverging.rs:8:5: 8:12
+      let mut _0: ();                      // return place in scope 0 at $DIR/inline-diverging.rs:+0:12: +0:12
+      let mut _1: !;                       // in scope 0 at $DIR/inline-diverging.rs:+0:12: +2:2
+      let _2: !;                           // in scope 0 at $DIR/inline-diverging.rs:+1:5: +1:12
 +     scope 1 (inlined sleep) {            // at $DIR/inline-diverging.rs:8:5: 8:12
 +     }
   
       bb0: {
-          StorageLive(_2);                 // scope 0 at $DIR/inline-diverging.rs:8:5: 8:12
--         _2 = sleep();                    // scope 0 at $DIR/inline-diverging.rs:8:5: 8:12
+          StorageLive(_2);                 // scope 0 at $DIR/inline-diverging.rs:+1:5: +1:12
+-         _2 = sleep();                    // scope 0 at $DIR/inline-diverging.rs:+1:5: +1:12
 -                                          // mir::Constant
 -                                          // + span: $DIR/inline-diverging.rs:8:5: 8:10
 -                                          // + literal: Const { ty: fn() -> ! {sleep}, val: Value(<ZST>) }
-+         goto -> bb1;                     // scope 0 at $DIR/inline-diverging.rs:8:5: 8:12
++         goto -> bb1;                     // scope 0 at $DIR/inline-diverging.rs:+1:5: +1:12
 +     }
 + 
 +     bb1: {
-+         goto -> bb1;                     // scope 1 at $DIR/inline-diverging.rs:39:5: 39:12
++         goto -> bb1;                     // scope 1 at $DIR/inline-diverging.rs:+32:5: +32:12
 +     }
 + 
 +     bb2 (cleanup): {
-+         resume;                          // scope 0 at $DIR/inline-diverging.rs:7:1: 9:2
++         resume;                          // scope 0 at $DIR/inline-diverging.rs:+0:1: +2:2
       }
   }