Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 40 deletions

diff --git a/src/test/mir-opt/simplify_match.main.ConstProp.diff b/src/test/mir-opt/simplify_match.main.ConstProp.diff
deleted file mode 100644
index e4f9a4c12..000000000
--- a/src/test/mir-opt/simplify_match.main.ConstProp.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-- // MIR for `main` before ConstProp
-+ // MIR for `main` after ConstProp
-  
-  fn main() -> () {
-      let mut _0: ();                      // return place in scope 0 at $DIR/simplify_match.rs:+0:11: +0:11
-      let mut _1: bool;                    // in scope 0 at $DIR/simplify_match.rs:+1:11: +1:31
-      let _2: bool;                        // in scope 0 at $DIR/simplify_match.rs:+1:17: +1:18
-      scope 1 {
-          debug x => _2;                   // in scope 1 at $DIR/simplify_match.rs:+1:17: +1:18
-      }
-  
-      bb0: {
-          StorageLive(_1);                 // scope 0 at $DIR/simplify_match.rs:+1:11: +1:31
-          StorageLive(_2);                 // scope 0 at $DIR/simplify_match.rs:+1:17: +1:18
-          _2 = const false;                // scope 0 at $DIR/simplify_match.rs:+1:21: +1:26
--         _1 = _2;                         // scope 1 at $DIR/simplify_match.rs:+1:28: +1:29
-+         _1 = const false;                // scope 1 at $DIR/simplify_match.rs:+1:28: +1:29
-          StorageDead(_2);                 // scope 0 at $DIR/simplify_match.rs:+1:30: +1:31
--         switchInt(_1) -> [false: bb1, otherwise: bb2]; // scope 0 at $DIR/simplify_match.rs:+1:5: +1:31
-+         switchInt(const false) -> [false: bb1, otherwise: bb2]; // scope 0 at $DIR/simplify_match.rs:+1:5: +1:31
-      }
-  
-      bb1: {
-          nop;                             // scope 0 at $DIR/simplify_match.rs:+3:18: +3:20
-          goto -> bb3;                     // scope 0 at $DIR/simplify_match.rs:+3:18: +3:20
-      }
-  
-      bb2: {
-          _0 = noop() -> bb3;              // scope 0 at $DIR/simplify_match.rs:+2:17: +2:23
-                                           // mir::Constant
-                                           // + span: $DIR/simplify_match.rs:7:17: 7:21
-                                           // + literal: Const { ty: fn() {noop}, val: Value(<ZST>) }
-      }
-  
-      bb3: {
-          StorageDead(_1);                 // scope 0 at $DIR/simplify_match.rs:+5:1: +5:2
-          return;                          // scope 0 at $DIR/simplify_match.rs:+5:2: +5:2
-      }
-  }
-