Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 35 deletions

diff --git a/src/test/ui/variance/variance-trait-bounds.rs b/src/test/ui/variance/variance-trait-bounds.rs
deleted file mode 100644
index ad5334602..000000000
--- a/src/test/ui/variance/variance-trait-bounds.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-#![allow(dead_code)]
-#![feature(rustc_attrs)]
-
-// Check that bounds on type parameters (other than `Self`) do not
-// influence variance.
-
-trait Getter<T> {
-    fn get(&self) -> T;
-}
-
-trait Setter<T> {
-    fn get(&self, _: T);
-}
-
-#[rustc_variance]
-struct TestStruct<U,T:Setter<U>> { //~ ERROR [+, +]
-    t: T, u: U
-}
-
-#[rustc_variance]
-enum TestEnum<U,T:Setter<U>> { //~ ERROR [*, +]
-    Foo(T)
-}
-
-#[rustc_variance]
-struct TestContraStruct<U,T:Setter<U>> { //~ ERROR [*, +]
-    t: T
-}
-
-#[rustc_variance]
-struct TestBox<U,T:Getter<U>+Setter<U>> { //~ ERROR [*, +]
-    t: T
-}
-
-pub fn main() { }