Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 11 deletions

diff --git a/src/test/ui/traits/object/vs-lifetime-2.rs b/src/test/ui/traits/object/vs-lifetime-2.rs
deleted file mode 100644
index 0b33dc7f6..000000000
--- a/src/test/ui/traits/object/vs-lifetime-2.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-// A few contrived examples where lifetime should (or should not) be parsed as an object type.
-// Lifetimes parsed as types are still rejected later by semantic checks.
-
-// `'static` is a lifetime, `'static +` is a type, `'a` is a type
-fn g() where
-    'static: 'static,
-    dyn 'static +: 'static + Copy,
-    //~^ ERROR at least one trait is required for an object type
-{}
-
-fn main() {}