Merging upstream version 1.72.1+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 17 insertions, 17 deletions

diff --git a/tests/mir-opt/equal_true.opt.InstSimplify.diff b/tests/mir-opt/equal_true.opt.InstSimplify.diff
index 4ef413200..7b38862e4 100644
--- a/tests/mir-opt/equal_true.opt.InstSimplify.diff
+++ b/tests/mir-opt/equal_true.opt.InstSimplify.diff
@@ -2,34 +2,34 @@
 + // MIR for `opt` after InstSimplify
   
   fn opt(_1: bool) -> i32 {
-      debug x => _1;                       // in scope 0 at $DIR/equal_true.rs:+0:8: +0:9
-      let mut _0: i32;                     // return place in scope 0 at $DIR/equal_true.rs:+0:20: +0:23
-      let mut _2: bool;                    // in scope 0 at $DIR/equal_true.rs:+1:8: +1:17
-      let mut _3: bool;                    // in scope 0 at $DIR/equal_true.rs:+1:8: +1:9
+      debug x => _1;
+      let mut _0: i32;
+      let mut _2: bool;
+      let mut _3: bool;
   
       bb0: {
-          StorageLive(_2);                 // scope 0 at $DIR/equal_true.rs:+1:8: +1:17
-          StorageLive(_3);                 // scope 0 at $DIR/equal_true.rs:+1:8: +1:9
-          _3 = _1;                         // scope 0 at $DIR/equal_true.rs:+1:8: +1:9
--         _2 = Eq(move _3, const true);    // scope 0 at $DIR/equal_true.rs:+1:8: +1:17
-+         _2 = move _3;                    // scope 0 at $DIR/equal_true.rs:+1:8: +1:17
-          StorageDead(_3);                 // scope 0 at $DIR/equal_true.rs:+1:16: +1:17
-          switchInt(move _2) -> [0: bb2, otherwise: bb1]; // scope 0 at $DIR/equal_true.rs:+1:8: +1:17
+          StorageLive(_2);
+          StorageLive(_3);
+          _3 = _1;
+-         _2 = Eq(move _3, const true);
++         _2 = move _3;
+          StorageDead(_3);
+          switchInt(move _2) -> [0: bb2, otherwise: bb1];
       }
   
       bb1: {
-          _0 = const 0_i32;                // scope 0 at $DIR/equal_true.rs:+1:20: +1:21
-          goto -> bb3;                     // scope 0 at $DIR/equal_true.rs:+1:5: +1:34
+          _0 = const 0_i32;
+          goto -> bb3;
       }
   
       bb2: {
-          _0 = const 1_i32;                // scope 0 at $DIR/equal_true.rs:+1:31: +1:32
-          goto -> bb3;                     // scope 0 at $DIR/equal_true.rs:+1:5: +1:34
+          _0 = const 1_i32;
+          goto -> bb3;
       }
   
       bb3: {
-          StorageDead(_2);                 // scope 0 at $DIR/equal_true.rs:+1:33: +1:34
-          return;                          // scope 0 at $DIR/equal_true.rs:+2:2: +2:2
+          StorageDead(_2);
+          return;
       }
   }