Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 187 insertions, 0 deletions

diff --git a/tests/ui/resolve/no-implicit-prelude-nested.stderr b/tests/ui/resolve/no-implicit-prelude-nested.stderr
new file mode 100644
index 000000000..198b630c5
--- /dev/null
+++ b/tests/ui/resolve/no-implicit-prelude-nested.stderr
@@ -0,0 +1,187 @@
+error[E0405]: cannot find trait `Add` in this scope
+  --> $DIR/no-implicit-prelude-nested.rs:11:14
+   |
+LL |         impl Add for Test {}
+   |              ^^^ not found in this scope
+   |
+help: consider importing this trait
+   |
+LL |         use std::ops::Add;
+   |
+
+error[E0404]: expected trait, found derive macro `Clone`
+  --> $DIR/no-implicit-prelude-nested.rs:12:14
+   |
+LL |         impl Clone for Test {}
+   |              ^^^^^ not a trait
+   |
+help: consider importing this trait instead
+   |
+LL |         use std::clone::Clone;
+   |
+
+error[E0405]: cannot find trait `Iterator` in this scope
+  --> $DIR/no-implicit-prelude-nested.rs:13:14
+   |
+LL |         impl Iterator for Test {}
+   |              ^^^^^^^^ not found in this scope
+   |
+help: consider importing this trait
+   |
+LL |         use std::iter::Iterator;
+   |
+
+error[E0405]: cannot find trait `ToString` in this scope
+  --> $DIR/no-implicit-prelude-nested.rs:14:14
+   |
+LL |         impl ToString for Test {}
+   |              ^^^^^^^^ not found in this scope
+   |
+help: consider importing this trait
+   |
+LL |         use std::string::ToString;
+   |
+
+error[E0405]: cannot find trait `Writer` in this scope
+  --> $DIR/no-implicit-prelude-nested.rs:15:14
+   |
+LL |         impl Writer for Test {}
+   |              ^^^^^^ not found in this scope
+
+error[E0425]: cannot find function `drop` in this scope
+  --> $DIR/no-implicit-prelude-nested.rs:18:13
+   |
+LL |             drop(2)
+   |             ^^^^ not found in this scope
+   |
+help: consider importing this function
+   |
+LL |         use std::mem::drop;
+   |
+
+error[E0405]: cannot find trait `Add` in this scope
+  --> $DIR/no-implicit-prelude-nested.rs:23:10
+   |
+LL |     impl Add for Test {}
+   |          ^^^ not found in this scope
+   |
+help: consider importing this trait
+   |
+LL |     use std::ops::Add;
+   |
+
+error[E0404]: expected trait, found derive macro `Clone`
+  --> $DIR/no-implicit-prelude-nested.rs:24:10
+   |
+LL |     impl Clone for Test {}
+   |          ^^^^^ not a trait
+   |
+help: consider importing this trait instead
+   |
+LL |     use std::clone::Clone;
+   |
+
+error[E0405]: cannot find trait `Iterator` in this scope
+  --> $DIR/no-implicit-prelude-nested.rs:25:10
+   |
+LL |     impl Iterator for Test {}
+   |          ^^^^^^^^ not found in this scope
+   |
+help: consider importing this trait
+   |
+LL |     use std::iter::Iterator;
+   |
+
+error[E0405]: cannot find trait `ToString` in this scope
+  --> $DIR/no-implicit-prelude-nested.rs:26:10
+   |
+LL |     impl ToString for Test {}
+   |          ^^^^^^^^ not found in this scope
+   |
+help: consider importing this trait
+   |
+LL |     use std::string::ToString;
+   |
+
+error[E0405]: cannot find trait `Writer` in this scope
+  --> $DIR/no-implicit-prelude-nested.rs:27:10
+   |
+LL |     impl Writer for Test {}
+   |          ^^^^^^ not found in this scope
+
+error[E0425]: cannot find function `drop` in this scope
+  --> $DIR/no-implicit-prelude-nested.rs:30:9
+   |
+LL |         drop(2)
+   |         ^^^^ not found in this scope
+   |
+help: consider importing this function
+   |
+LL |     use std::mem::drop;
+   |
+
+error[E0405]: cannot find trait `Add` in this scope
+  --> $DIR/no-implicit-prelude-nested.rs:38:14
+   |
+LL |         impl Add for Test {}
+   |              ^^^ not found in this scope
+   |
+help: consider importing this trait
+   |
+LL |         use std::ops::Add;
+   |
+
+error[E0404]: expected trait, found derive macro `Clone`
+  --> $DIR/no-implicit-prelude-nested.rs:39:14
+   |
+LL |         impl Clone for Test {}
+   |              ^^^^^ not a trait
+   |
+help: consider importing this trait instead
+   |
+LL |         use std::clone::Clone;
+   |
+
+error[E0405]: cannot find trait `Iterator` in this scope
+  --> $DIR/no-implicit-prelude-nested.rs:40:14
+   |
+LL |         impl Iterator for Test {}
+   |              ^^^^^^^^ not found in this scope
+   |
+help: consider importing this trait
+   |
+LL |         use std::iter::Iterator;
+   |
+
+error[E0405]: cannot find trait `ToString` in this scope
+  --> $DIR/no-implicit-prelude-nested.rs:41:14
+   |
+LL |         impl ToString for Test {}
+   |              ^^^^^^^^ not found in this scope
+   |
+help: consider importing this trait
+   |
+LL |         use std::string::ToString;
+   |
+
+error[E0405]: cannot find trait `Writer` in this scope
+  --> $DIR/no-implicit-prelude-nested.rs:42:14
+   |
+LL |         impl Writer for Test {}
+   |              ^^^^^^ not found in this scope
+
+error[E0425]: cannot find function `drop` in this scope
+  --> $DIR/no-implicit-prelude-nested.rs:45:13
+   |
+LL |             drop(2)
+   |             ^^^^ not found in this scope
+   |
+help: consider importing this function
+   |
+LL |         use std::mem::drop;
+   |
+
+error: aborting due to 18 previous errors
+
+Some errors have detailed explanations: E0404, E0405, E0425.
+For more information about an error, try `rustc --explain E0404`.