Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 37 deletions

diff --git a/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct.rs b/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct.rs
deleted file mode 100644
index d3e92e162..000000000
--- a/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-// run-pass
-// Test that the lifetime from the enclosing `&` is "inherited"
-// through the `MyBox` struct.
-
-// pretty-expanded FIXME #23616
-
-#![allow(dead_code)]
-
-trait Test {
-    fn foo(&self) { }
-}
-
-struct SomeStruct<'a> {
-    t: &'a MyBox<dyn Test>,
-    u: &'a MyBox<dyn Test+'a>,
-}
-
-struct MyBox<T:?Sized> {
-    b: Box<T>
-}
-
-fn a<'a>(t: &'a MyBox<dyn Test>, mut ss: SomeStruct<'a>) {
-    ss.t = t;
-}
-
-fn b<'a>(t: &'a MyBox<dyn Test>, mut ss: SomeStruct<'a>) {
-    ss.u = t;
-}
-
-// see also ui/object-lifetime/object-lifetime-default-from-rptr-box-error.rs
-
-fn d<'a>(t: &'a MyBox<dyn Test+'a>, mut ss: SomeStruct<'a>) {
-    ss.u = t;
-}
-
-fn main() {
-}