Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 28 deletions

diff --git a/src/test/ui/const-generics/issues/issue-79674.rs b/src/test/ui/const-generics/issues/issue-79674.rs
deleted file mode 100644
index ff141d328..000000000
--- a/src/test/ui/const-generics/issues/issue-79674.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-#![feature(generic_const_exprs)]
-#![allow(incomplete_features)]
-
-trait MiniTypeId {
-    const TYPE_ID: u64;
-}
-
-impl<T> MiniTypeId for T {
-    const TYPE_ID: u64 = 0;
-}
-
-enum Lift<const V: bool> {}
-
-trait IsFalse {}
-impl IsFalse for Lift<false> {}
-
-const fn is_same_type<T: MiniTypeId, U: MiniTypeId>() -> bool {
-    T::TYPE_ID == U::TYPE_ID
-}
-
-fn requires_distinct<A, B>(_a: A, _b: B) where
-    A: MiniTypeId, B: MiniTypeId,
-    Lift<{is_same_type::<A, B>()}>: IsFalse {}
-
-fn main() {
-    requires_distinct("str", 12);
-    //~^ ERROR mismatched types
-}