diff options
| author | Erik Desjardins <erikdesjardins@users.noreply.github.com> | 2022-04-22 01:46:24 -0400 |
|---|---|---|
| committer | Erik Desjardins <erikdesjardins@users.noreply.github.com> | 2022-04-22 01:46:24 -0400 |
| commit | 4dcc1aae0a9d2b9eeee3f6404b8b7873a80aa6de (patch) | |
| tree | ed894d8de267aa996598fe330bb8e45d5d20205b | |
| parent | 1bbae507d4aeb4e1733aaf875246b95e8b08f8a8 (diff) | |
| download | rust-4dcc1aae0a9d2b9eeee3f6404b8b7873a80aa6de.tar.gz rust-4dcc1aae0a9d2b9eeee3f6404b8b7873a80aa6de.zip | |
normalize out pref_align (copied from another test)
| -rw-r--r-- | src/test/ui/layout/issue-96158-scalarpair-payload-might-be-uninit.rs | 1 | ||||
| -rw-r--r-- | src/test/ui/layout/issue-96158-scalarpair-payload-might-be-uninit.stderr | 78 |
2 files changed, 23 insertions, 56 deletions
diff --git a/src/test/ui/layout/issue-96158-scalarpair-payload-might-be-uninit.rs b/src/test/ui/layout/issue-96158-scalarpair-payload-might-be-uninit.rs index bc3667c5f80..89387e01ba5 100644 --- a/src/test/ui/layout/issue-96158-scalarpair-payload-might-be-uninit.rs +++ b/src/test/ui/layout/issue-96158-scalarpair-payload-might-be-uninit.rs @@ -1,3 +1,4 @@ +// normalize-stderr-test "pref: Align \{\n *pow2: [1-3],\n *\}" -> "pref: $$PREF_ALIGN" #![crate_type = "lib"] #![feature(rustc_attrs)] diff --git a/src/test/ui/layout/issue-96158-scalarpair-payload-might-be-uninit.stderr b/src/test/ui/layout/issue-96158-scalarpair-payload-might-be-uninit.stderr index af51f813076..46187aae304 100644 --- a/src/test/ui/layout/issue-96158-scalarpair-payload-might-be-uninit.stderr +++ b/src/test/ui/layout/issue-96158-scalarpair-payload-might-be-uninit.stderr @@ -42,9 +42,7 @@ error: layout_of(MissingPayloadField) = Layout { abi: Align { pow2: 0, }, - pref: Align { - pow2: 3, - }, + pref: $PREF_ALIGN, }, size: Size { raw: 2, @@ -66,9 +64,7 @@ error: layout_of(MissingPayloadField) = Layout { abi: Align { pow2: 0, }, - pref: Align { - pow2: 3, - }, + pref: $PREF_ALIGN, }, size: Size { raw: 1, @@ -107,15 +103,13 @@ error: layout_of(MissingPayloadField) = Layout { abi: Align { pow2: 0, }, - pref: Align { - pow2: 3, - }, + pref: $PREF_ALIGN, }, size: Size { raw: 2, }, } - --> $DIR/issue-96158-scalarpair-payload-might-be-uninit.rs:15:1 + --> $DIR/issue-96158-scalarpair-payload-might-be-uninit.rs:16:1 | LL | / pub enum MissingPayloadField { LL | | Some(u8), @@ -167,9 +161,7 @@ error: layout_of(CommonPayloadField) = Layout { abi: Align { pow2: 0, }, - pref: Align { - pow2: 3, - }, + pref: $PREF_ALIGN, }, size: Size { raw: 2, @@ -197,9 +189,7 @@ error: layout_of(CommonPayloadField) = Layout { abi: Align { pow2: 0, }, - pref: Align { - pow2: 3, - }, + pref: $PREF_ALIGN, }, size: Size { raw: 2, @@ -239,15 +229,13 @@ error: layout_of(CommonPayloadField) = Layout { abi: Align { pow2: 0, }, - pref: Align { - pow2: 3, - }, + pref: $PREF_ALIGN, }, size: Size { raw: 2, }, } - --> $DIR/issue-96158-scalarpair-payload-might-be-uninit.rs:24:1 + --> $DIR/issue-96158-scalarpair-payload-might-be-uninit.rs:25:1 | LL | / pub enum CommonPayloadField { LL | | A(u8), @@ -299,9 +287,7 @@ error: layout_of(CommonPayloadFieldIsMaybeUninit) = Layout { abi: Align { pow2: 0, }, - pref: Align { - pow2: 3, - }, + pref: $PREF_ALIGN, }, size: Size { raw: 2, @@ -329,9 +315,7 @@ error: layout_of(CommonPayloadFieldIsMaybeUninit) = Layout { abi: Align { pow2: 0, }, - pref: Align { - pow2: 3, - }, + pref: $PREF_ALIGN, }, size: Size { raw: 2, @@ -370,15 +354,13 @@ error: layout_of(CommonPayloadFieldIsMaybeUninit) = Layout { abi: Align { pow2: 0, }, - pref: Align { - pow2: 3, - }, + pref: $PREF_ALIGN, }, size: Size { raw: 2, }, } - --> $DIR/issue-96158-scalarpair-payload-might-be-uninit.rs:32:1 + --> $DIR/issue-96158-scalarpair-payload-might-be-uninit.rs:33:1 | LL | / pub enum CommonPayloadFieldIsMaybeUninit { LL | | A(u8), @@ -462,9 +444,7 @@ error: layout_of(NicheFirst) = Layout { abi: Align { pow2: 0, }, - pref: Align { - pow2: 3, - }, + pref: $PREF_ALIGN, }, size: Size { raw: 2, @@ -486,9 +466,7 @@ error: layout_of(NicheFirst) = Layout { abi: Align { pow2: 0, }, - pref: Align { - pow2: 3, - }, + pref: $PREF_ALIGN, }, size: Size { raw: 0, @@ -510,9 +488,7 @@ error: layout_of(NicheFirst) = Layout { abi: Align { pow2: 0, }, - pref: Align { - pow2: 3, - }, + pref: $PREF_ALIGN, }, size: Size { raw: 0, @@ -551,15 +527,13 @@ error: layout_of(NicheFirst) = Layout { abi: Align { pow2: 0, }, - pref: Align { - pow2: 3, - }, + pref: $PREF_ALIGN, }, size: Size { raw: 2, }, } - --> $DIR/issue-96158-scalarpair-payload-might-be-uninit.rs:40:1 + --> $DIR/issue-96158-scalarpair-payload-might-be-uninit.rs:41:1 | LL | / pub enum NicheFirst { LL | | A(HasNiche, u8), @@ -644,9 +618,7 @@ error: layout_of(NicheSecond) = Layout { abi: Align { pow2: 0, }, - pref: Align { - pow2: 3, - }, + pref: $PREF_ALIGN, }, size: Size { raw: 2, @@ -668,9 +640,7 @@ error: layout_of(NicheSecond) = Layout { abi: Align { pow2: 0, }, - pref: Align { - pow2: 3, - }, + pref: $PREF_ALIGN, }, size: Size { raw: 0, @@ -692,9 +662,7 @@ error: layout_of(NicheSecond) = Layout { abi: Align { pow2: 0, }, - pref: Align { - pow2: 3, - }, + pref: $PREF_ALIGN, }, size: Size { raw: 0, @@ -733,15 +701,13 @@ error: layout_of(NicheSecond) = Layout { abi: Align { pow2: 0, }, - pref: Align { - pow2: 3, - }, + pref: $PREF_ALIGN, }, size: Size { raw: 2, }, } - --> $DIR/issue-96158-scalarpair-payload-might-be-uninit.rs:49:1 + --> $DIR/issue-96158-scalarpair-payload-might-be-uninit.rs:50:1 | LL | / pub enum NicheSecond { LL | | A(u8, HasNiche), |