Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 21 deletions

diff --git a/src/test/ui/borrowck/issue-52967-edition-2018-needs-two-phase-borrows.rs b/src/test/ui/borrowck/issue-52967-edition-2018-needs-two-phase-borrows.rs
deleted file mode 100644
index fc8a07554..000000000
--- a/src/test/ui/borrowck/issue-52967-edition-2018-needs-two-phase-borrows.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// This is a regression test for #52967, where we discovered that in
-// the initial deployment of NLL for the 2018 edition, I forgot to
-// turn on two-phase-borrows in addition to `-Z borrowck=migrate`.
-
-// revisions: edition2015 edition2018
-//[edition2018]edition:2018
-
-// run-pass
-
-fn the_bug() {
-    let mut stuff = ("left", "right");
-    match stuff {
-        (ref mut left, _) if *left == "left" => { *left = "new left"; }
-        _ => {}
-    }
-    assert_eq!(stuff, ("new left", "right"));
-}
-
-fn main() {
-    the_bug();
-}