Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 40 deletions

diff --git a/src/test/ui/trivial-bounds/trivial-bounds-lint.rs b/src/test/ui/trivial-bounds/trivial-bounds-lint.rs
deleted file mode 100644
index 078578372..000000000
--- a/src/test/ui/trivial-bounds/trivial-bounds-lint.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-#![feature(trivial_bounds)]
-#![allow(unused)]
-#![deny(trivial_bounds)]
-
-struct A where i32: Copy; //~ ERROR
-
-trait X<T: Copy> {}
-
-trait Y<T>: Copy {}
-
-trait Z {
-    type S: Copy;
-}
-
-// Check only the bound the user writes trigger the lint
-fn trivial_elaboration<T>() where T: X<i32> + Z<S = i32>, i32: Y<T> {} // OK
-
-fn global_param() where i32: X<()> {} //~ ERROR
-
-// Should only error on the trait bound, not the implicit
-// projection bound <i32 as Z>::S == i32.
-fn global_projection() where i32: Z<S = i32> {} //~ ERROR
-
-impl A {
-    fn new() -> A { A }
-}
-
-// Lifetime bounds should be linted as well
-fn global_lifetimes() where i32: 'static, &'static str: 'static {}
-//~^ ERROR
-//~| ERROR
-
-fn local_lifetimes<'a>() where i32: 'a, &'a str: 'a {} // OK
-
-fn global_outlives() where 'static: 'static {} //~ ERROR
-
-// Check that each bound is checked individually
-fn mixed_bounds<T: Copy>() where i32: X<T> + Copy {} //~ ERROR
-
-fn main() {}