Skip to content

Commit

Permalink
tests: Bless rustc_abi::Abi::Aggregate => ::Memory
Browse files Browse the repository at this point in the history
  • Loading branch information
@workingjubilee
workingjubilee committed Oct 29, 2024
1 parent d072af0 commit e9be3c1
Show file tree
Hide file tree
Showing 20 changed files with 77 additions and 77 deletions.
4 changes: 2 additions & 2 deletions tests/ui/abi/c-zst.other-linux.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Aggregate {
abi: Memory {
sized: true,
},
fields: Arbitrary {
Expand All @@ -36,7 +36,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Aggregate {
abi: Memory {
sized: true,
},
fields: Arbitrary {
Expand Down
24 changes: 12 additions & 12 deletions tests/ui/abi/debug.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ error: fn_abi_of(test_generic) = FnAbi {
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Aggregate {
abi: Memory {
sized: true,
},
fields: Arbitrary {
Expand Down Expand Up @@ -317,7 +317,7 @@ error: ABIs are not compatible
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Aggregate {
abi: Memory {
sized: true,
},
fields: Arbitrary {
Expand Down Expand Up @@ -387,7 +387,7 @@ error: ABIs are not compatible
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Aggregate {
abi: Memory {
sized: true,
},
fields: Arbitrary {
Expand Down Expand Up @@ -426,7 +426,7 @@ error: ABIs are not compatible
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Aggregate {
abi: Memory {
sized: true,
},
fields: Array {
Expand Down Expand Up @@ -464,7 +464,7 @@ error: ABIs are not compatible
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Aggregate {
abi: Memory {
sized: true,
},
fields: Arbitrary {
Expand Down Expand Up @@ -497,7 +497,7 @@ error: ABIs are not compatible
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Aggregate {
abi: Memory {
sized: true,
},
fields: Array {
Expand Down Expand Up @@ -535,7 +535,7 @@ error: ABIs are not compatible
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Aggregate {
abi: Memory {
sized: true,
},
fields: Arbitrary {
Expand Down Expand Up @@ -610,7 +610,7 @@ error: ABIs are not compatible
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Aggregate {
abi: Memory {
sized: true,
},
fields: Arbitrary {
Expand Down Expand Up @@ -680,7 +680,7 @@ error: ABIs are not compatible
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Aggregate {
abi: Memory {
sized: true,
},
fields: Arbitrary {
Expand Down Expand Up @@ -756,7 +756,7 @@ error: ABIs are not compatible
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Aggregate {
abi: Memory {
sized: true,
},
fields: Arbitrary {
Expand Down Expand Up @@ -826,7 +826,7 @@ error: ABIs are not compatible
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Aggregate {
abi: Memory {
sized: true,
},
fields: Arbitrary {
Expand Down Expand Up @@ -929,7 +929,7 @@ error: fn_abi_of(assoc_test) = FnAbi {
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Aggregate {
abi: Memory {
sized: true,
},
fields: Arbitrary {
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/abi/sysv64-zst.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Aggregate {
abi: Memory {
sized: true,
},
fields: Arbitrary {
Expand All @@ -36,7 +36,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Aggregate {
abi: Memory {
sized: true,
},
fields: Arbitrary {
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/abi/win64-zst.other.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Aggregate {
abi: Memory {
sized: true,
},
fields: Arbitrary {
Expand All @@ -36,7 +36,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Aggregate {
abi: Memory {
sized: true,
},
fields: Arbitrary {
Expand Down
20 changes: 10 additions & 10 deletions tests/ui/layout/debug.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ error: layout_of(E) = Layout {
abi: Align(4 bytes),
pref: $SOME_ALIGN,
},
abi: Aggregate {
abi: Memory {
sized: true,
},
fields: Arbitrary {
Expand Down Expand Up @@ -48,7 +48,7 @@ error: layout_of(E) = Layout {
abi: Align(1 bytes),
pref: $SOME_ALIGN,
},
abi: Aggregate {
abi: Memory {
sized: true,
},
fields: Arbitrary {
Expand Down Expand Up @@ -150,7 +150,7 @@ error: layout_of(U) = Layout {
abi: Align(4 bytes),
pref: $SOME_ALIGN,
},
abi: Aggregate {
abi: Memory {
sized: true,
},
fields: Union(
Expand Down Expand Up @@ -337,7 +337,7 @@ error: layout_of(V) = Layout {
abi: Align(2 bytes),
pref: $SOME_ALIGN,
},
abi: Aggregate {
abi: Memory {
sized: true,
},
fields: Union(
Expand All @@ -361,7 +361,7 @@ error: layout_of(W) = Layout {
abi: Align(2 bytes),
pref: $SOME_ALIGN,
},
abi: Aggregate {
abi: Memory {
sized: true,
},
fields: Union(
Expand All @@ -385,7 +385,7 @@ error: layout_of(Y) = Layout {
abi: Align(2 bytes),
pref: $SOME_ALIGN,
},
abi: Aggregate {
abi: Memory {
sized: true,
},
fields: Union(
Expand All @@ -409,7 +409,7 @@ error: layout_of(P1) = Layout {
abi: Align(1 bytes),
pref: $SOME_ALIGN,
},
abi: Aggregate {
abi: Memory {
sized: true,
},
fields: Union(
Expand All @@ -433,7 +433,7 @@ error: layout_of(P2) = Layout {
abi: Align(1 bytes),
pref: $SOME_ALIGN,
},
abi: Aggregate {
abi: Memory {
sized: true,
},
fields: Union(
Expand All @@ -457,7 +457,7 @@ error: layout_of(P3) = Layout {
abi: Align(1 bytes),
pref: $SOME_ALIGN,
},
abi: Aggregate {
abi: Memory {
sized: true,
},
fields: Union(
Expand All @@ -481,7 +481,7 @@ error: layout_of(P4) = Layout {
abi: Align(1 bytes),
pref: $SOME_ALIGN,
},
abi: Aggregate {
abi: Memory {
sized: true,
},
fields: Union(
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/layout/enum-scalar-pair-int-ptr.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ enum ScalarPairPointerWithInt { //~ERROR: abi: ScalarPair
// of a different size. (Assumes that no target has 8 bit pointers, which
// feels pretty safe.)
#[rustc_layout(abi)]
enum NotScalarPairPointerWithSmallerInt { //~ERROR: abi: Aggregate
enum NotScalarPairPointerWithSmallerInt { //~ERROR: abi: Memory
A(u8),
B(Box<()>),
}
2 changes: 1 addition & 1 deletion tests/ui/layout/enum-scalar-pair-int-ptr.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ error: abi: ScalarPair(Initialized { value: Int(I?, false), valid_range: $VALID_
LL | enum ScalarPairPointerWithInt {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

error: abi: Aggregate { sized: true }
error: abi: Memory { sized: true }
--> $DIR/enum-scalar-pair-int-ptr.rs:21:1
|
LL | enum NotScalarPairPointerWithSmallerInt {
Expand Down
10 changes: 5 additions & 5 deletions tests/ui/layout/hexagon-enum.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ error: layout_of(A) = Layout {
abi: Align(1 bytes),
pref: Align(1 bytes),
},
abi: Aggregate {
abi: Memory {
sized: true,
},
fields: Arbitrary {
Expand Down Expand Up @@ -122,7 +122,7 @@ error: layout_of(B) = Layout {
abi: Align(1 bytes),
pref: Align(1 bytes),
},
abi: Aggregate {
abi: Memory {
sized: true,
},
fields: Arbitrary {
Expand Down Expand Up @@ -196,7 +196,7 @@ error: layout_of(C) = Layout {
abi: Align(2 bytes),
pref: Align(2 bytes),
},
abi: Aggregate {
abi: Memory {
sized: true,
},
fields: Arbitrary {
Expand Down Expand Up @@ -270,7 +270,7 @@ error: layout_of(P) = Layout {
abi: Align(4 bytes),
pref: Align(4 bytes),
},
abi: Aggregate {
abi: Memory {
sized: true,
},
fields: Arbitrary {
Expand Down Expand Up @@ -344,7 +344,7 @@ error: layout_of(T) = Layout {
abi: Align(4 bytes),
pref: Align(4 bytes),
},
abi: Aggregate {
abi: Memory {
sized: true,
},
fields: Arbitrary {
Expand Down
10 changes: 5 additions & 5 deletions tests/ui/layout/issue-96158-scalarpair-payload-might-be-uninit.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ error: layout_of(MissingPayloadField) = Layout {
abi: Align(1 bytes),
pref: $PREF_ALIGN,
},
abi: Aggregate {
abi: Memory {
sized: true,
},
fields: Arbitrary {
Expand Down Expand Up @@ -489,7 +489,7 @@ error: layout_of(NicheFirst) = Layout {
abi: Align(1 bytes),
pref: $PREF_ALIGN,
},
abi: Aggregate {
abi: Memory {
sized: true,
},
fields: Arbitrary {
Expand All @@ -509,7 +509,7 @@ error: layout_of(NicheFirst) = Layout {
abi: Align(1 bytes),
pref: $PREF_ALIGN,
},
abi: Aggregate {
abi: Memory {
sized: true,
},
fields: Arbitrary {
Expand Down Expand Up @@ -641,7 +641,7 @@ error: layout_of(NicheSecond) = Layout {
abi: Align(1 bytes),
pref: $PREF_ALIGN,
},
abi: Aggregate {
abi: Memory {
sized: true,
},
fields: Arbitrary {
Expand All @@ -661,7 +661,7 @@ error: layout_of(NicheSecond) = Layout {
abi: Align(1 bytes),
pref: $PREF_ALIGN,
},
abi: Aggregate {
abi: Memory {
sized: true,
},
fields: Arbitrary {
Expand Down
Loading

0 comments on commit e9be3c1

Please sign in to comment.