about summary refs log tree commit diff
path: root/src/test/mir-opt/const_prop/mutable_variable.main.ConstProp.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/const_prop/mutable_variable.main.ConstProp.diff
parente5682615bb4fdb90e3a37b810a1b7bded2a1199e (diff)
parent11c0280798da8f4d65dec25764237d2354e65273 (diff)
downloadrust-36f4f4aa38563d0c02bbdbbc03fb20145edef567.tar.gz
rust-36f4f4aa38563d0c02bbdbbc03fb20145edef567.zip
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/const_prop/mutable_variable.main.ConstProp.diff')
-rw-r--r--src/test/mir-opt/const_prop/mutable_variable.main.ConstProp.diff30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/test/mir-opt/const_prop/mutable_variable.main.ConstProp.diff b/src/test/mir-opt/const_prop/mutable_variable.main.ConstProp.diff
index f159cfa025c..3bbd6a87f97 100644
--- a/src/test/mir-opt/const_prop/mutable_variable.main.ConstProp.diff
+++ b/src/test/mir-opt/const_prop/mutable_variable.main.ConstProp.diff
@@ -2,27 +2,27 @@
 + // MIR for `main` after ConstProp
   
   fn main() -> () {
-      let mut _0: ();                      // return place in scope 0 at $DIR/mutable_variable.rs:4:11: 4:11
-      let mut _1: i32;                     // in scope 0 at $DIR/mutable_variable.rs:5:9: 5:14
+      let mut _0: ();                      // return place in scope 0 at $DIR/mutable_variable.rs:+0:11: +0:11
+      let mut _1: i32;                     // in scope 0 at $DIR/mutable_variable.rs:+1:9: +1:14
       scope 1 {
-          debug x => _1;                   // in scope 1 at $DIR/mutable_variable.rs:5:9: 5:14
-          let _2: i32;                     // in scope 1 at $DIR/mutable_variable.rs:7:9: 7:10
+          debug x => _1;                   // in scope 1 at $DIR/mutable_variable.rs:+1:9: +1:14
+          let _2: i32;                     // in scope 1 at $DIR/mutable_variable.rs:+3:9: +3:10
           scope 2 {
-              debug y => _2;               // in scope 2 at $DIR/mutable_variable.rs:7:9: 7:10
+              debug y => _2;               // in scope 2 at $DIR/mutable_variable.rs:+3:9: +3:10
           }
       }
   
       bb0: {
-          StorageLive(_1);                 // scope 0 at $DIR/mutable_variable.rs:5:9: 5:14
-          _1 = const 42_i32;               // scope 0 at $DIR/mutable_variable.rs:5:17: 5:19
-          _1 = const 99_i32;               // scope 1 at $DIR/mutable_variable.rs:6:5: 6:11
-          StorageLive(_2);                 // scope 1 at $DIR/mutable_variable.rs:7:9: 7:10
--         _2 = _1;                         // scope 1 at $DIR/mutable_variable.rs:7:13: 7:14
-+         _2 = const 99_i32;               // scope 1 at $DIR/mutable_variable.rs:7:13: 7:14
-          nop;                             // scope 0 at $DIR/mutable_variable.rs:4:11: 8:2
-          StorageDead(_2);                 // scope 1 at $DIR/mutable_variable.rs:8:1: 8:2
-          StorageDead(_1);                 // scope 0 at $DIR/mutable_variable.rs:8:1: 8:2
-          return;                          // scope 0 at $DIR/mutable_variable.rs:8:2: 8:2
+          StorageLive(_1);                 // scope 0 at $DIR/mutable_variable.rs:+1:9: +1:14
+          _1 = const 42_i32;               // scope 0 at $DIR/mutable_variable.rs:+1:17: +1:19
+          _1 = const 99_i32;               // scope 1 at $DIR/mutable_variable.rs:+2:5: +2:11
+          StorageLive(_2);                 // scope 1 at $DIR/mutable_variable.rs:+3:9: +3:10
+-         _2 = _1;                         // scope 1 at $DIR/mutable_variable.rs:+3:13: +3:14
++         _2 = const 99_i32;               // scope 1 at $DIR/mutable_variable.rs:+3:13: +3:14
+          nop;                             // scope 0 at $DIR/mutable_variable.rs:+0:11: +4:2
+          StorageDead(_2);                 // scope 1 at $DIR/mutable_variable.rs:+4:1: +4:2
+          StorageDead(_1);                 // scope 0 at $DIR/mutable_variable.rs:+4:1: +4:2
+          return;                          // scope 0 at $DIR/mutable_variable.rs:+4:2: +4:2
       }
   }