Normalize tests for i686 Windows.

Author: davidtwco

src/test/ui/issues/issue-23595-1.rs renamed to src/test/compile-fail/issue-23595-1.rs

@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // error-pattern: Option
+// normalize-stderr-test "<\[u32; \d+\]>" -> "<[u32; N]>"
 
 // FIXME: work properly with higher limits
 

src/test/ui/issues/issue-43733-2.rs renamed to src/test/compile-fail/issue-43733-2.rs

@@ -1,4 +1,4 @@
-error: the type `std::option::Option<[u32; 35184372088831]>` is too big for the current architecture
+error: the type `std::option::Option<[u32; N]>` is too big for the current architecture
 
 error: aborting due to previous error
 

src/test/ui/huge-enum.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// normalize-stderr-test "S32" -> "SXX"
+// normalize-stderr-test "S1M" -> "SXX"
 // error-pattern: too big for the current
 
 struct S32<T> {

src/test/ui/huge-enum.stderr

@@ -1,4 +1,4 @@
-error: the type `S32<S1M<S1M<u32>>>` is too big for the current architecture
+error: the type `SXX<SXX<SXX<u32>>>` is too big for the current architecture
 
 error: aborting due to previous error
 

src/test/ui/huge-struct.rs

@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // error-pattern: too big for the current architecture
+// normalize-stderr-test "\[usize; \d+\]" -> "[usize; N]"
 
 #[cfg(target_pointer_width = "32")]
 fn main() {

src/test/ui/huge-struct.stderr

@@ -1,4 +1,4 @@
-error: the type `[usize; 18446744073709551615]` is too big for the current architecture
+error: the type `[usize; N]` is too big for the current architecture
 
 error: aborting due to previous error
 

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

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
+// normalize-stderr-test "\[&usize; \d+\]" -> "[&usize; N]"
 // error-pattern: too big for the current architecture
 
 #![feature(box_syntax)]

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

@@ -1,4 +1,4 @@
-error: the type `[&usize; 17293822569102704640]` is too big for the current architecture
+error: the type `[&usize; N]` is too big for the current architecture
 
 error: aborting due to previous error
 

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

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// normalize-stderr-test "\d+ bits" -> "N bits"
+
 trait Bar {
     type Bar;
 }

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

@@ -1,11 +1,11 @@
 error[E0512]: transmute called with types of different sizes
-  --> $DIR/issue-28625.rs:20:14
+  --> $DIR/issue-28625.rs:22:14
    |
 LL |     unsafe { std::mem::transmute(a) } //~ ERROR transmute called with types of different sizes
    |              ^^^^^^^^^^^^^^^^^^^
    |
-   = note: source type: &ArrayPeano<T> (64 bits)
-   = note: target type: &[T] (128 bits)
+   = note: source type: &ArrayPeano<T> (N bits)
+   = note: target type: &[T] (N bits)
 
 error: aborting due to previous error
 

src/test/ui/issues/issue-23595-1.stderr

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// normalize-stderr-test "\d+ bits" -> "N bits"
+
 use std::mem;
 use std::marker::PhantomData;
 

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

@@ -1,11 +1,11 @@
 error[E0512]: transmute called with types of different sizes
-  --> $DIR/issue-32377.rs:23:14
+  --> $DIR/issue-32377.rs:25:14
    |
 LL |     unsafe { mem::transmute(x) }
    |              ^^^^^^^^^^^^^^
    |
-   = note: source type: [usize; 2] (128 bits)
-   = note: target type: Bar<U> (0 bits)
+   = note: source type: [usize; 2] (N bits)
+   = note: target type: Bar<U> (N bits)
 
 error: aborting due to previous error
 

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

@@ -13,6 +13,7 @@
 // the error points to the start of the file, not the line with the
 // transmute
 
+// normalize-stderr-test "\d+ bits" -> "N bits"
 // error-pattern: transmute called with types of different sizes
 
 use std::mem;

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

@@ -1,11 +1,11 @@
 error[E0512]: transmute called with types of different sizes
-  --> $DIR/packed-struct-transmute.rs:35:24
+  --> $DIR/packed-struct-transmute.rs:36:24
    |
 LL |         let oof: Oof = mem::transmute(foo);
    |                        ^^^^^^^^^^^^^^
    |
-   = note: source type: Foo (72 bits)
-   = note: target type: Oof (128 bits)
+   = note: source type: Foo (N bits)
+   = note: target type: Oof (N bits)
 
 error: aborting due to previous error
 

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

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// normalize-stderr-test "\d+ bits" -> "N bits"
+
 // Tests that `transmute` cannot be called on types of different size.
 
 #![allow(warnings)]

src/test/ui/issues/issue-43733-2.stderr

@@ -1,28 +1,28 @@
 error[E0512]: transmute called with types of different sizes
-  --> $DIR/transmute-different-sizes.rs:19:17
+  --> $DIR/transmute-different-sizes.rs:21:17
    |
 LL |     let _: i8 = transmute(16i16);
    |                 ^^^^^^^^^
    |
-   = note: source type: i16 (16 bits)
-   = note: target type: i8 (8 bits)
+   = note: source type: i16 (N bits)
+   = note: target type: i8 (N bits)
 
 error[E0512]: transmute called with types of different sizes
-  --> $DIR/transmute-different-sizes.rs:24:17
+  --> $DIR/transmute-different-sizes.rs:26:17
    |
 LL |     let _: i8 = transmute(x);
    |                 ^^^^^^^^^
    |
-   = note: source type: &T (64 bits)
-   = note: target type: i8 (8 bits)
+   = note: source type: &T (N bits)
+   = note: target type: i8 (N bits)
 
 error[E0512]: transmute called with types of different sizes
-  --> $DIR/transmute-different-sizes.rs:35:5
+  --> $DIR/transmute-different-sizes.rs:37:5
    |
 LL |     transmute(x)
    |     ^^^^^^^^^
    |
-   = note: source type: u16 (16 bits)
+   = note: source type: u16 (N bits)
    = note: target type: <T as Specializable>::Output (this type's size can vary)
 
 error: aborting due to 3 previous errors

src/test/ui/packed-struct/packed-struct-transmute.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// normalize-stderr-test "\d+ bits" -> "N bits"
+
 // Tests that are conservative around thin/fat pointer mismatches.
 
 #![allow(dead_code)]

src/test/ui/packed-struct/packed-struct-transmute.stderr

@@ -1,14 +1,14 @@
 error[E0512]: transmute called with types of different sizes
-  --> $DIR/transmute-fat-pointers.rs:18:14
+  --> $DIR/transmute-fat-pointers.rs:20:14
    |
 LL |     unsafe { transmute(x) } //~ ERROR transmute called with types of different sizes
    |              ^^^^^^^^^
    |
-   = note: source type: &[T] (128 bits)
+   = note: source type: &[T] (N bits)
    = note: target type: &U (pointer to U)
 
 error[E0512]: transmute called with types of different sizes
-  --> $DIR/transmute-fat-pointers.rs:22:14
+  --> $DIR/transmute-fat-pointers.rs:24:14
    |
 LL |     unsafe { transmute(x) } //~ ERROR transmute called with types of different sizes
    |              ^^^^^^^^^
@@ -17,21 +17,21 @@ LL |     unsafe { transmute(x) } //~ ERROR transmute called with types of differ
    = note: target type: &U (pointer to U)
 
 error[E0512]: transmute called with types of different sizes
-  --> $DIR/transmute-fat-pointers.rs:34:14
+  --> $DIR/transmute-fat-pointers.rs:36:14
    |
 LL |     unsafe { transmute(x) } //~ ERROR transmute called with types of different sizes
    |              ^^^^^^^^^
    |
    = note: source type: &T (pointer to T)
-   = note: target type: &U (64 bits)
+   = note: target type: &U (N bits)
 
 error[E0512]: transmute called with types of different sizes
-  --> $DIR/transmute-fat-pointers.rs:38:14
+  --> $DIR/transmute-fat-pointers.rs:40:14
    |
 LL |     unsafe { transmute(x) } //~ ERROR transmute called with types of different sizes
    |              ^^^^^^^^^
    |
-   = note: source type: &T (64 bits)
+   = note: source type: &T (N bits)
    = note: target type: &U (pointer to U)
 
 error: aborting due to 4 previous errors

src/test/ui/transmute/transmute-different-sizes.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// normalize-stderr-test "\d+ bits" -> "N bits"
+
 // Tests that are conservative around thin/fat pointer mismatches.
 
 #![allow(dead_code)]

src/test/ui/transmute/transmute-different-sizes.stderr

@@ -1,11 +1,11 @@
 error[E0512]: transmute called with types of different sizes
-  --> $DIR/transmute-impl.rs:29:18
+  --> $DIR/transmute-impl.rs:31:18
    |
 LL |         unsafe { transmute(x) } //~ ERROR transmute called with types of different sizes
    |                  ^^^^^^^^^
    |
    = note: source type: &T (pointer to T)
-   = note: target type: &isize (64 bits)
+   = note: target type: &isize (N bits)
 
 error: aborting due to previous error
 

src/test/ui/transmute/transmute-fat-pointers.rs

@@ -8,6 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// normalize-stderr-test "alignment \d+" -> "alignment N"
+// normalize-stderr-test "offset \d+" -> "offset N"
+// normalize-stderr-test "allocation \d+" -> "allocation N"
+// normalize-stderr-test "size \d+" -> "size N"
+
 #[repr(C)]
 #[derive(Copy, Clone)]
 struct SliceRepr {

src/test/ui/transmute/transmute-fat-pointers.stderr

@@ -1,37 +1,37 @@
 error[E0080]: this constant likely exhibits undefined behavior
-  --> $DIR/union-ub-fat-ptr.rs:67:1
+  --> $DIR/union-ub-fat-ptr.rs:72:1
    |
 LL | const C: &str = unsafe { SliceTransmute { bad: BadSliceRepr { ptr: &42, len: &3 } }.str};
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered length is not a valid integer
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rust compiler repository if you believe it should not be considered undefined behavior
 
 error[E0080]: this constant likely exhibits undefined behavior
-  --> $DIR/union-ub-fat-ptr.rs:75:1
+  --> $DIR/union-ub-fat-ptr.rs:80:1
    |
 LL | const C2: &[u8] = unsafe { SliceTransmute { bad: BadSliceRepr { ptr: &42, len: &3 } }.slice};
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered length is not a valid integer
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rust compiler repository if you believe it should not be considered undefined behavior
 
 error[E0080]: this constant likely exhibits undefined behavior
-  --> $DIR/union-ub-fat-ptr.rs:79:1
+  --> $DIR/union-ub-fat-ptr.rs:84:1
    |
 LL | const D: &Trait = unsafe { DynTransmute { repr: DynRepr { ptr: &92, vtable: &3 } }.rust};
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ tried to access memory with alignment 1, but alignment 8 is required
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ tried to access memory with alignment N, but alignment N is required
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rust compiler repository if you believe it should not be considered undefined behavior
 
 error[E0080]: this constant likely exhibits undefined behavior
-  --> $DIR/union-ub-fat-ptr.rs:82:1
+  --> $DIR/union-ub-fat-ptr.rs:87:1
    |
 LL | const E: &Trait = unsafe { DynTransmute { repr2: DynRepr2 { ptr: &92, vtable: &3 } }.rust};
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ memory access at offset 16, outside bounds of allocation 56 which has size 8
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ memory access at offset N, outside bounds of allocation N which has size N
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rust compiler repository if you believe it should not be considered undefined behavior
 
 error[E0080]: this constant likely exhibits undefined behavior
-  --> $DIR/union-ub-fat-ptr.rs:85:1
+  --> $DIR/union-ub-fat-ptr.rs:90:1
    |
 LL | const F: &Trait = unsafe { DynTransmute { bad: BadDynRepr { ptr: &92, vtable: 3 } }.rust};
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered vtable address is not a pointer