Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 43 deletions

diff --git a/src/test/ui/suggestions/crate-or-module-typo.stderr b/src/test/ui/suggestions/crate-or-module-typo.stderr
deleted file mode 100644
index 98b88b4fb..000000000
--- a/src/test/ui/suggestions/crate-or-module-typo.stderr
+++ /dev/null
@@ -1,43 +0,0 @@
-error[E0433]: failed to resolve: use of undeclared crate or module `st`
-  --> $DIR/crate-or-module-typo.rs:3:5
-   |
-LL | use st::cell::Cell;
-   |     ^^ use of undeclared crate or module `st`
-   |
-help: there is a crate or module with a similar name
-   |
-LL | use std::cell::Cell;
-   |     ~~~
-
-error[E0432]: unresolved import `bas`
-  --> $DIR/crate-or-module-typo.rs:11:5
-   |
-LL | use bas::bar;
-   |     ^^^ use of undeclared crate or module `bas`
-   |
-help: there is a crate or module with a similar name
-   |
-LL | use bar::bar;
-   |     ~~~
-
-error[E0433]: failed to resolve: use of undeclared crate or module `st`
-  --> $DIR/crate-or-module-typo.rs:14:10
-   |
-LL |     bar: st::cell::Cell<bool>
-   |          ^^ use of undeclared crate or module `st`
-   |
-help: there is a crate or module with a similar name
-   |
-LL |     bar: std::cell::Cell<bool>
-   |          ~~~
-
-error[E0433]: failed to resolve: use of undeclared crate or module `bar`
-  --> $DIR/crate-or-module-typo.rs:6:20
-   |
-LL |     pub fn bar() { bar::baz(); }
-   |                    ^^^ use of undeclared crate or module `bar`
-
-error: aborting due to 4 previous errors
-
-Some errors have detailed explanations: E0432, E0433.
-For more information about an error, try `rustc --explain E0432`.