Skip to content

Commit

Permalink
normalize out pref_align (copied from another test)
Browse files Browse the repository at this point in the history
  • Loading branch information
@erikdesjardins
erikdesjardins committed Apr 22, 2022
1 parent 1bbae50 commit 4dcc1aa
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 56 deletions.
1 change: 1 addition & 0 deletions src/test/ui/layout/issue-96158-scalarpair-payload-might-be-uninit.rs
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// normalize-stderr-test "pref: Align \{\n *pow2: [1-3],\n *\}" -> "pref: $$PREF_ALIGN"
#![crate_type = "lib"]
#![feature(rustc_attrs)]

Expand Down
78 changes: 22 additions & 56 deletions src/test/ui/layout/issue-96158-scalarpair-payload-might-be-uninit.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,7 @@ error: layout_of(MissingPayloadField) = Layout {
abi: Align {
pow2: 0,
},
pref: Align {
pow2: 3,
},
pref: $PREF_ALIGN,
},
size: Size {
raw: 2,
Expand All @@ -66,9 +64,7 @@ error: layout_of(MissingPayloadField) = Layout {
abi: Align {
pow2: 0,
},
pref: Align {
pow2: 3,
},
pref: $PREF_ALIGN,
},
size: Size {
raw: 1,
Expand Down Expand Up @@ -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),
Expand Down Expand Up @@ -167,9 +161,7 @@ error: layout_of(CommonPayloadField) = Layout {
abi: Align {
pow2: 0,
},
pref: Align {
pow2: 3,
},
pref: $PREF_ALIGN,
},
size: Size {
raw: 2,
Expand Down Expand Up @@ -197,9 +189,7 @@ error: layout_of(CommonPayloadField) = Layout {
abi: Align {
pow2: 0,
},
pref: Align {
pow2: 3,
},
pref: $PREF_ALIGN,
},
size: Size {
raw: 2,
Expand Down Expand Up @@ -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),
Expand Down Expand Up @@ -299,9 +287,7 @@ error: layout_of(CommonPayloadFieldIsMaybeUninit) = Layout {
abi: Align {
pow2: 0,
},
pref: Align {
pow2: 3,
},
pref: $PREF_ALIGN,
},
size: Size {
raw: 2,
Expand Down Expand Up @@ -329,9 +315,7 @@ error: layout_of(CommonPayloadFieldIsMaybeUninit) = Layout {
abi: Align {
pow2: 0,
},
pref: Align {
pow2: 3,
},
pref: $PREF_ALIGN,
},
size: Size {
raw: 2,
Expand Down Expand Up @@ -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),
Expand Down Expand Up @@ -462,9 +444,7 @@ error: layout_of(NicheFirst) = Layout {
abi: Align {
pow2: 0,
},
pref: Align {
pow2: 3,
},
pref: $PREF_ALIGN,
},
size: Size {
raw: 2,
Expand All @@ -486,9 +466,7 @@ error: layout_of(NicheFirst) = Layout {
abi: Align {
pow2: 0,
},
pref: Align {
pow2: 3,
},
pref: $PREF_ALIGN,
},
size: Size {
raw: 0,
Expand All @@ -510,9 +488,7 @@ error: layout_of(NicheFirst) = Layout {
abi: Align {
pow2: 0,
},
pref: Align {
pow2: 3,
},
pref: $PREF_ALIGN,
},
size: Size {
raw: 0,
Expand Down Expand Up @@ -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),
Expand Down Expand Up @@ -644,9 +618,7 @@ error: layout_of(NicheSecond) = Layout {
abi: Align {
pow2: 0,
},
pref: Align {
pow2: 3,
},
pref: $PREF_ALIGN,
},
size: Size {
raw: 2,
Expand All @@ -668,9 +640,7 @@ error: layout_of(NicheSecond) = Layout {
abi: Align {
pow2: 0,
},
pref: Align {
pow2: 3,
},
pref: $PREF_ALIGN,
},
size: Size {
raw: 0,
Expand All @@ -692,9 +662,7 @@ error: layout_of(NicheSecond) = Layout {
abi: Align {
pow2: 0,
},
pref: Align {
pow2: 3,
},
pref: $PREF_ALIGN,
},
size: Size {
raw: 0,
Expand Down Expand Up @@ -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),
Expand Down

0 comments on commit 4dcc1aa

Please sign in to comment.