fix test failure due to differing u64 alignment on different targets

erikdesjardins · erikdesjardins · commit 8e40b17b6bc5 · 2024-02-28T18:48:14.000-05:00
diff --git a/tests/ui/layout/enum.rs b/tests/ui/layout/enum.rs
@@ -19,6 +19,6 @@ enum UninhabitedVariantSpace { //~ERROR: size: Size(16 bytes)
 
 #[rustc_layout(abi)]
 enum ScalarPairDifferingSign { //~ERROR: abi: ScalarPair
-    A(u64),
-    B(i64),
+    A(u8),
+    B(i8),
 }
diff --git a/tests/ui/layout/enum.stderr b/tests/ui/layout/enum.stderr
@@ -10,7 +10,7 @@ error: size: Size(16 bytes)
 LL | enum UninhabitedVariantSpace {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: abi: ScalarPair(Initialized { value: Int(I64, false), valid_range: 0..=1 }, Initialized { value: Int(I64, false), valid_range: 0..=18446744073709551615 })
+error: abi: ScalarPair(Initialized { value: Int(I8, false), valid_range: 0..=1 }, Initialized { value: Int(I8, false), valid_range: 0..=255 })
   --> $DIR/enum.rs:21:1
    |
 LL | enum ScalarPairDifferingSign {

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,6 @@ enum UninhabitedVariantSpace { //~ERROR: size: Size(16 bytes)`
`19`	`19`
`20`	`20`	`#[rustc_layout(abi)]`
`21`	`21`	`enum ScalarPairDifferingSign { //~ERROR: abi: ScalarPair`
`22`		`- A(u64),`
`23`		`- B(i64),`
	`22`	`+ A(u8),`
	`23`	`+ B(i8),`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ error: size: Size(16 bytes)`
`10`	`10`	`LL \| enum UninhabitedVariantSpace {`
`11`	`11`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`12`	`12`
`13`		`-error: abi: ScalarPair(Initialized { value: Int(I64, false), valid_range: 0..=1 }, Initialized { value: Int(I64, false), valid_range: 0..=18446744073709551615 })`
	`13`	`+error: abi: ScalarPair(Initialized { value: Int(I8, false), valid_range: 0..=1 }, Initialized { value: Int(I8, false), valid_range: 0..=255 })`
`14`	`14`	`--> $DIR/enum.rs:21:1`
`15`	`15`	`\|`
`16`	`16`	`LL \| enum ScalarPairDifferingSign {`