Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 22 deletions

diff --git a/src/test/ui/const-generics/types-mismatch-const-args.rs b/src/test/ui/const-generics/types-mismatch-const-args.rs
deleted file mode 100644
index 43ef28b26..000000000
--- a/src/test/ui/const-generics/types-mismatch-const-args.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// revisions: full min
-#![cfg_attr(full, feature(generic_const_exprs))]
-#![cfg_attr(full, allow(incomplete_features))]
-
-// tests the diagnostic output of type mismatches for types that have const generics arguments.
-
-use std::marker::PhantomData;
-
-struct A<'a, T, const X: u32, const Y: u32> {
-    data: PhantomData<&'a T>
-}
-
-fn a<'a, 'b>() {
-    let _: A<'a, u32, {2u32}, {3u32}> = A::<'a, u32, {2u32 + 2u32}, {3u32}> { data: PhantomData };
-    //~^ ERROR mismatched types
-    let _: A<'a, u16, {2u32}, {3u32}> = A::<'b, u32, {2u32}, {3u32}> { data: PhantomData };
-    //~^ ERROR mismatched types
-    let _: A<'a, u16, {4u32}, {3u32}> = A::<'b, u32, {2u32}, {3u32}> { data: PhantomData };
-    //~^ ERROR mismatched types
-}
-
-pub fn main() {}