Merging upstream version 1.68.2+dfsg1.

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

10 files changed, 0 insertions, 93 deletions

diff --git a/src/test/ui/entry-point/auxiliary/main_functions.rs b/src/test/ui/entry-point/auxiliary/main_functions.rs
deleted file mode 100644
index cc7992a42..000000000
--- a/src/test/ui/entry-point/auxiliary/main_functions.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub fn boilerplate() {}
diff --git a/src/test/ui/entry-point/imported_main_conflict.rs b/src/test/ui/entry-point/imported_main_conflict.rs
deleted file mode 100644
index e8c70b065..000000000
--- a/src/test/ui/entry-point/imported_main_conflict.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-#![feature(imported_main)]
-//~^ ERROR `main` is ambiguous
-mod m1 { pub(crate) fn main() {} }
-mod m2 { pub(crate) fn main() {} }
-
-use m1::*;
-use m2::*;
diff --git a/src/test/ui/entry-point/imported_main_conflict.stderr b/src/test/ui/entry-point/imported_main_conflict.stderr
deleted file mode 100644
index 8fadd0e19..000000000
--- a/src/test/ui/entry-point/imported_main_conflict.stderr
+++ /dev/null
@@ -1,19 +0,0 @@
-error[E0659]: `main` is ambiguous
-   |
-   = note: ambiguous because of multiple glob imports of a name in the same module
-note: `main` could refer to the function imported here
-  --> $DIR/imported_main_conflict.rs:6:5
-   |
-LL | use m1::*;
-   |     ^^^^^
-   = help: consider adding an explicit import of `main` to disambiguate
-note: `main` could also refer to the function imported here
-  --> $DIR/imported_main_conflict.rs:7:5
-   |
-LL | use m2::*;
-   |     ^^^^^
-   = help: consider adding an explicit import of `main` to disambiguate
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0659`.
diff --git a/src/test/ui/entry-point/imported_main_const_fn_item_type_forbidden.rs b/src/test/ui/entry-point/imported_main_const_fn_item_type_forbidden.rs
deleted file mode 100644
index 405d6e2a9..000000000
--- a/src/test/ui/entry-point/imported_main_const_fn_item_type_forbidden.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#![feature(imported_main)]
-#![feature(type_alias_impl_trait)]
-#![allow(incomplete_features)]
-pub mod foo {
-    type MainFn = impl Fn();
-
-    fn bar() {}
-    pub const BAR: MainFn = bar;
-}
-
-use foo::BAR as main; //~ ERROR `main` function not found in crate
diff --git a/src/test/ui/entry-point/imported_main_const_fn_item_type_forbidden.stderr b/src/test/ui/entry-point/imported_main_const_fn_item_type_forbidden.stderr
deleted file mode 100644
index fabb6ffb0..000000000
--- a/src/test/ui/entry-point/imported_main_const_fn_item_type_forbidden.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0601]: `main` function not found in crate `imported_main_const_fn_item_type_forbidden`
-  --> $DIR/imported_main_const_fn_item_type_forbidden.rs:11:22
-   |
-LL | use foo::BAR as main;
-   |     ---------------- ^ consider adding a `main` function to `$DIR/imported_main_const_fn_item_type_forbidden.rs`
-   |     |
-   |     non-function item at `crate::main` is found
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0601`.
diff --git a/src/test/ui/entry-point/imported_main_const_forbidden.rs b/src/test/ui/entry-point/imported_main_const_forbidden.rs
deleted file mode 100644
index 1508280c0..000000000
--- a/src/test/ui/entry-point/imported_main_const_forbidden.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#![feature(imported_main)]
-pub mod foo {
-    pub const BAR: usize = 42;
-}
-
-use foo::BAR as main; //~ ERROR `main` function not found in crate
diff --git a/src/test/ui/entry-point/imported_main_const_forbidden.stderr b/src/test/ui/entry-point/imported_main_const_forbidden.stderr
deleted file mode 100644
index 9d8b40dc3..000000000
--- a/src/test/ui/entry-point/imported_main_const_forbidden.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0601]: `main` function not found in crate `imported_main_const_forbidden`
-  --> $DIR/imported_main_const_forbidden.rs:6:22
-   |
-LL | use foo::BAR as main;
-   |     ---------------- ^ consider adding a `main` function to `$DIR/imported_main_const_forbidden.rs`
-   |     |
-   |     non-function item at `crate::main` is found
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0601`.
diff --git a/src/test/ui/entry-point/imported_main_from_extern_crate.rs b/src/test/ui/entry-point/imported_main_from_extern_crate.rs
deleted file mode 100644
index 4fddfc44a..000000000
--- a/src/test/ui/entry-point/imported_main_from_extern_crate.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// run-pass
-// aux-build:main_functions.rs
-
-#![feature(imported_main)]
-
-extern crate main_functions;
-pub use main_functions::boilerplate as main;
diff --git a/src/test/ui/entry-point/imported_main_from_inner_mod.rs b/src/test/ui/entry-point/imported_main_from_inner_mod.rs
deleted file mode 100644
index 45750072a..000000000
--- a/src/test/ui/entry-point/imported_main_from_inner_mod.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// run-pass
-#![feature(imported_main)]
-
-pub mod foo {
-    pub fn bar() {
-        println!("Hello world!");
-    }
-}
-use foo::bar as main;
diff --git a/src/test/ui/entry-point/imported_main_unused_not_trigger_feature_gate.rs b/src/test/ui/entry-point/imported_main_unused_not_trigger_feature_gate.rs
deleted file mode 100644
index 4762fbb7c..000000000
--- a/src/test/ui/entry-point/imported_main_unused_not_trigger_feature_gate.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-// check-pass
-#![feature(rustc_attrs)]
-
-#[rustc_main]
-fn actual_main() {}
-
-mod foo {
-    pub(crate) fn something() {}
-}
-
-use foo::something as main;