Fix the remaining tests

Signed-off-by: FedericoBruzzone <[email protected]>

Author: FedericoBruzzone

compiler/rustc_ty_utils/src/layout.rs

@@ -317,7 +317,7 @@ fn layout_of_uncached<'tcx>(
             if count.has_aliases() {
                 count = tcx.normalize_erasing_regions(cx.typing_env, count);
                 if count.has_aliases() {
-                    return Err(error(cx, LayoutError::Unknown(ty)));
+                    return Err(error(cx, LayoutError::TooGeneric(ty)));
                 }
             }
 

tests/ui/const-generics/transmute_no_gate.stderr

@@ -4,80 +4,80 @@ error[E0512]: cannot transmute between types of different sizes, or dependently-
 LL |     std::mem::transmute(v)
    |     ^^^^^^^^^^^^^^^^^^^
    |
-   = note: source type: `[[u32; H]; W]` (this type does not have a fixed size)
-   = note: target type: `[[u32; W]; H]` (this type does not have a fixed size)
+   = note: source type: `[[u32; H]; W]` (`[[u32; H]; W]` is too generic to determine the layout)
+   = note: target type: `[[u32; W]; H]` (`[[u32; W]; H]` is too generic to determine the layout)
 
 error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
   --> $DIR/transmute_no_gate.rs:20:5
    |
 LL |     std::mem::transmute(v)
    |     ^^^^^^^^^^^^^^^^^^^
    |
-   = note: source type: `[[u32; H]; W]` (this type does not have a fixed size)
-   = note: target type: `[u32; W * H]` (this type does not have a fixed size)
+   = note: source type: `[[u32; H]; W]` (`[[u32; H]; W]` is too generic to determine the layout)
+   = note: target type: `[u32; W * H]` (`[u32; W * H]` is too generic to determine the layout)
 
 error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
   --> $DIR/transmute_no_gate.rs:27:5
    |
 LL |     std::mem::transmute(v)
    |     ^^^^^^^^^^^^^^^^^^^
    |
-   = note: source type: `[u32; H*W]` (this type does not have a fixed size)
-   = note: target type: `[[u32; W]; H]` (this type does not have a fixed size)
+   = note: source type: `[u32; H*W]` (`[u32; H*W]` is too generic to determine the layout)
+   = note: target type: `[[u32; W]; H]` (`[[u32; W]; H]` is too generic to determine the layout)
 
 error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
   --> $DIR/transmute_no_gate.rs:36:5
    |
 LL |     std::mem::transmute(v)
    |     ^^^^^^^^^^^^^^^^^^^
    |
-   = note: source type: `[[[u32; D]; H]; W]` (this type does not have a fixed size)
-   = note: target type: `[u32; D * W * H]` (this type does not have a fixed size)
+   = note: source type: `[[[u32; D]; H]; W]` (`[[[u32; D]; H]; W]` is too generic to determine the layout)
+   = note: target type: `[u32; D * W * H]` (`[u32; D * W * H]` is too generic to determine the layout)
 
 error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
   --> $DIR/transmute_no_gate.rs:45:5
    |
 LL |     std::mem::transmute(v)
    |     ^^^^^^^^^^^^^^^^^^^
    |
-   = note: source type: `[[[u32; D]; H]; W]` (this type does not have a fixed size)
-   = note: target type: `[[u32; D * W]; H]` (this type does not have a fixed size)
+   = note: source type: `[[[u32; D]; H]; W]` (`[[[u32; D]; H]; W]` is too generic to determine the layout)
+   = note: target type: `[[u32; D * W]; H]` (`[[u32; D * W]; H]` is too generic to determine the layout)
 
 error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
   --> $DIR/transmute_no_gate.rs:52:5
    |
 LL |     std::mem::transmute(v)
    |     ^^^^^^^^^^^^^^^^^^^
    |
-   = note: source type: `[u16; L]` (this type does not have a fixed size)
-   = note: target type: `[u8; L * 2]` (this type does not have a fixed size)
+   = note: source type: `[u16; L]` (`[u16; L]` is too generic to determine the layout)
+   = note: target type: `[u8; L * 2]` (`[u8; L * 2]` is too generic to determine the layout)
 
 error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
   --> $DIR/transmute_no_gate.rs:59:5
    |
 LL |     std::mem::transmute(v)
    |     ^^^^^^^^^^^^^^^^^^^
    |
-   = note: source type: `[u8; L * 2]` (this type does not have a fixed size)
-   = note: target type: `[u16; L]` (this type does not have a fixed size)
+   = note: source type: `[u8; L * 2]` (`[u8; L * 2]` is too generic to determine the layout)
+   = note: target type: `[u16; L]` (`[u16; L]` is too generic to determine the layout)
 
 error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
   --> $DIR/transmute_no_gate.rs:66:5
    |
 LL |     std::mem::transmute(v)
    |     ^^^^^^^^^^^^^^^^^^^
    |
-   = note: source type: `[u8; L]` (this type does not have a fixed size)
-   = note: target type: `[[u8; 1]; L]` (this type does not have a fixed size)
+   = note: source type: `[u8; L]` (`[u8; L]` is too generic to determine the layout)
+   = note: target type: `[[u8; 1]; L]` (`[[u8; 1]; L]` is too generic to determine the layout)
 
 error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
   --> $DIR/transmute_no_gate.rs:75:5
    |
 LL |     std::mem::transmute(v)
    |     ^^^^^^^^^^^^^^^^^^^
    |
-   = note: source type: `[[u32; 2 * H]; W + W]` (this type does not have a fixed size)
-   = note: target type: `[[u32; W + W]; 2 * H]` (this type does not have a fixed size)
+   = note: source type: `[[u32; 2 * H]; W + W]` (`[[u32; 2 * H]; W + W]` is too generic to determine the layout)
+   = note: target type: `[[u32; W + W]; 2 * H]` (`[[u32; W + W]; 2 * H]` is too generic to determine the layout)
 
 error: aborting due to 9 previous errors
 

tests/ui/issues/issue-21174.stderr

@@ -4,8 +4,8 @@ error[E0512]: cannot transmute between types of different sizes, or dependently-
 LL |     let new: T::B = unsafe { std::mem::transmute(value) };
    |                              ^^^^^^^^^^^^^^^^^^^
    |
-   = note: source type: `<T as Trait<'_>>::A` (this type does not have a fixed size)
-   = note: target type: `<T as Trait<'_>>::B` (this type does not have a fixed size)
+   = note: source type: `<T as Trait<'_>>::A` (`<T as Trait<'_>>::A` is too generic to determine the layout)
+   = note: target type: `<T as Trait<'_>>::B` (`<T as Trait<'_>>::B` is too generic to determine the layout)
 
 error: aborting due to 1 previous error
 

tests/ui/repr/conflicting-repr-hints.rs

@@ -74,7 +74,7 @@ pub union U { //~ ERROR type has conflicting packed and align representation hin
     u: u16
 }
 
-static B: U = U { u: 0 };
+static B: U = U { u: 0 }; //~ ERROR could not evaluate static initializer
 static A: S = S(0);
 
 fn main() {}

tests/ui/repr/conflicting-repr-hints.stderr

@@ -77,10 +77,16 @@ error[E0587]: type has conflicting packed and align representation hints
 LL | pub union U {
    | ^^^^^^^^^^^
 
-error: aborting due to 12 previous errors
+error[E0080]: could not evaluate static initializer
+  --> $DIR/conflicting-repr-hints.rs:77:1
+   |
+LL | static B: U = U { u: 0 };
+   | ^^^^^^^^^^^ the type `U` has an unknown layout
+
+error: aborting due to 13 previous errors
 
-Some errors have detailed explanations: E0566, E0587, E0634.
-For more information about an error, try `rustc --explain E0566`.
+Some errors have detailed explanations: E0080, E0566, E0587, E0634.
+For more information about an error, try `rustc --explain E0080`.
 Future incompatibility report: Future breakage diagnostic:
 error[E0566]: conflicting representation hints
   --> $DIR/conflicting-repr-hints.rs:13:8

tests/ui/simd/monomorphize-heterogeneous.rs

@@ -9,5 +9,6 @@ struct I64x4F64x0([i64; 4], [f64; 0]);
 //~^ ERROR SIMD vector cannot have multiple fields
 
 static X: I64F64 = I64F64(1, 2.0);
+//~^ ERROR could not evaluate static initializer
 
 fn main() {}

tests/ui/simd/monomorphize-heterogeneous.stderr

@@ -10,7 +10,13 @@ error[E0075]: SIMD vector cannot have multiple fields
 LL | struct I64x4F64x0([i64; 4], [f64; 0]);
    | ^^^^^^^^^^^^^^^^^           -------- excess field
 
-error: aborting due to 2 previous errors
+error[E0080]: could not evaluate static initializer
+  --> $DIR/monomorphize-heterogeneous.rs:11:1
+   |
+LL | static X: I64F64 = I64F64(1, 2.0);
+   | ^^^^^^^^^^^^^^^^ the type `I64F64` has an unknown layout
+
+error: aborting due to 3 previous errors
 
-Some errors have detailed explanations: E0075, E0076.
+Some errors have detailed explanations: E0075, E0076, E0080.
 For more information about an error, try `rustc --explain E0075`.

tests/ui/structs/ice-struct-tail-normalization-113272.rs

@@ -13,5 +13,6 @@ struct Other {
 fn main() {
     unsafe {
         std::mem::transmute::<Option<()>, Option<&Other>>(None);
+        //~^ ERROR cannot transmute between types of different sizes, or dependently-sized types
     }
 }

tests/ui/structs/ice-struct-tail-normalization-113272.stderr

@@ -13,7 +13,16 @@ LL |     type RefTarget;
 LL | impl Trait for () where Missing: Trait {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `RefTarget` in implementation
 
-error: aborting due to 2 previous errors
+error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
+  --> $DIR/ice-struct-tail-normalization-113272.rs:15:9
+   |
+LL |         std::mem::transmute::<Option<()>, Option<&Other>>(None);
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: source type: `Option<()>` (8 bits)
+   = note: target type: `Option<&Other>` (size can vary because of <Other as Pointee>::Metadata)
+
+error: aborting due to 3 previous errors
 
-Some errors have detailed explanations: E0046, E0412.
+Some errors have detailed explanations: E0046, E0412, E0512.
 For more information about an error, try `rustc --explain E0046`.