Fix tests in tests/ui/transmute

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

Author: FedericoBruzzone

compiler/rustc_hir_typeck/src/intrinsicck.rs

@@ -144,7 +144,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
             err.emit();
         } else {
             err.note(format!("source type: `{}` ({})", from, skeleton_string(from, sk_from)))
-                .note(format!("target type: `{}` ({})", to, skeleton_string(to, sk_to)));
+               .note(format!("target type: `{}` ({})", to, skeleton_string(to, sk_to)));
             if let Err(LayoutError::ReferencesError(_)) = sk_from {
                 err.delay_as_bug();
             } else if let Err(LayoutError::ReferencesError(_)) = sk_to {

compiler/rustc_middle/messages.ftl

@@ -101,7 +101,7 @@ middle_strict_coherence_needs_negative_coherence =
     .label = due to this attribute
 
 middle_too_generic =
-    cannot determine the layout of the type `{$ty}`; too generic
+    `{$ty}` is too generic to determine the layout 
 
 middle_type_length_limit = reached the type-length limit while instantiating `{$shrunk}`
 

compiler/rustc_middle/src/ty/layout.rs

@@ -276,7 +276,7 @@ impl<'tcx> fmt::Display for LayoutError<'tcx> {
         match *self {
             LayoutError::Unknown(ty) => write!(f, "the type `{ty}` has an unknown layout"),
             LayoutError::TooGeneric(ty) => {
-                write!(f, "cannot determine the layout for the type `{ty}`; too generic")
+                write!(f, "`{ty}` is too generic to determine the layout")
             }
             LayoutError::SizeOverflow(ty) => {
                 write!(f, "values of the type `{ty}` are too big for the target architecture")

tests/ui/transmute/transmute-different-sizes.stderr

@@ -23,7 +23,7 @@ LL |     transmute(x)
    |     ^^^^^^^^^
    |
    = note: source type: `u16` (N bits)
-   = note: target type: `<T as Specializable>::Output` (this type does not have a fixed size)
+   = note: target type: `<T as Specializable>::Output` (`<T as Specializable>::Output` is too generic to determine the layout)
 
 error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
   --> $DIR/transmute-different-sizes.rs:38:5
@@ -32,7 +32,7 @@ LL |     transmute(from)
    |     ^^^^^^^^^
    |
    = note: source type: `*mut T` (pointer to `T`)
-   = note: target type: `PtrAndOverAlignZST<T>` (size can vary because of <T as Pointee>::Metadata)
+   = note: target type: `PtrAndOverAlignZST<T>` (`<T as Pointee>::Metadata` is too generic to determine the layout)
 
 error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
   --> $DIR/transmute-different-sizes.rs:47:5
@@ -41,7 +41,7 @@ LL |     std::mem::transmute(from)
    |     ^^^^^^^^^^^^^^^^^^^
    |
    = note: source type: `*mut T` (pointer to `T`)
-   = note: target type: `PtrAndEmptyArray<T>` (size can vary because of <T as Pointee>::Metadata)
+   = note: target type: `PtrAndEmptyArray<T>` (`<T as Pointee>::Metadata` is too generic to determine the layout)
 
 error: aborting due to 5 previous errors
 

tests/ui/transmute/transmute-type-parameters.stderr

@@ -4,7 +4,7 @@ error[E0512]: cannot transmute between types of different sizes, or dependently-
 LL |     let _: i32 = transmute(x);
    |                  ^^^^^^^^^
    |
-   = note: source type: `T` (this type does not have a fixed size)
+   = note: source type: `T` (`T` is too generic to determine the layout)
    = note: target type: `i32` (32 bits)
 
 error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
@@ -13,7 +13,7 @@ error[E0512]: cannot transmute between types of different sizes, or dependently-
 LL |     let _: i32 = transmute(x);
    |                  ^^^^^^^^^
    |
-   = note: source type: `(T, i32)` (size can vary because of T)
+   = note: source type: `(T, i32)` (`T` is too generic to determine the layout)
    = note: target type: `i32` (32 bits)
 
 error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
@@ -22,7 +22,7 @@ error[E0512]: cannot transmute between types of different sizes, or dependently-
 LL |     let _: i32 = transmute(x);
    |                  ^^^^^^^^^
    |
-   = note: source type: `[T; 10]` (size can vary because of T)
+   = note: source type: `[T; 10]` (`T` is too generic to determine the layout)
    = note: target type: `i32` (32 bits)
 
 error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
@@ -31,7 +31,7 @@ error[E0512]: cannot transmute between types of different sizes, or dependently-
 LL |     let _: i32 = transmute(x);
    |                  ^^^^^^^^^
    |
-   = note: source type: `Bad<T>` (size can vary because of T)
+   = note: source type: `Bad<T>` (`T` is too generic to determine the layout)
    = note: target type: `i32` (32 bits)
 
 error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
@@ -40,7 +40,7 @@ error[E0512]: cannot transmute between types of different sizes, or dependently-
 LL |     let _: i32 = transmute(x);
    |                  ^^^^^^^^^
    |
-   = note: source type: `Worse<T>` (size can vary because of T)
+   = note: source type: `Worse<T>` (`T` is too generic to determine the layout)
    = note: target type: `i32` (32 bits)
 
 error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
@@ -49,7 +49,7 @@ error[E0512]: cannot transmute between types of different sizes, or dependently-
 LL |     let _: i32 = transmute(x);
    |                  ^^^^^^^^^
    |
-   = note: source type: `Option<T>` (size can vary because of T)
+   = note: source type: `Option<T>` (`T` is too generic to determine the layout)
    = note: target type: `i32` (32 bits)
 
 error: aborting due to 6 previous errors