Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 31 deletions

diff --git a/src/test/ui/nll/type-alias-free-regions.rs b/src/test/ui/nll/type-alias-free-regions.rs
deleted file mode 100644
index fd5566f35..000000000
--- a/src/test/ui/nll/type-alias-free-regions.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Test that we don't assume that type aliases have the same type parameters
-// as the type they alias and then panic when we see this.
-
-type A<'a> = &'a isize;
-type B<'a> = Box<A<'a>>;
-
-struct C<'a> {
-    f: Box<B<'a>>
-}
-
-trait FromBox<'a> {
-    fn from_box(b: Box<B>) -> Self;
-}
-
-impl<'a> FromBox<'a> for C<'a> {
-    fn from_box(b: Box<B>) -> Self {
-        C { f: b } //~ ERROR
-    }
-}
-
-trait FromTuple<'a> {
-    fn from_tuple( b: (B,)) -> Self;
-}
-
-impl<'a> FromTuple<'a> for C<'a> {
-    fn from_tuple(b: (B,)) -> Self {
-        C { f: Box::new(b.0) } //~ ERROR
-    }
-}
-
-fn main() {}