Reblessed some tests.

Author: Alexander Regueiro

src/test/ui/associated-types/associated-types-overridden-binding-2.stderr

@@ -4,7 +4,7 @@ error[E0271]: type mismatch resolving `<std::vec::IntoIter<u32> as std::iter::It
 LL |     let _: &dyn I32Iterator<Item = u32> = &vec![42].into_iter();
    |                                           ^^^^^^^^^^^^^^^^^^^^^ expected `i32`, found `u32`
    |
-   = note: required for the cast to the object type `dyn std::iter::Iterator<Item = u32, Item = i32>`
+   = note: required for the cast to the object type `dyn I32Iterator<Item = u32, Item = i32>`
 
 error: aborting due to previous error
 

src/test/ui/bad/bad-sized.rs

@@ -1,8 +1,12 @@
+// ignore-tidy-linelength
+
 trait Trait {}
 
 pub fn main() {
     let x: Vec<dyn Trait + Sized> = Vec::new();
-    //~^ ERROR only auto traits can be used as additional traits in a trait object
-    //~| ERROR the size for values of type
-    //~| ERROR the size for values of type
+    //~^ ERROR only auto traits can be used as additional traits in a trait object [E0225]
+    //~| ERROR the size for values of type `dyn std::marker::Sized` cannot be known at compilation time [E0277]
+    //~| the trait `std::marker::Sized` cannot be made into an object [E0038]
+    //~| ERROR the size for values of type `dyn std::marker::Sized` cannot be known at compilation time [E0277]
+    //~| the trait `std::marker::Sized` cannot be made into an object [E0038]
 }

src/test/ui/bad/bad-sized.stderr

@@ -1,5 +1,5 @@
 error[E0225]: only auto traits can be used as additional traits in a trait object
-  --> $DIR/bad-sized.rs:4:28
+  --> $DIR/bad-sized.rs:6:28
    |
 LL |     let x: Vec<dyn Trait + Sized> = Vec::new();
    |                    -----   ^^^^^
@@ -9,27 +9,43 @@ LL |     let x: Vec<dyn Trait + Sized> = Vec::new();
    |                    first non-auto trait
    |                    trait alias used in trait object type (first use)
 
-error[E0277]: the size for values of type `dyn Trait` cannot be known at compilation time
-  --> $DIR/bad-sized.rs:4:12
+error[E0277]: the size for values of type `dyn std::marker::Sized` cannot be known at compilation time
+  --> $DIR/bad-sized.rs:6:12
    |
 LL |     let x: Vec<dyn Trait + Sized> = Vec::new();
    |            ^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
    |
-   = help: the trait `std::marker::Sized` is not implemented for `dyn Trait`
+   = help: the trait `std::marker::Sized` is not implemented for `dyn std::marker::Sized`
    = note: to learn more, visit <https://doc.rust-lang.org/book/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = note: required by `std::vec::Vec`
 
-error[E0277]: the size for values of type `dyn Trait` cannot be known at compilation time
-  --> $DIR/bad-sized.rs:4:37
+error[E0038]: the trait `std::marker::Sized` cannot be made into an object
+  --> $DIR/bad-sized.rs:6:12
+   |
+LL |     let x: Vec<dyn Trait + Sized> = Vec::new();
+   |            ^^^^^^^^^^^^^^^^^^^^^^ the trait `std::marker::Sized` cannot be made into an object
+   |
+   = note: the trait cannot require that `Self : Sized`
+
+error[E0277]: the size for values of type `dyn std::marker::Sized` cannot be known at compilation time
+  --> $DIR/bad-sized.rs:6:37
    |
 LL |     let x: Vec<dyn Trait + Sized> = Vec::new();
    |                                     ^^^^^^^^ doesn't have a size known at compile-time
    |
-   = help: the trait `std::marker::Sized` is not implemented for `dyn Trait`
+   = help: the trait `std::marker::Sized` is not implemented for `dyn std::marker::Sized`
    = note: to learn more, visit <https://doc.rust-lang.org/book/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = note: required by `std::vec::Vec::<T>::new`
 
-error: aborting due to 3 previous errors
+error[E0038]: the trait `std::marker::Sized` cannot be made into an object
+  --> $DIR/bad-sized.rs:6:37
+   |
+LL |     let x: Vec<dyn Trait + Sized> = Vec::new();
+   |                                     ^^^^^^^^ the trait `std::marker::Sized` cannot be made into an object
+   |
+   = note: the trait cannot require that `Self : Sized`
+
+error: aborting due to 5 previous errors
 
-Some errors have detailed explanations: E0225, E0277.
-For more information about an error, try `rustc --explain E0225`.
+Some errors have detailed explanations: E0038, E0225, E0277.
+For more information about an error, try `rustc --explain E0038`.

src/test/ui/issues/issue-32963.rs

@@ -2,10 +2,11 @@ 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: std::marker::Copy` is not satisfied
+    //~^ ERROR only auto traits can be used as additional traits in a trait object [E0225]
+    //~| ERROR the trait bound `dyn std::marker::Copy: std::marker::Copy` is not satisfied [E0277]
+    //~| ERROR the trait `std::marker::Copy` cannot be made into an object [E0038]
 }

src/test/ui/issues/issue-32963.stderr

@@ -9,16 +9,24 @@ LL |     size_of_copy::<dyn Misc + Copy>();
    |                        first non-auto trait
    |                        trait alias used in trait object type (first use)
 
-error[E0277]: the trait bound `dyn Misc: std::marker::Copy` is not satisfied
+error[E0277]: the trait bound `dyn std::marker::Copy: std::marker::Copy` is not satisfied
   --> $DIR/issue-32963.rs:8:5
    |
-LL | fn size_of_copy<T: Copy+?Sized>() -> usize { mem::size_of::<T>() }
+LL | fn size_of_copy<T: Copy + ?Sized>() -> usize { mem::size_of::<T>() }
    |    ------------    ---- required by this bound in `size_of_copy`
 ...
 LL |     size_of_copy::<dyn Misc + Copy>();
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `dyn Misc`
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `dyn std::marker::Copy`
 
-error: aborting due to 2 previous errors
+error[E0038]: the trait `std::marker::Copy` cannot be made into an object
+  --> $DIR/issue-32963.rs:8:20
+   |
+LL |     size_of_copy::<dyn Misc + Copy>();
+   |                    ^^^^^^^^^^^^^^^ the trait `std::marker::Copy` cannot be made into an object
+   |
+   = note: the trait cannot require that `Self : Sized`
+
+error: aborting due to 3 previous errors
 
-Some errors have detailed explanations: E0225, E0277.
-For more information about an error, try `rustc --explain E0225`.
+Some errors have detailed explanations: E0038, E0225, E0277.
+For more information about an error, try `rustc --explain E0038`.