Merging upstream version 1.68.2+dfsg1.

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

5 files changed, 0 insertions, 61 deletions

diff --git a/src/test/ui/rfc-2632-const-trait-impl/const_derives/derive-const-gate.rs b/src/test/ui/rfc-2632-const-trait-impl/const_derives/derive-const-gate.rs
deleted file mode 100644
index 348ca0ab1..000000000
--- a/src/test/ui/rfc-2632-const-trait-impl/const_derives/derive-const-gate.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-#[derive_const(Default)] //~ ERROR use of unstable library feature
-pub struct S;
-
-fn main() {}
diff --git a/src/test/ui/rfc-2632-const-trait-impl/const_derives/derive-const-gate.stderr b/src/test/ui/rfc-2632-const-trait-impl/const_derives/derive-const-gate.stderr
deleted file mode 100644
index cc9bdd271..000000000
--- a/src/test/ui/rfc-2632-const-trait-impl/const_derives/derive-const-gate.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0658]: use of unstable library feature 'derive_const'
-  --> $DIR/derive-const-gate.rs:1:3
-   |
-LL | #[derive_const(Default)]
-   |   ^^^^^^^^^^^^
-   |
-   = help: add `#![feature(derive_const)]` to the crate attributes to enable
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/rfc-2632-const-trait-impl/const_derives/derive-const-non-const-type.rs b/src/test/ui/rfc-2632-const-trait-impl/const_derives/derive-const-non-const-type.rs
deleted file mode 100644
index 92843a8a2..000000000
--- a/src/test/ui/rfc-2632-const-trait-impl/const_derives/derive-const-non-const-type.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-#![feature(derive_const)]
-
-pub struct A;
-
-impl Default for A {
-    fn default() -> A { A }
-}
-
-#[derive_const(Default)]
-pub struct S(A);
-//~^ cannot call non-const fn
-
-fn main() {}
diff --git a/src/test/ui/rfc-2632-const-trait-impl/const_derives/derive-const-non-const-type.stderr b/src/test/ui/rfc-2632-const-trait-impl/const_derives/derive-const-non-const-type.stderr
deleted file mode 100644
index d463c774e..000000000
--- a/src/test/ui/rfc-2632-const-trait-impl/const_derives/derive-const-non-const-type.stderr
+++ /dev/null
@@ -1,14 +0,0 @@
-error[E0015]: cannot call non-const fn `<A as Default>::default` in constant functions
-  --> $DIR/derive-const-non-const-type.rs:10:14
-   |
-LL | #[derive_const(Default)]
-   |                ------- in this derive macro expansion
-LL | pub struct S(A);
-   |              ^
-   |
-   = note: calls in constant functions are limited to constant functions, tuple structs and tuple variants
-   = note: this error originates in the derive macro `Default` (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0015`.
diff --git a/src/test/ui/rfc-2632-const-trait-impl/const_derives/derive-const-use.rs b/src/test/ui/rfc-2632-const-trait-impl/const_derives/derive-const-use.rs
deleted file mode 100644
index d1fbeac85..000000000
--- a/src/test/ui/rfc-2632-const-trait-impl/const_derives/derive-const-use.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// check-pass
-#![feature(const_trait_impl, const_cmp, const_default_impls, derive_const)]
-
-pub struct A;
-
-impl const Default for A {
-    fn default() -> A { A }
-}
-
-impl const PartialEq for A {
-    fn eq(&self, _: &A) -> bool { true }
-}
-
-#[derive_const(Default, PartialEq)]
-pub struct S((), A);
-
-const _: () = assert!(S((), A) == S::default());
-
-fn main() {}