Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 37 deletions

diff --git a/src/test/ui/imports/reexports.rs b/src/test/ui/imports/reexports.rs
deleted file mode 100644
index d76cc41be..000000000
--- a/src/test/ui/imports/reexports.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-#![warn(unused_imports)]
-
-mod a {
-    fn foo() {}
-    mod foo {}
-
-    mod a {
-        pub use super::foo; //~ ERROR cannot be re-exported
-        pub use super::*;
-        //~^ WARNING glob import doesn't reexport anything because no candidate is public enough
-    }
-}
-
-mod b {
-    pub fn foo() {}
-    mod foo {
-        pub struct S;
-    }
-
-    pub mod a {
-        pub use super::foo; // This is OK since the value `foo` is visible enough.
-        fn f(_: foo::S) {} // `foo` is imported in the type namespace (but not `pub` re-exported).
-    }
-
-    pub mod b {
-        pub use super::*; // This is also OK since the value `foo` is visible enough.
-        fn f(_: foo::S) {} // Again, the module `foo` is imported (but not `pub` re-exported).
-    }
-}
-
-mod c {
-    // Test that `foo` is not re-exported.
-    use b::a::foo::S; //~ ERROR `foo`
-    use b::b::foo::S as T; //~ ERROR `foo`
-}
-
-fn main() {}