Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 17 deletions

diff --git a/src/test/ui/traits/object/vs-lifetime.rs b/src/test/ui/traits/object/vs-lifetime.rs
deleted file mode 100644
index 14ae67cff..000000000
--- a/src/test/ui/traits/object/vs-lifetime.rs
+++ /dev/null
@@ -1,17 +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.
-
-struct S<'a, T>(&'a u8, T);
-
-fn main() {
-    // `'static` is a lifetime argument, `'static +` is a type argument
-    let _: S<'static, u8>;
-    let _: S<'static, dyn 'static +>;
-    //~^ at least one trait is required for an object type
-    let _: S<'static, 'static>;
-    //~^ ERROR this struct takes 1 lifetime argument but 2 lifetime arguments were supplied
-    //~| ERROR this struct takes 1 generic argument but 0 generic arguments were supplied
-    let _: S<dyn 'static +, 'static>;
-    //~^ ERROR type provided when a lifetime was expected
-    //~| ERROR at least one trait is required for an object type
-}