Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 41 deletions

diff --git a/src/test/ui/traits/object/generics.rs b/src/test/ui/traits/object/generics.rs
deleted file mode 100644
index 5a4a6aecc..000000000
--- a/src/test/ui/traits/object/generics.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-// run-pass
-// test for #8664
-
-use std::marker;
-
-pub trait Trait2<A> {
-    fn doit(&self) -> A;
-}
-
-pub struct Impl<A1, A2, A3> {
-    m1: marker::PhantomData<(A1,A2,A3)>,
-    /*
-     * With A2 we get the ICE:
-     * task <unnamed> failed at 'index out of bounds: the len is 1 but the index is 1',
-     * src/librustc/middle/subst.rs:58
-     */
-    t: Box<dyn Trait2<A2>+'static>
-}
-
-impl<A1, A2, A3> Impl<A1, A2, A3> {
-    pub fn step(&self) {
-        self.t.doit();
-    }
-}
-
-// test for #8601
-
-enum Type<T> { Constant(#[allow(unused_tuple_struct_fields)] T) }
-
-trait Trait<K,V> {
-    fn method(&self, _: Type<(K,V)>) -> isize;
-}
-
-impl<V> Trait<u8,V> for () {
-    fn method(&self, _x: Type<(u8,V)>) -> isize { 0 }
-}
-
-pub fn main() {
-    let a = Box::new(()) as Box<dyn Trait<u8, u8>>;
-    assert_eq!(a.method(Type::Constant((1, 2))), 0);
-}