Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 18 deletions

diff --git a/src/test/ui/resolve/no-implicit-prelude.rs b/src/test/ui/resolve/no-implicit-prelude.rs
deleted file mode 100644
index 4b0ca4d52..000000000
--- a/src/test/ui/resolve/no-implicit-prelude.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-#![no_implicit_prelude]
-
-// Test that things from the prelude aren't in scope. Use many of them
-// so that renaming some things won't magically make this test fail
-// for the wrong reason (e.g., if `Add` changes to `Addition`, and
-// `no_implicit_prelude` stops working, then the `impl Add` will still
-// fail with the same error message).
-
-struct Test;
-impl Add for Test {} //~ ERROR cannot find trait `Add` in this scope
-impl Clone for Test {} //~ ERROR expected trait, found derive macro `Clone`
-impl Iterator for Test {} //~ ERROR cannot find trait `Iterator` in this scope
-impl ToString for Test {} //~ ERROR cannot find trait `ToString` in this scope
-impl Writer for Test {} //~ ERROR cannot find trait `Writer` in this scope
-
-fn main() {
-    drop(2) //~ ERROR cannot find function `drop` in this scope
-}