Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 35 deletions

diff --git a/src/test/ui/hygiene/no_implicit_prelude.stderr b/src/test/ui/hygiene/no_implicit_prelude.stderr
deleted file mode 100644
index c48c84035..000000000
--- a/src/test/ui/hygiene/no_implicit_prelude.stderr
+++ /dev/null
@@ -1,35 +0,0 @@
-error[E0433]: failed to resolve: use of undeclared type `Vec`
-  --> $DIR/no_implicit_prelude.rs:11:9
-   |
-LL |     fn f() { ::bar::m!(); }
-   |              ----------- in this macro invocation
-...
-LL |         Vec::new();
-   |         ^^^ use of undeclared type `Vec`
-   |
-   = note: this error originates in the macro `::bar::m` (in Nightly builds, run with -Z macro-backtrace for more info)
-help: consider importing this struct
-   |
-LL |     use std::vec::Vec;
-   |
-
-error[E0599]: no method named `clone` found for unit type `()` in the current scope
-  --> $DIR/no_implicit_prelude.rs:12:12
-   |
-LL |     fn f() { ::bar::m!(); }
-   |              ----------- in this macro invocation
-...
-LL |         ().clone()
-   |            ^^^^^ method not found in `()`
-   |
-   = help: items from traits can only be used if the trait is in scope
-   = note: this error originates in the macro `::bar::m` (in Nightly builds, run with -Z macro-backtrace for more info)
-help: the following trait is implemented but not in scope; perhaps add a `use` for it:
-   |
-LL |     use std::clone::Clone;
-   |
-
-error: aborting due to 2 previous errors
-
-Some errors have detailed explanations: E0433, E0599.
-For more information about an error, try `rustc --explain E0433`.