Merging upstream version 1.68.2+dfsg1.

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

10 files changed, 0 insertions, 178 deletions

diff --git a/src/test/ui/use/use-mod/use-mod-2.rs b/src/test/ui/use/use-mod/use-mod-2.rs
deleted file mode 100644
index 9373a62ba..000000000
--- a/src/test/ui/use/use-mod/use-mod-2.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-mod foo {
-    use self::{self};
-    //~^ ERROR unresolved import `self` [E0432]
-    //~| no `self` in the root
-
-    use super::{self};
-    //~^ ERROR unresolved import `super` [E0432]
-    //~| no `super` in the root
-}
-
-fn main() {}
diff --git a/src/test/ui/use/use-mod/use-mod-2.stderr b/src/test/ui/use/use-mod/use-mod-2.stderr
deleted file mode 100644
index 843767849..000000000
--- a/src/test/ui/use/use-mod/use-mod-2.stderr
+++ /dev/null
@@ -1,15 +0,0 @@
-error[E0432]: unresolved import `self`
-  --> $DIR/use-mod-2.rs:2:16
-   |
-LL |     use self::{self};
-   |                ^^^^ no `self` in the root
-
-error[E0432]: unresolved import `super`
-  --> $DIR/use-mod-2.rs:6:17
-   |
-LL |     use super::{self};
-   |                 ^^^^ no `super` in the root
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0432`.
diff --git a/src/test/ui/use/use-mod/use-mod-3.rs b/src/test/ui/use/use-mod/use-mod-3.rs
deleted file mode 100644
index 0afa486b9..000000000
--- a/src/test/ui/use/use-mod/use-mod-3.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-use foo::bar::{ //~ ERROR module `bar` is private
-    self
-};
-use foo::bar::{ //~ ERROR module `bar` is private
-    Bar
-};
-
-mod foo {
-    mod bar { pub type Bar = isize; }
-}
-
-fn main() {}
diff --git a/src/test/ui/use/use-mod/use-mod-3.stderr b/src/test/ui/use/use-mod/use-mod-3.stderr
deleted file mode 100644
index 1b12b3c6f..000000000
--- a/src/test/ui/use/use-mod/use-mod-3.stderr
+++ /dev/null
@@ -1,27 +0,0 @@
-error[E0603]: module `bar` is private
-  --> $DIR/use-mod-3.rs:1:10
-   |
-LL | use foo::bar::{
-   |          ^^^ private module
-   |
-note: the module `bar` is defined here
-  --> $DIR/use-mod-3.rs:9:5
-   |
-LL |     mod bar { pub type Bar = isize; }
-   |     ^^^^^^^
-
-error[E0603]: module `bar` is private
-  --> $DIR/use-mod-3.rs:4:10
-   |
-LL | use foo::bar::{
-   |          ^^^ private module
-   |
-note: the module `bar` is defined here
-  --> $DIR/use-mod-3.rs:9:5
-   |
-LL |     mod bar { pub type Bar = isize; }
-   |     ^^^^^^^
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0603`.
diff --git a/src/test/ui/use/use-mod/use-mod-4.rs b/src/test/ui/use/use-mod/use-mod-4.rs
deleted file mode 100644
index 46ae8ddad..000000000
--- a/src/test/ui/use/use-mod/use-mod-4.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-use foo::self; //~ ERROR unresolved import `foo`
-//~^ ERROR `self` imports are only allowed within a { } list
-
-use std::mem::self;
-//~^ ERROR `self` imports are only allowed within a { } list
-
-fn main() {}
diff --git a/src/test/ui/use/use-mod/use-mod-4.stderr b/src/test/ui/use/use-mod/use-mod-4.stderr
deleted file mode 100644
index 0b4fbadb4..000000000
--- a/src/test/ui/use/use-mod/use-mod-4.stderr
+++ /dev/null
@@ -1,42 +0,0 @@
-error[E0429]: `self` imports are only allowed within a { } list
-  --> $DIR/use-mod-4.rs:1:8
-   |
-LL | use foo::self;
-   |        ^^^^^^
-   |
-help: consider importing the module directly
-   |
-LL - use foo::self;
-LL + use foo;
-   |
-help: alternatively, use the multi-path `use` syntax to import `self`
-   |
-LL | use foo::{self};
-   |          +    +
-
-error[E0429]: `self` imports are only allowed within a { } list
-  --> $DIR/use-mod-4.rs:4:13
-   |
-LL | use std::mem::self;
-   |             ^^^^^^
-   |
-help: consider importing the module directly
-   |
-LL - use std::mem::self;
-LL + use std::mem;
-   |
-help: alternatively, use the multi-path `use` syntax to import `self`
-   |
-LL | use std::mem::{self};
-   |               +    +
-
-error[E0432]: unresolved import `foo`
-  --> $DIR/use-mod-4.rs:1:5
-   |
-LL | use foo::self;
-   |     ^^^^^^^^^ no `foo` in the root
-
-error: aborting due to 3 previous errors
-
-Some errors have detailed explanations: E0429, E0432.
-For more information about an error, try `rustc --explain E0429`.
diff --git a/src/test/ui/use/use-mod/use-mod-5.rs b/src/test/ui/use/use-mod/use-mod-5.rs
deleted file mode 100644
index df5b423ec..000000000
--- a/src/test/ui/use/use-mod/use-mod-5.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-mod foo {
-    pub mod bar {
-        pub fn drop() {}
-    }
-}
-
-use foo::bar::self;
-//~^ ERROR `self` imports are only allowed within a { } list
-
-fn main() {
-    // Because of error recovery this shouldn't error
-    bar::drop();
-}
diff --git a/src/test/ui/use/use-mod/use-mod-5.stderr b/src/test/ui/use/use-mod/use-mod-5.stderr
deleted file mode 100644
index 62859e261..000000000
--- a/src/test/ui/use/use-mod/use-mod-5.stderr
+++ /dev/null
@@ -1,19 +0,0 @@
-error[E0429]: `self` imports are only allowed within a { } list
-  --> $DIR/use-mod-5.rs:7:13
-   |
-LL | use foo::bar::self;
-   |             ^^^^^^
-   |
-help: consider importing the module directly
-   |
-LL - use foo::bar::self;
-LL + use foo::bar;
-   |
-help: alternatively, use the multi-path `use` syntax to import `self`
-   |
-LL | use foo::bar::{self};
-   |               +    +
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0429`.
diff --git a/src/test/ui/use/use-mod/use-mod-6.rs b/src/test/ui/use/use-mod/use-mod-6.rs
deleted file mode 100644
index 1f8777dac..000000000
--- a/src/test/ui/use/use-mod/use-mod-6.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-mod foo {
-    pub mod bar {
-        pub fn drop() {}
-    }
-}
-
-use foo::bar::self as abc;
-//~^ ERROR `self` imports are only allowed within a { } list
-
-fn main() {
-    // Because of error recovery this shouldn't error
-    abc::drop();
-}
diff --git a/src/test/ui/use/use-mod/use-mod-6.stderr b/src/test/ui/use/use-mod/use-mod-6.stderr
deleted file mode 100644
index 2d2c90067..000000000
--- a/src/test/ui/use/use-mod/use-mod-6.stderr
+++ /dev/null
@@ -1,19 +0,0 @@
-error[E0429]: `self` imports are only allowed within a { } list
-  --> $DIR/use-mod-6.rs:7:13
-   |
-LL | use foo::bar::self as abc;
-   |             ^^^^^^
-   |
-help: consider importing the module directly
-   |
-LL - use foo::bar::self as abc;
-LL + use foo::bar as abc;
-   |
-help: alternatively, use the multi-path `use` syntax to import `self`
-   |
-LL | use foo::bar::{self as abc};
-   |               +           +
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0429`.