Merging upstream version 1.68.2+dfsg1.

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

6 files changed, 0 insertions, 65 deletions

diff --git a/src/test/ui/deref-patterns/basic.rs b/src/test/ui/deref-patterns/basic.rs
deleted file mode 100644
index 249716040..000000000
--- a/src/test/ui/deref-patterns/basic.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// run-pass
-// check-run-results
-#![feature(string_deref_patterns)]
-
-fn main() {
-    test(Some(String::from("42")));
-    test(Some(String::new()));
-    test(None);
-}
-
-fn test(o: Option<String>) {
-    match o {
-        Some("42") => println!("the answer"),
-        Some(_) => println!("something else?"),
-        None => println!("nil"),
-    }
-}
diff --git a/src/test/ui/deref-patterns/basic.run.stdout b/src/test/ui/deref-patterns/basic.run.stdout
deleted file mode 100644
index e50df0582..000000000
--- a/src/test/ui/deref-patterns/basic.run.stdout
+++ /dev/null
@@ -1,3 +0,0 @@
-the answer
-something else?
-nil
diff --git a/src/test/ui/deref-patterns/default-infer.rs b/src/test/ui/deref-patterns/default-infer.rs
deleted file mode 100644
index 050b84730..000000000
--- a/src/test/ui/deref-patterns/default-infer.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// check-pass
-#![feature(string_deref_patterns)]
-
-fn main() {
-    match <_ as Default>::default() {
-        "" => (),
-        _ => unreachable!(),
-    }
-}
diff --git a/src/test/ui/deref-patterns/gate.rs b/src/test/ui/deref-patterns/gate.rs
deleted file mode 100644
index ff50e30de..000000000
--- a/src/test/ui/deref-patterns/gate.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// gate-test-string_deref_patterns
-fn main() {
-    match String::new() {
-        "" | _ => {}
-        //~^ mismatched types
-    }
-}
diff --git a/src/test/ui/deref-patterns/gate.stderr b/src/test/ui/deref-patterns/gate.stderr
deleted file mode 100644
index 993468b5e..000000000
--- a/src/test/ui/deref-patterns/gate.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0308]: mismatched types
-  --> $DIR/gate.rs:4:9
-   |
-LL |     match String::new() {
-   |           ------------- this expression has type `String`
-LL |         "" | _ => {}
-   |         ^^ expected struct `String`, found `&str`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/deref-patterns/refs.rs b/src/test/ui/deref-patterns/refs.rs
deleted file mode 100644
index 97e260d27..000000000
--- a/src/test/ui/deref-patterns/refs.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// check-pass
-#![feature(string_deref_patterns)]
-
-fn foo(s: &String) -> i32 {
-    match *s {
-        "a" => 42,
-        _ => -1,
-    }
-}
-
-fn bar(s: Option<&&&&String>) -> i32 {
-    match s {
-        Some(&&&&"&&&&") => 1,
-        _ => -1,
-    }
-}
-
-fn main() {}