Merging upstream version 1.72.1+dfsg1.

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

1 files changed, 13 insertions, 16 deletions

diff --git a/tests/mir-opt/byte_slice.main.SimplifyCfg-elaborate-drops.after.mir b/tests/mir-opt/byte_slice.main.SimplifyCfg-elaborate-drops.after.mir
index 73f5655a1..9b17b4b63 100644
--- a/tests/mir-opt/byte_slice.main.SimplifyCfg-elaborate-drops.after.mir
+++ b/tests/mir-opt/byte_slice.main.SimplifyCfg-elaborate-drops.after.mir
@@ -1,28 +1,25 @@
 // MIR for `main` after SimplifyCfg-elaborate-drops
 
 fn main() -> () {
-    let mut _0: ();                      // return place in scope 0 at $DIR/byte_slice.rs:+0:11: +0:11
-    let _1: &[u8; 3];                    // in scope 0 at $DIR/byte_slice.rs:+1:9: +1:10
+    let mut _0: ();
+    let _1: &[u8; 3];
     scope 1 {
-        debug x => _1;                   // in scope 1 at $DIR/byte_slice.rs:+1:9: +1:10
-        let _2: [u8; 2];                 // in scope 1 at $DIR/byte_slice.rs:+2:9: +2:10
+        debug x => _1;
+        let _2: [u8; 2];
         scope 2 {
-            debug y => _2;               // in scope 2 at $DIR/byte_slice.rs:+2:9: +2:10
+            debug y => _2;
         }
     }
 
     bb0: {
-        StorageLive(_1);                 // scope 0 at $DIR/byte_slice.rs:+1:9: +1:10
-        _1 = const b"foo";               // scope 0 at $DIR/byte_slice.rs:+1:13: +1:19
-                                         // mir::Constant
-                                         // + span: $DIR/byte_slice.rs:5:13: 5:19
-                                         // + literal: Const { ty: &[u8; 3], val: Value(Scalar(alloc1)) }
-        StorageLive(_2);                 // scope 1 at $DIR/byte_slice.rs:+2:9: +2:10
-        _2 = [const 5_u8, const 120_u8]; // scope 1 at $DIR/byte_slice.rs:+2:13: +2:24
-        _0 = const ();                   // scope 0 at $DIR/byte_slice.rs:+0:11: +3:2
-        StorageDead(_2);                 // scope 1 at $DIR/byte_slice.rs:+3:1: +3:2
-        StorageDead(_1);                 // scope 0 at $DIR/byte_slice.rs:+3:1: +3:2
-        return;                          // scope 0 at $DIR/byte_slice.rs:+3:2: +3:2
+        StorageLive(_1);
+        _1 = const b"foo";
+        StorageLive(_2);
+        _2 = [const 5_u8, const 120_u8];
+        _0 = const ();
+        StorageDead(_2);
+        StorageDead(_1);
+        return;
     }
 }