Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 42 deletions

diff --git a/src/test/ui/object-lifetime/object-lifetime-default-from-rptr.rs b/src/test/ui/object-lifetime/object-lifetime-default-from-rptr.rs
deleted file mode 100644
index 5093b1c27..000000000
--- a/src/test/ui/object-lifetime/object-lifetime-default-from-rptr.rs
+++ /dev/null
@@ -1,42 +0,0 @@
-// run-pass
-// Test that the lifetime of the enclosing `&` is used for the object
-// lifetime bound.
-
-// pretty-expanded FIXME #23616
-
-#![allow(dead_code)]
-
-use std::fmt::Display;
-
-trait Test {
-    fn foo(&self) { }
-}
-
-struct SomeStruct<'a> {
-    t: &'a dyn Test,
-    u: &'a (dyn Test+'a),
-}
-
-fn a<'a>(t: &'a dyn Test, mut ss: SomeStruct<'a>) {
-    ss.t = t;
-}
-
-fn b<'a>(t: &'a dyn Test, mut ss: SomeStruct<'a>) {
-    ss.u = t;
-}
-
-fn c<'a>(t: &'a (dyn Test+'a), mut ss: SomeStruct<'a>) {
-    ss.t = t;
-}
-
-fn d<'a>(t: &'a (dyn Test+'a), mut ss: SomeStruct<'a>) {
-    ss.u = t;
-}
-
-fn e<'a>(_: &'a (dyn Display+'static)) {}
-
-fn main() {
-    // Inside a function body, we can just infer both
-    // lifetimes, to allow &'tmp (Display+'static).
-    e(&0 as &dyn Display);
-}