Merging upstream version 1.68.2+dfsg1.

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

6 files changed, 0 insertions, 119 deletions

diff --git a/src/test/ui/query-system/fn-sig-cycle-arity.rs b/src/test/ui/query-system/fn-sig-cycle-arity.rs
deleted file mode 100644
index 7a9b8469c..000000000
--- a/src/test/ui/query-system/fn-sig-cycle-arity.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-trait Dancer {
-    fn dance(&self) -> _ {
-        //~^ ERROR the placeholder `_` is not allowed within types on item signatures for return types
-        self.dance()
-    }
-}
-
-fn main() {}
diff --git a/src/test/ui/query-system/fn-sig-cycle-arity.stderr b/src/test/ui/query-system/fn-sig-cycle-arity.stderr
deleted file mode 100644
index 67e0c2545..000000000
--- a/src/test/ui/query-system/fn-sig-cycle-arity.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0121]: the placeholder `_` is not allowed within types on item signatures for return types
-  --> $DIR/fn-sig-cycle-arity.rs:2:24
-   |
-LL |     fn dance(&self) -> _ {
-   |                        ^ not allowed in type signatures
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0121`.
diff --git a/src/test/ui/query-system/issue-83479.rs b/src/test/ui/query-system/issue-83479.rs
deleted file mode 100644
index 32676dfe9..000000000
--- a/src/test/ui/query-system/issue-83479.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-#![feature(type_alias_impl_trait)]
-
-type PairCoupledTypes: Trait<
-    //~^ ERROR: bounds on `type`s in this context have no effect
-    //~| ERROR: cannot find trait `Trait` in this scope
-    [u32; {
-        static FOO: usize; //~ ERROR: free static item without body
-    }],
-> = impl Trait<
-    //~^ ERROR: cannot find trait `Trait` in this scope
-    [u32; {
-        static FOO: usize; //~ ERROR: free static item without body
-    }],
->;
-
-fn main() {}
diff --git a/src/test/ui/query-system/issue-83479.stderr b/src/test/ui/query-system/issue-83479.stderr
deleted file mode 100644
index 7cb41f5cb..000000000
--- a/src/test/ui/query-system/issue-83479.stderr
+++ /dev/null
@@ -1,44 +0,0 @@
-error: bounds on `type`s in this context have no effect
-  --> $DIR/issue-83479.rs:3:24
-   |
-LL |   type PairCoupledTypes: Trait<
-   |  ________________________^
-LL | |
-LL | |
-LL | |     [u32; {
-LL | |         static FOO: usize;
-LL | |     }],
-LL | | > = impl Trait<
-   | |_^
-
-error: free static item without body
-  --> $DIR/issue-83479.rs:7:9
-   |
-LL |         static FOO: usize;
-   |         ^^^^^^^^^^^^^^^^^-
-   |                          |
-   |                          help: provide a definition for the static: `= <expr>;`
-
-error: free static item without body
-  --> $DIR/issue-83479.rs:12:9
-   |
-LL |         static FOO: usize;
-   |         ^^^^^^^^^^^^^^^^^-
-   |                          |
-   |                          help: provide a definition for the static: `= <expr>;`
-
-error[E0405]: cannot find trait `Trait` in this scope
-  --> $DIR/issue-83479.rs:3:24
-   |
-LL | type PairCoupledTypes: Trait<
-   |                        ^^^^^ not found in this scope
-
-error[E0405]: cannot find trait `Trait` in this scope
-  --> $DIR/issue-83479.rs:9:10
-   |
-LL | > = impl Trait<
-   |          ^^^^^ not found in this scope
-
-error: aborting due to 5 previous errors
-
-For more information about this error, try `rustc --explain E0405`.
diff --git a/src/test/ui/query-system/query_depth.rs b/src/test/ui/query-system/query_depth.rs
deleted file mode 100644
index e600c1c08..000000000
--- a/src/test/ui/query-system/query_depth.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-// build-fail
-
-#![recursion_limit = "64"]
-type Byte = Option<Option<Option<Option< Option<Option<Option<Option<
-    Option<Option<Option<Option< Option<Option<Option<Option<
-        Option<Option<Option<Option< Option<Option<Option<Option<
-            Option<Option<Option<Option< Option<Option<Option<Option<
-                Option<Option<Option<Option< Option<Option<Option<Option<
-                    Option<Option<Option<Option< Option<Option<Option<Option<
-                        Option<Option<Option<Option< Option<Option<Option<Option<
-                            Option<Option<Option<Option< Option<Option<Option<Option<
-                                Option<Option<Option<Option< Option<Option<Option<Option<
-                                    Option<Option<Option<Option< Option<Option<Option<Option<
-                                        Option<Option<Option<Option< Option<Option<Option<Option<
-                                            Box<String>
-                                        >>>> >>>>
-                                    >>>> >>>>
-                                >>>> >>>>
-                            >>>> >>>>
-                        >>>> >>>>
-                    >>>> >>>>
-                >>>> >>>>
-            >>>> >>>>
-        >>>> >>>>
-    >>>> >>>>
->>>> >>>>;
-
-fn main() {
-//~^ ERROR: queries overflow the depth limit!
-    println!("{}", std::mem::size_of::<Byte>());
-}
diff --git a/src/test/ui/query-system/query_depth.stderr b/src/test/ui/query-system/query_depth.stderr
deleted file mode 100644
index 43a18b4e0..000000000
--- a/src/test/ui/query-system/query_depth.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error: queries overflow the depth limit!
-  --> $DIR/query_depth.rs:28:1
-   |
-LL | fn main() {
-   | ^^^^^^^^^
-   |
-   = help: consider increasing the recursion limit by adding a `#![recursion_limit = "128"]` attribute to your crate (`query_depth`)
-   = note: query depth increased by 66 when computing layout of `core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<core::option::Option<alloc::boxed::Box<alloc::string::String>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>`
-
-error: aborting due to previous error
-