Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 24 insertions, 0 deletions

diff --git a/tests/ui/shadowed/shadowed-lifetime.rs b/tests/ui/shadowed/shadowed-lifetime.rs
new file mode 100644
index 000000000..9487b4f4e
--- /dev/null
+++ b/tests/ui/shadowed/shadowed-lifetime.rs
@@ -0,0 +1,24 @@
+// Test that shadowed lifetimes generate an error.
+
+struct Foo<'a>(&'a isize);
+
+impl<'a> Foo<'a> {
+    fn shadow_in_method<'a>(&'a self) -> &'a isize {
+        //~^ ERROR lifetime name `'a` shadows a lifetime name that is already in scope
+        self.0
+    }
+
+    fn shadow_in_type<'b>(&'b self) -> &'b isize {
+        let x: for<'b> fn(&'b isize) = panic!();
+        //~^ ERROR lifetime name `'b` shadows a lifetime name that is already in scope
+        self.0
+    }
+
+    fn not_shadow_in_item<'b>(&'b self) {
+        struct Bar<'a, 'b>(&'a isize, &'b isize); // not a shadow, separate item
+        fn foo<'a, 'b>(x: &'a isize, y: &'b isize) { } // same
+    }
+}
+
+fn main() {
+}