Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 36 deletions

diff --git a/src/test/ui/associated-types/normalization-debruijn-1.rs b/src/test/ui/associated-types/normalization-debruijn-1.rs
deleted file mode 100644
index a5abf1ba9..000000000
--- a/src/test/ui/associated-types/normalization-debruijn-1.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-// build-pass
-// edition:2018
-
-// Regression test to ensure we handle debruijn indices correctly in projection
-// normalization under binders. Found in crater run for #85499
-
-use std::future::Future;
-use std::pin::Pin;
-pub enum Outcome<S, E> {
-    Success((S, E)),
-}
-pub struct Request<'r> {
-    _marker: std::marker::PhantomData<&'r ()>,
-}
-pub trait FromRequest<'r>: Sized {
-    type Error;
-    fn from_request<'life0>(
-        request: &'r Request<'life0>,
-    ) -> Pin<Box<dyn Future<Output = Outcome<Self, Self::Error>>>>;
-}
-impl<'r, T: FromRequest<'r>> FromRequest<'r> for Option<T> {
-    type Error = ();
-    fn from_request<'life0>(
-        request: &'r Request<'life0>,
-    ) -> Pin<Box<dyn Future<Output = Outcome<Self, Self::Error>>>> {
-        Box::pin(async move {
-            let request = request;
-            match T::from_request(request).await {
-                _ => todo!(),
-            }
-        });
-        todo!()
-    }
-}
-
-fn main() {}