about summary refs log tree commit diff
path: root/src/test/mir-opt/inline/inline_specialization.main.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_specialization.main.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_specialization.main.Inline.diff')
-rw-r--r--src/test/mir-opt/inline/inline_specialization.main.Inline.diff20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/test/mir-opt/inline/inline_specialization.main.Inline.diff b/src/test/mir-opt/inline/inline_specialization.main.Inline.diff
index 747eeb98450..6c71311c7d4 100644
--- a/src/test/mir-opt/inline/inline_specialization.main.Inline.diff
+++ b/src/test/mir-opt/inline/inline_specialization.main.Inline.diff
@@ -2,31 +2,31 @@
 + // MIR for `main` after Inline
   
   fn main() -> () {
-      let mut _0: ();                      // return place in scope 0 at $DIR/inline-specialization.rs:4:11: 4:11
-      let _1: u32;                         // in scope 0 at $DIR/inline-specialization.rs:5:9: 5:10
+      let mut _0: ();                      // return place in scope 0 at $DIR/inline-specialization.rs:+0:11: +0:11
+      let _1: u32;                         // in scope 0 at $DIR/inline-specialization.rs:+1:9: +1:10
       scope 1 {
-          debug x => _1;                   // in scope 1 at $DIR/inline-specialization.rs:5:9: 5:10
+          debug x => _1;                   // in scope 1 at $DIR/inline-specialization.rs:+1:9: +1:10
       }
 +     scope 2 (inlined <Vec<()> as Foo>::bar) { // at $DIR/inline-specialization.rs:5:13: 5:38
 +     }
   
       bb0: {
-          StorageLive(_1);                 // scope 0 at $DIR/inline-specialization.rs:5:9: 5:10
--         _1 = <Vec<()> as Foo>::bar() -> bb1; // scope 0 at $DIR/inline-specialization.rs:5:13: 5:38
+          StorageLive(_1);                 // scope 0 at $DIR/inline-specialization.rs:+1:9: +1:10
+-         _1 = <Vec<()> as Foo>::bar() -> bb1; // scope 0 at $DIR/inline-specialization.rs:+1:13: +1:38
 -                                          // mir::Constant
 -                                          // + span: $DIR/inline-specialization.rs:5:13: 5:36
 -                                          // + literal: Const { ty: fn() -> u32 {<Vec<()> as Foo>::bar}, val: Value(<ZST>) }
 -     }
 - 
 -     bb1: {
-+         _1 = const 123_u32;              // scope 2 at $DIR/inline-specialization.rs:14:31: 14:34
-          _0 = const ();                   // scope 0 at $DIR/inline-specialization.rs:4:11: 6:2
-          StorageDead(_1);                 // scope 0 at $DIR/inline-specialization.rs:6:1: 6:2
-          return;                          // scope 0 at $DIR/inline-specialization.rs:6:2: 6:2
++         _1 = const 123_u32;              // scope 2 at $DIR/inline-specialization.rs:+10:31: +10:34
+          _0 = const ();                   // scope 0 at $DIR/inline-specialization.rs:+0:11: +2:2
+          StorageDead(_1);                 // scope 0 at $DIR/inline-specialization.rs:+2:1: +2:2
+          return;                          // scope 0 at $DIR/inline-specialization.rs:+2:2: +2:2
 +     }
 + 
 +     bb1 (cleanup): {
-+         resume;                          // scope 0 at $DIR/inline-specialization.rs:4:1: 6:2
++         resume;                          // scope 0 at $DIR/inline-specialization.rs:+0:1: +2:2
       }
   }