Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 21 deletions

diff --git a/src/test/ui/resolve/issue-21221-2.rs b/src/test/ui/resolve/issue-21221-2.rs
deleted file mode 100644
index dc13e46cb..000000000
--- a/src/test/ui/resolve/issue-21221-2.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-pub mod foo {
-    pub mod bar {
-        // note: trait T is not public, but being in the current
-        // crate, it's fine to show it, since the programmer can
-        // decide to make it public based on the suggestion ...
-        pub trait T {}
-    }
-    // imports should be ignored:
-    use self::bar::T;
-}
-
-pub mod baz {
-    pub use foo;
-    pub use std::ops::{Mul as T};
-}
-
-struct Foo;
-impl T for Foo { }
-//~^ ERROR cannot find trait `T`
-
-fn main() {}