Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 36 deletions

diff --git a/src/test/ui/consts/control-flow/short-circuit-let.rs b/src/test/ui/consts/control-flow/short-circuit-let.rs
deleted file mode 100644
index 8a58d06ac..000000000
--- a/src/test/ui/consts/control-flow/short-circuit-let.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-// `&&` and `||` were previously forbidden in constants alongside let bindings.
-
-// run-pass
-
-const X: i32 = {
-    let mut x = 0;
-    let _ = true && { x = 1; false };
-    x
-};
-
-const Y: bool = {
-    let x = true && false || true;
-    x
-};
-
-const fn truthy() -> bool {
-    let x = true || return false;
-    x
-}
-
-const fn falsy() -> bool {
-    let x = true && return false;
-    x
-}
-
-fn main() {
-    const _: () = assert!(Y);
-    assert!(Y);
-
-    const _: () = assert!(X == 1);
-    assert_eq!(X, 1);
-
-    const _: () = assert!(truthy());
-    const _: () = assert!(!falsy());
-    assert!(truthy() && !falsy());
-}