Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 20 deletions

diff --git a/src/test/ui/rust-2018/uniform-paths/redundant.rs b/src/test/ui/rust-2018/uniform-paths/redundant.rs
deleted file mode 100644
index fd7fc7fbd..000000000
--- a/src/test/ui/rust-2018/uniform-paths/redundant.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// run-pass
-// edition:2018
-
-use std;
-use std::io;
-
-mod foo {
-    pub use std as my_std;
-}
-
-mod bar {
-    pub use std::{self};
-}
-
-fn main() {
-    let _ = io::stdout();
-    let _ = self::std::io::stdout();
-    let _ = foo::my_std::io::stdout();
-    let _ = bar::std::io::stdout();
-}