Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 25 deletions

diff --git a/src/test/ui/moves/move-guard-same-consts.rs b/src/test/ui/moves/move-guard-same-consts.rs
deleted file mode 100644
index b96ef8e19..000000000
--- a/src/test/ui/moves/move-guard-same-consts.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-// #47295: We used to have a hack of special-casing adjacent amtch
-// arms whose patterns were composed solely of constants to not have
-// them linked in the cfg.
-//
-// This was broken for various reasons. In particular, that hack was
-// originally authored under the assunption that other checks
-// elsewhere would ensure that the two patterns did not overlap.  But
-// that assumption did not hold, at least not in the long run (namely,
-// overlapping patterns were turned into warnings rather than errors).
-
-
-
-fn main() {
-    let x: Box<_> = Box::new(1);
-
-    let v = (1, 2);
-
-    match v {
-        (1, 2) if take(x) => (),
-        (1, 2) if take(x) => (), //~ ERROR use of moved value: `x`
-        _ => (),
-    }
-}
-
-fn take<T>(_: T) -> bool { false }