Import test changes from rust-lang#122553

Author: GrigorenkoPV

tests/ui/sized/recursive-type-tail.rs

@@ -0,0 +1,11 @@
+//@ check-fail
+
+trait A { type Assoc; }
+
+impl A for () {
+    type Assoc = Foo<()>;
+    //~^ ERROR overflow evaluating the requirement `<Foo<()> as Pointee>::Metadata == ()`
+}
+struct Foo<T: A>(T::Assoc);
+
+fn main() {}

tests/ui/trait-bounds/super-assoc-mismatch.rs

@@ -6,6 +6,8 @@ impl Super for () {
 }
 trait Sub: Super<Assoc = u16> {}
 
+// direct impls (no nested obligations):
+
 trait BoundOnSelf: Sub {}
 impl BoundOnSelf for () {}
 //~^ ERROR the trait bound `(): Sub` is not satisfied
@@ -25,14 +27,41 @@ impl BoundOnAssoc for () {
 trait BoundOnGat where Self::Assoc<u8>: Sub {
     type Assoc<T>;
 }
-impl BoundOnGat for u8 {
+impl BoundOnGat for () {
     type Assoc<T> = ();
     //~^ ERROR the trait bound `(): Sub` is not satisfied
 }
 
 fn trivial_bound() where (): Sub {}
 //~^ ERROR the trait bound `(): Sub` is not satisfied
 
+// blanket impls with nested obligations:
+
+struct Wrapper<T>(T);
+impl<T: Super> Super for Wrapper<T> {
+    type Assoc = T::Assoc;
+}
+impl<T: Sub> Sub for Wrapper<T> {}
+
+impl BoundOnSelf for Wrapper<()> {}
+//~^ ERROR the trait bound `(): Sub` is not satisfied
+
+impl BoundOnParam<Wrapper<()>> for Wrapper<()> {}
+//~^ ERROR the trait bound `(): Sub` is not satisfied
+
+impl BoundOnAssoc for Wrapper<()> {
+    type Assoc = Wrapper<()>;
+    //~^ ERROR the trait bound `(): Sub` is not satisfied
+}
+
+impl BoundOnGat for Wrapper<()> {
+    type Assoc<T> = Wrapper<()>;
+    //~^ ERROR the trait bound `(): Sub` is not satisfied
+}
+
+fn trivial_bound_wrapper() where Wrapper<()>: Sub {}
+//~^ ERROR the trait bound `(): Sub` is not satisfied
+
 // The following is an edge case where the unsatisfied projection predicate
 // `<<u8 as MultiAssoc>::Assoc1<()> as SuperGeneric<u16>>::Assoc == <u8 as MultiAssoc>::Assoc2`
 // contains both associated types of `MultiAssoc`. To suppress the error about the unsatisfied

tests/ui/traits/issue-32963.rs

@@ -2,9 +2,10 @@ use std::mem;
 
 trait Misc {}
 
-fn size_of_copy<T: Copy+?Sized>() -> usize { mem::size_of::<T>() }
+fn size_of_copy<T: Copy + ?Sized>() -> usize { mem::size_of::<T>() }
 
 fn main() {
     size_of_copy::<dyn Misc + Copy>();
     //~^ ERROR only auto traits can be used as additional traits in a trait object
+    //~| ERROR the trait bound `dyn Misc<Metadata = ()>: Copy` is not satisfied
 }

tests/ui/traits/pointee-normalize-equate.rs

@@ -26,6 +26,14 @@ fn wrapper_to_unit<T>(ptr: *const ()) -> *const Wrapper<T> {
     cast_same_meta(ptr)
 }
 
+// normalize `Wrapper<T>::Metadata` -> `()`
+fn wrapper_to_unit2<T: ?Sized>(ptr: *const ()) -> *const Wrapper<T>
+where
+    Wrapper<T>: Sized,
+{
+    cast_same_meta(ptr)
+}
+
 trait Project {
     type Assoc: ?Sized;
 }
@@ -45,8 +53,16 @@ where
     cast_same_meta(ptr)
 }
 
-// normalize `<[T] as Pointee>::Metadata` -> `usize`, even if `[T]: Sized`
-fn sized_slice<T>(ptr: *const [T]) -> *const str
+// normalize `WrapperProject<T>::Metadata` -> `T::Assoc::Metadata` -> `()`
+fn wrapper_project_unit2<T: ?Sized + Project>(ptr: *const ()) -> *const WrapperProject<T>
+where
+    WrapperProject<T>: Sized,
+{
+    cast_same_meta(ptr)
+}
+
+// if `[T]: Sized`, then normalize `<[T] as Pointee>::Metadata` -> `()`
+fn sized_slice<T>(ptr: *const ()) -> *const [T]
 where
     [T]: Sized,
 {

tests/ui/traits/pointee-normalize-shallow.rs

@@ -0,0 +1,20 @@
+//@ check-pass
+
+#![feature(ptr_metadata)]
+
+use std::ptr::Thin;
+
+struct Wrapper<T: ?Sized>(T);
+
+fn check_thin<T: ?Sized + Thin>() {}
+
+// Test that normalization of `<Wrapper<[T]> as Pointee>::Metadata` respects the
+// `<[T] as Pointee>::Metadata == ()` bound from the param env.
+fn foo<T>()
+where
+    [T]: Thin,
+{
+    check_thin::<Wrapper<[T]>>();
+}
+
+fn main() {}