Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 57 deletions

diff --git a/src/test/ui/did_you_mean/issue-54109-and_instead_of_ampersands.rs b/src/test/ui/did_you_mean/issue-54109-and_instead_of_ampersands.rs
deleted file mode 100644
index 44421b077..000000000
--- a/src/test/ui/did_you_mean/issue-54109-and_instead_of_ampersands.rs
+++ /dev/null
@@ -1,57 +0,0 @@
-fn main() {}
-
-fn test_and() {
-    let a = true;
-    let b = false;
-
-    let _ = a and b; //~ ERROR `and` is not a logical operator
-
-    if a and b { //~ ERROR `and` is not a logical operator
-        println!("both");
-    }
-
-    let _recovery_witness: () = 0; //~ ERROR mismatched types
-}
-
-fn test_or() {
-    let a = true;
-    let b = false;
-
-    let _ = a or b; //~ ERROR `or` is not a logical operator
-
-    if a or b { //~ ERROR `or` is not a logical operator
-        println!("both");
-    }
-}
-
-fn test_and_par() {
-    let a = true;
-    let b = false;
-    if (a and b) {  //~ ERROR `and` is not a logical operator
-        println!("both");
-    }
-}
-
-fn test_or_par() {
-    let a = true;
-    let b = false;
-    if (a or b) {  //~ ERROR `or` is not a logical operator
-        println!("both");
-    }
-}
-
-fn test_while_and() {
-    let a = true;
-    let b = false;
-    while a and b {  //~ ERROR `and` is not a logical operator
-        println!("both");
-    }
-}
-
-fn test_while_or() {
-    let a = true;
-    let b = false;
-    while a or b { //~ ERROR `or` is not a logical operator
-        println!("both");
-    }
-}