Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 20 deletions

diff --git a/src/test/ui/traits/trait-upcasting/type-checking-test-3.rs b/src/test/ui/traits/trait-upcasting/type-checking-test-3.rs
deleted file mode 100644
index b2db3a127..000000000
--- a/src/test/ui/traits/trait-upcasting/type-checking-test-3.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-#![feature(trait_upcasting)]
-
-trait Foo<'a>: Bar<'a> {}
-trait Bar<'a> {}
-
-fn test_correct(x: &dyn Foo<'static>) {
-    let _ = x as &dyn Bar<'static>;
-}
-
-fn test_wrong1<'a>(x: &dyn Foo<'static>, y: &'a u32) {
-    let _ = x as &dyn Bar<'a>; // Error
-                               //~^ ERROR lifetime may not live long enough
-}
-
-fn test_wrong2<'a>(x: &dyn Foo<'a>) {
-    let _ = x as &dyn Bar<'static>; // Error
-                                    //~^ ERROR lifetime may not live long enough
-}
-
-fn main() {}