Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 36 deletions

diff --git a/src/test/ui/const-generics/overlapping_impls.rs b/src/test/ui/const-generics/overlapping_impls.rs
deleted file mode 100644
index e599eadd8..000000000
--- a/src/test/ui/const-generics/overlapping_impls.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-// check-pass
-#![allow(incomplete_features)]
-#![feature(adt_const_params)]
-#![feature(generic_const_exprs)]
-use std::marker::PhantomData;
-
-struct Foo<const I: i32, const J: i32> {}
-
-const ONE: i32 = 1;
-const TWO: i32 = 2;
-
-impl<const I: i32> Foo<I, ONE> {
-    pub fn foo() {}
-}
-
-impl<const I: i32> Foo<I, TWO> {
-    pub fn foo() {}
-}
-
-
-pub struct Foo2<const P: Protocol, T> {
-    _marker: PhantomData<T>,
-}
-
-#[derive(PartialEq, Eq)]
-pub enum Protocol {
-    Variant1,
-    Variant2,
-}
-
-pub trait Bar {}
-
-impl<T> Bar for Foo2<{ Protocol::Variant1 }, T> {}
-impl<T> Bar for Foo2<{ Protocol::Variant2 }, T> {}
-
-fn main() {}