Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 16 deletions

diff --git a/src/test/ui/rust-2018/uniform-paths/ambiguity-nested.rs b/src/test/ui/rust-2018/uniform-paths/ambiguity-nested.rs
deleted file mode 100644
index 50c8fc822..000000000
--- a/src/test/ui/rust-2018/uniform-paths/ambiguity-nested.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// edition:2018
-
-// This test is similar to `ambiguity.rs`, but nested in a module.
-
-#![allow(non_camel_case_types)]
-
-mod foo {
-    pub use std::io;
-    //~^ ERROR `std` is ambiguous
-
-    mod std {
-        pub struct io;
-    }
-}
-
-fn main() {}