Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 14 deletions

diff --git a/src/test/ui/nll/relate_tys/trait-hrtb.rs b/src/test/ui/nll/relate_tys/trait-hrtb.rs
deleted file mode 100644
index 7f40e93cd..000000000
--- a/src/test/ui/nll/relate_tys/trait-hrtb.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Test that NLL generates proper error spans for trait HRTB errors
-//
-// compile-flags:-Zno-leak-check
-
-trait Foo<'a> {}
-
-fn make_foo<'a>() -> Box<dyn Foo<'a>> {
-    panic!()
-}
-
-fn main() {
-    let x: Box<dyn Foo<'static>> = make_foo();
-    let y: Box<dyn for<'a> Foo<'a>> = x; //~ ERROR mismatched types [E0308]
-}