Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 29 deletions

diff --git a/src/test/ui/inline-const/const-expr-lifetime-err.rs b/src/test/ui/inline-const/const-expr-lifetime-err.rs
deleted file mode 100644
index 0a032a733..000000000
--- a/src/test/ui/inline-const/const-expr-lifetime-err.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-#![feature(const_mut_refs)]
-#![feature(inline_const)]
-
-use std::marker::PhantomData;
-
-#[derive(PartialEq, Eq)]
-pub struct InvariantRef<'a, T: ?Sized>(&'a T, PhantomData<&'a mut &'a T>);
-
-impl<'a, T: ?Sized> InvariantRef<'a, T> {
-    pub const fn new(r: &'a T) -> Self {
-        InvariantRef(r, PhantomData)
-    }
-}
-
-impl<'a> InvariantRef<'a, ()> {
-    pub const NEW: Self = InvariantRef::new(&());
-}
-
-fn equate<T>(x: T, y: T){}
-
-fn foo<'a>() {
-    let y = ();
-    equate(InvariantRef::new(&y), const { InvariantRef::<'a>::NEW });
-    //~^ ERROR `y` does not live long enough [E0597]
-}
-
-fn main() {
-    foo();
-}