Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 34 deletions

diff --git a/src/test/ui/nll/issue-61311-normalize.rs b/src/test/ui/nll/issue-61311-normalize.rs
deleted file mode 100644
index 77d67b07a..000000000
--- a/src/test/ui/nll/issue-61311-normalize.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Regression test for #61311
-// We would ICE after failing to normalize `Self::Proj` in the `impl` below.
-
-// check-pass
-
-pub struct Unit;
-trait Obj {}
-
-trait Bound {}
-impl Bound for Unit {}
-
-pub trait HasProj {
-    type Proj;
-}
-
-impl<T> HasProj for T {
-    type Proj = Unit;
-}
-
-trait HasProjFn {
-    type Proj;
-    fn the_fn(_: Self::Proj);
-}
-
-impl HasProjFn for Unit
-where
-    Box<dyn Obj + 'static>: HasProj,
-    <Box<dyn Obj + 'static> as HasProj>::Proj: Bound,
-{
-    type Proj = Unit;
-    fn the_fn(_: Self::Proj) {}
-}
-
-fn main() {}