Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 14 deletions

diff --git a/src/test/ui/regions/region-object-lifetime-2.rs b/src/test/ui/regions/region-object-lifetime-2.rs
deleted file mode 100644
index cfdb8fefe..000000000
--- a/src/test/ui/regions/region-object-lifetime-2.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Various tests related to testing how region inference works
-// with respect to the object receivers.
-
-trait Foo {
-    fn borrowed<'a>(&'a self) -> &'a ();
-}
-
-// Borrowed receiver but two distinct lifetimes, we get an error.
-fn borrowed_receiver_different_lifetimes<'a,'b>(x: &'a dyn Foo) -> &'b () {
-    x.borrowed()
-    //~^ ERROR lifetime may not live long enough
-}
-
-fn main() {}