Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 37d3a92

Browse files
workingjubileeworkingjubilee
committedOct 30, 2024·
tests: Bless rustc_abi::Abi::Aggregate => ::Memory 
1 parent c131ab3 commit 37d3a92

27 files changed

+164
-97
lines changed
 

‎tests/ui/abi/c-zst.aarch64-darwin.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
99
abi: $SOME_ALIGN,
1010
pref: $SOME_ALIGN,
1111
},
12-
abi: Aggregate {
12+
abi: Memory {
1313
sized: true,
1414
},
1515
fields: Arbitrary {
@@ -36,7 +36,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
3636
abi: $SOME_ALIGN,
3737
pref: $SOME_ALIGN,
3838
},
39-
abi: Aggregate {
39+
abi: Memory {
4040
sized: true,
4141
},
4242
fields: Arbitrary {
@@ -58,7 +58,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
5858
conv: C,
5959
can_unwind: false,
6060
}
61-
--> $DIR/c-zst.rs:27:1
61+
--> $DIR/c-zst.rs:40:1
6262
|
6363
LL | extern "C" fn pass_zst(_: ()) {}
6464
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

‎tests/ui/abi/c-zst.powerpc-linux.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
99
abi: $SOME_ALIGN,
1010
pref: $SOME_ALIGN,
1111
},
12-
abi: Aggregate {
12+
abi: Memory {
1313
sized: true,
1414
},
1515
fields: Arbitrary {
@@ -47,7 +47,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
4747
abi: $SOME_ALIGN,
4848
pref: $SOME_ALIGN,
4949
},
50-
abi: Aggregate {
50+
abi: Memory {
5151
sized: true,
5252
},
5353
fields: Arbitrary {
@@ -69,7 +69,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
6969
conv: C,
7070
can_unwind: false,
7171
}
72-
--> $DIR/c-zst.rs:27:1
72+
--> $DIR/c-zst.rs:40:1
7373
|
7474
LL | extern "C" fn pass_zst(_: ()) {}
7575
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

‎tests/ui/abi/c-zst.s390x-linux.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
99
abi: $SOME_ALIGN,
1010
pref: $SOME_ALIGN,
1111
},
12-
abi: Aggregate {
12+
abi: Memory {
1313
sized: true,
1414
},
1515
fields: Arbitrary {
@@ -47,7 +47,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
4747
abi: $SOME_ALIGN,
4848
pref: $SOME_ALIGN,
4949
},
50-
abi: Aggregate {
50+
abi: Memory {
5151
sized: true,
5252
},
5353
fields: Arbitrary {
@@ -69,7 +69,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
6969
conv: C,
7070
can_unwind: false,
7171
}
72-
--> $DIR/c-zst.rs:27:1
72+
--> $DIR/c-zst.rs:40:1
7373
|
7474
LL | extern "C" fn pass_zst(_: ()) {}
7575
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

‎tests/ui/abi/c-zst.sparc64-linux.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
99
abi: $SOME_ALIGN,
1010
pref: $SOME_ALIGN,
1111
},
12-
abi: Aggregate {
12+
abi: Memory {
1313
sized: true,
1414
},
1515
fields: Arbitrary {
@@ -47,7 +47,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
4747
abi: $SOME_ALIGN,
4848
pref: $SOME_ALIGN,
4949
},
50-
abi: Aggregate {
50+
abi: Memory {
5151
sized: true,
5252
},
5353
fields: Arbitrary {
@@ -69,7 +69,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
6969
conv: C,
7070
can_unwind: false,
7171
}
72-
--> $DIR/c-zst.rs:27:1
72+
--> $DIR/c-zst.rs:40:1
7373
|
7474
LL | extern "C" fn pass_zst(_: ()) {}
7575
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

‎tests/ui/abi/c-zst.x86_64-linux.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
99
abi: $SOME_ALIGN,
1010
pref: $SOME_ALIGN,
1111
},
12-
abi: Aggregate {
12+
abi: Memory {
1313
sized: true,
1414
},
1515
fields: Arbitrary {
@@ -36,7 +36,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
3636
abi: $SOME_ALIGN,
3737
pref: $SOME_ALIGN,
3838
},
39-
abi: Aggregate {
39+
abi: Memory {
4040
sized: true,
4141
},
4242
fields: Arbitrary {
@@ -58,7 +58,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
5858
conv: C,
5959
can_unwind: false,
6060
}
61-
--> $DIR/c-zst.rs:27:1
61+
--> $DIR/c-zst.rs:40:1
6262
|
6363
LL | extern "C" fn pass_zst(_: ()) {}
6464
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

‎tests/ui/abi/c-zst.x86_64-pc-windows-gnu.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
99
abi: $SOME_ALIGN,
1010
pref: $SOME_ALIGN,
1111
},
12-
abi: Aggregate {
12+
abi: Memory {
1313
sized: true,
1414
},
1515
fields: Arbitrary {
@@ -47,7 +47,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
4747
abi: $SOME_ALIGN,
4848
pref: $SOME_ALIGN,
4949
},
50-
abi: Aggregate {
50+
abi: Memory {
5151
sized: true,
5252
},
5353
fields: Arbitrary {
@@ -69,7 +69,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
6969
conv: C,
7070
can_unwind: false,
7171
}
72-
--> $DIR/c-zst.rs:27:1
72+
--> $DIR/c-zst.rs:40:1
7373
|
7474
LL | extern "C" fn pass_zst(_: ()) {}
7575
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

‎tests/ui/abi/debug.stderr

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ error: fn_abi_of(test_generic) = FnAbi {
235235
abi: $SOME_ALIGN,
236236
pref: $SOME_ALIGN,
237237
},
238-
abi: Aggregate {
238+
abi: Memory {
239239
sized: true,
240240
},
241241
fields: Arbitrary {
@@ -317,7 +317,7 @@ error: ABIs are not compatible
317317
abi: $SOME_ALIGN,
318318
pref: $SOME_ALIGN,
319319
},
320-
abi: Aggregate {
320+
abi: Memory {
321321
sized: true,
322322
},
323323
fields: Arbitrary {
@@ -387,7 +387,7 @@ error: ABIs are not compatible
387387
abi: $SOME_ALIGN,
388388
pref: $SOME_ALIGN,
389389
},
390-
abi: Aggregate {
390+
abi: Memory {
391391
sized: true,
392392
},
393393
fields: Arbitrary {
@@ -426,7 +426,7 @@ error: ABIs are not compatible
426426
abi: $SOME_ALIGN,
427427
pref: $SOME_ALIGN,
428428
},
429-
abi: Aggregate {
429+
abi: Memory {
430430
sized: true,
431431
},
432432
fields: Array {
@@ -464,7 +464,7 @@ error: ABIs are not compatible
464464
abi: $SOME_ALIGN,
465465
pref: $SOME_ALIGN,
466466
},
467-
abi: Aggregate {
467+
abi: Memory {
468468
sized: true,
469469
},
470470
fields: Arbitrary {
@@ -497,7 +497,7 @@ error: ABIs are not compatible
497497
abi: $SOME_ALIGN,
498498
pref: $SOME_ALIGN,
499499
},
500-
abi: Aggregate {
500+
abi: Memory {
501501
sized: true,
502502
},
503503
fields: Array {
@@ -535,7 +535,7 @@ error: ABIs are not compatible
535535
abi: $SOME_ALIGN,
536536
pref: $SOME_ALIGN,
537537
},
538-
abi: Aggregate {
538+
abi: Memory {
539539
sized: true,
540540
},
541541
fields: Arbitrary {
@@ -610,7 +610,7 @@ error: ABIs are not compatible
610610
abi: $SOME_ALIGN,
611611
pref: $SOME_ALIGN,
612612
},
613-
abi: Aggregate {
613+
abi: Memory {
614614
sized: true,
615615
},
616616
fields: Arbitrary {
@@ -680,7 +680,7 @@ error: ABIs are not compatible
680680
abi: $SOME_ALIGN,
681681
pref: $SOME_ALIGN,
682682
},
683-
abi: Aggregate {
683+
abi: Memory {
684684
sized: true,
685685
},
686686
fields: Arbitrary {
@@ -756,7 +756,7 @@ error: ABIs are not compatible
756756
abi: $SOME_ALIGN,
757757
pref: $SOME_ALIGN,
758758
},
759-
abi: Aggregate {
759+
abi: Memory {
760760
sized: true,
761761
},
762762
fields: Arbitrary {
@@ -826,7 +826,7 @@ error: ABIs are not compatible
826826
abi: $SOME_ALIGN,
827827
pref: $SOME_ALIGN,
828828
},
829-
abi: Aggregate {
829+
abi: Memory {
830830
sized: true,
831831
},
832832
fields: Arbitrary {
@@ -929,7 +929,7 @@ error: fn_abi_of(assoc_test) = FnAbi {
929929
abi: $SOME_ALIGN,
930930
pref: $SOME_ALIGN,
931931
},
932-
abi: Aggregate {
932+
abi: Memory {
933933
sized: true,
934934
},
935935
fields: Arbitrary {

‎tests/ui/abi/sysv64-zst.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
99
abi: $SOME_ALIGN,
1010
pref: $SOME_ALIGN,
1111
},
12-
abi: Aggregate {
12+
abi: Memory {
1313
sized: true,
1414
},
1515
fields: Arbitrary {
@@ -36,7 +36,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
3636
abi: $SOME_ALIGN,
3737
pref: $SOME_ALIGN,
3838
},
39-
abi: Aggregate {
39+
abi: Memory {
4040
sized: true,
4141
},
4242
fields: Arbitrary {

‎tests/ui/abi/win64-zst.x86_64-linux.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
99
abi: $SOME_ALIGN,
1010
pref: $SOME_ALIGN,
1111
},
12-
abi: Aggregate {
12+
abi: Memory {
1313
sized: true,
1414
},
1515
fields: Arbitrary {
@@ -36,7 +36,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
3636
abi: $SOME_ALIGN,
3737
pref: $SOME_ALIGN,
3838
},
39-
abi: Aggregate {
39+
abi: Memory {
4040
sized: true,
4141
},
4242
fields: Arbitrary {
@@ -58,7 +58,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
5858
conv: X86_64Win64,
5959
can_unwind: false,
6060
}
61-
--> $DIR/win64-zst.rs:11:1
61+
--> $DIR/win64-zst.rs:24:1
6262
|
6363
LL | extern "win64" fn pass_zst(_: ()) {}
6464
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

‎tests/ui/abi/win64-zst.x86_64-windows-gnu.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
99
abi: $SOME_ALIGN,
1010
pref: $SOME_ALIGN,
1111
},
12-
abi: Aggregate {
12+
abi: Memory {
1313
sized: true,
1414
},
1515
fields: Arbitrary {
@@ -47,7 +47,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
4747
abi: $SOME_ALIGN,
4848
pref: $SOME_ALIGN,
4949
},
50-
abi: Aggregate {
50+
abi: Memory {
5151
sized: true,
5252
},
5353
fields: Arbitrary {
@@ -69,7 +69,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
6969
conv: X86_64Win64,
7070
can_unwind: false,
7171
}
72-
--> $DIR/win64-zst.rs:11:1
72+
--> $DIR/win64-zst.rs:24:1
7373
|
7474
LL | extern "win64" fn pass_zst(_: ()) {}
7575
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

‎tests/ui/abi/win64-zst.x86_64-windows-msvc.stderr

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
error: fn_abi_of(pass_zst) = FnAbi {
2+
args: [
3+
ArgAbi {
4+
layout: TyAndLayout {
5+
ty: (),
6+
layout: Layout {
7+
size: Size(0 bytes),
8+
align: AbiAndPrefAlign {
9+
abi: $SOME_ALIGN,
10+
pref: $SOME_ALIGN,
11+
},
12+
abi: Memory {
13+
sized: true,
14+
},
15+
fields: Arbitrary {
16+
offsets: [],
17+
memory_index: [],
18+
},
19+
largest_niche: None,
20+
variants: Single {
21+
index: 0,
22+
},
23+
max_repr_align: None,
24+
unadjusted_abi_align: $SOME_ALIGN,
25+
},
26+
},
27+
mode: Ignore,
28+
},
29+
],
30+
ret: ArgAbi {
31+
layout: TyAndLayout {
32+
ty: (),
33+
layout: Layout {
34+
size: Size(0 bytes),
35+
align: AbiAndPrefAlign {
36+
abi: $SOME_ALIGN,
37+
pref: $SOME_ALIGN,
38+
},
39+
abi: Memory {
40+
sized: true,
41+
},
42+
fields: Arbitrary {
43+
offsets: [],
44+
memory_index: [],
45+
},
46+
largest_niche: None,
47+
variants: Single {
48+
index: 0,
49+
},
50+
max_repr_align: None,
51+
unadjusted_abi_align: $SOME_ALIGN,
52+
},
53+
},
54+
mode: Ignore,
55+
},
56+
c_variadic: false,
57+
fixed_count: 1,
58+
conv: X86_64Win64,
59+
can_unwind: false,
60+
}
61+
--> $DIR/win64-zst.rs:24:1
62+
|
63+
LL | extern "win64" fn pass_zst(_: ()) {}
64+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
65+
66+
error: aborting due to 1 previous error
67+

‎tests/ui/layout/debug.stderr

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ error: layout_of(E) = Layout {
1010
abi: Align(4 bytes),
1111
pref: $SOME_ALIGN,
1212
},
13-
abi: Aggregate {
13+
abi: Memory {
1414
sized: true,
1515
},
1616
fields: Arbitrary {
@@ -48,7 +48,7 @@ error: layout_of(E) = Layout {
4848
abi: Align(1 bytes),
4949
pref: $SOME_ALIGN,
5050
},
51-
abi: Aggregate {
51+
abi: Memory {
5252
sized: true,
5353
},
5454
fields: Arbitrary {
@@ -150,7 +150,7 @@ error: layout_of(U) = Layout {
150150
abi: Align(4 bytes),
151151
pref: $SOME_ALIGN,
152152
},
153-
abi: Aggregate {
153+
abi: Memory {
154154
sized: true,
155155
},
156156
fields: Union(
@@ -337,7 +337,7 @@ error: layout_of(V) = Layout {
337337
abi: Align(2 bytes),
338338
pref: $SOME_ALIGN,
339339
},
340-
abi: Aggregate {
340+
abi: Memory {
341341
sized: true,
342342
},
343343
fields: Union(
@@ -361,7 +361,7 @@ error: layout_of(W) = Layout {
361361
abi: Align(2 bytes),
362362
pref: $SOME_ALIGN,
363363
},
364-
abi: Aggregate {
364+
abi: Memory {
365365
sized: true,
366366
},
367367
fields: Union(
@@ -385,7 +385,7 @@ error: layout_of(Y) = Layout {
385385
abi: Align(2 bytes),
386386
pref: $SOME_ALIGN,
387387
},
388-
abi: Aggregate {
388+
abi: Memory {
389389
sized: true,
390390
},
391391
fields: Union(
@@ -409,7 +409,7 @@ error: layout_of(P1) = Layout {
409409
abi: Align(1 bytes),
410410
pref: $SOME_ALIGN,
411411
},
412-
abi: Aggregate {
412+
abi: Memory {
413413
sized: true,
414414
},
415415
fields: Union(
@@ -433,7 +433,7 @@ error: layout_of(P2) = Layout {
433433
abi: Align(1 bytes),
434434
pref: $SOME_ALIGN,
435435
},
436-
abi: Aggregate {
436+
abi: Memory {
437437
sized: true,
438438
},
439439
fields: Union(
@@ -457,7 +457,7 @@ error: layout_of(P3) = Layout {
457457
abi: Align(1 bytes),
458458
pref: $SOME_ALIGN,
459459
},
460-
abi: Aggregate {
460+
abi: Memory {
461461
sized: true,
462462
},
463463
fields: Union(
@@ -481,7 +481,7 @@ error: layout_of(P4) = Layout {
481481
abi: Align(1 bytes),
482482
pref: $SOME_ALIGN,
483483
},
484-
abi: Aggregate {
484+
abi: Memory {
485485
sized: true,
486486
},
487487
fields: Union(

‎tests/ui/layout/enum-scalar-pair-int-ptr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ enum ScalarPairPointerWithInt { //~ERROR: abi: ScalarPair
1818
// of a different size. (Assumes that no target has 8 bit pointers, which
1919
// feels pretty safe.)
2020
#[rustc_layout(abi)]
21-
enum NotScalarPairPointerWithSmallerInt { //~ERROR: abi: Aggregate
21+
enum NotScalarPairPointerWithSmallerInt { //~ERROR: abi: Memory
2222
A(u8),
2323
B(Box<()>),
2424
}

‎tests/ui/layout/enum-scalar-pair-int-ptr.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: abi: ScalarPair(Initialized { value: Int(I?, false), valid_range: $VALID_
44
LL | enum ScalarPairPointerWithInt {
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
66

7-
error: abi: Aggregate { sized: true }
7+
error: abi: Memory { sized: true }
88
--> $DIR/enum-scalar-pair-int-ptr.rs:21:1
99
|
1010
LL | enum NotScalarPairPointerWithSmallerInt {

‎tests/ui/layout/hexagon-enum.stderr

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ error: layout_of(A) = Layout {
4848
abi: Align(1 bytes),
4949
pref: Align(1 bytes),
5050
},
51-
abi: Aggregate {
51+
abi: Memory {
5252
sized: true,
5353
},
5454
fields: Arbitrary {
@@ -122,7 +122,7 @@ error: layout_of(B) = Layout {
122122
abi: Align(1 bytes),
123123
pref: Align(1 bytes),
124124
},
125-
abi: Aggregate {
125+
abi: Memory {
126126
sized: true,
127127
},
128128
fields: Arbitrary {
@@ -196,7 +196,7 @@ error: layout_of(C) = Layout {
196196
abi: Align(2 bytes),
197197
pref: Align(2 bytes),
198198
},
199-
abi: Aggregate {
199+
abi: Memory {
200200
sized: true,
201201
},
202202
fields: Arbitrary {
@@ -270,7 +270,7 @@ error: layout_of(P) = Layout {
270270
abi: Align(4 bytes),
271271
pref: Align(4 bytes),
272272
},
273-
abi: Aggregate {
273+
abi: Memory {
274274
sized: true,
275275
},
276276
fields: Arbitrary {
@@ -344,7 +344,7 @@ error: layout_of(T) = Layout {
344344
abi: Align(4 bytes),
345345
pref: Align(4 bytes),
346346
},
347-
abi: Aggregate {
347+
abi: Memory {
348348
sized: true,
349349
},
350350
fields: Arbitrary {

‎tests/ui/layout/issue-96158-scalarpair-payload-might-be-uninit.stderr

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ error: layout_of(MissingPayloadField) = Layout {
9090
abi: Align(1 bytes),
9191
pref: $PREF_ALIGN,
9292
},
93-
abi: Aggregate {
93+
abi: Memory {
9494
sized: true,
9595
},
9696
fields: Arbitrary {
@@ -489,7 +489,7 @@ error: layout_of(NicheFirst) = Layout {
489489
abi: Align(1 bytes),
490490
pref: $PREF_ALIGN,
491491
},
492-
abi: Aggregate {
492+
abi: Memory {
493493
sized: true,
494494
},
495495
fields: Arbitrary {
@@ -509,7 +509,7 @@ error: layout_of(NicheFirst) = Layout {
509509
abi: Align(1 bytes),
510510
pref: $PREF_ALIGN,
511511
},
512-
abi: Aggregate {
512+
abi: Memory {
513513
sized: true,
514514
},
515515
fields: Arbitrary {
@@ -641,7 +641,7 @@ error: layout_of(NicheSecond) = Layout {
641641
abi: Align(1 bytes),
642642
pref: $PREF_ALIGN,
643643
},
644-
abi: Aggregate {
644+
abi: Memory {
645645
sized: true,
646646
},
647647
fields: Arbitrary {
@@ -661,7 +661,7 @@ error: layout_of(NicheSecond) = Layout {
661661
abi: Align(1 bytes),
662662
pref: $PREF_ALIGN,
663663
},
664-
abi: Aggregate {
664+
abi: Memory {
665665
sized: true,
666666
},
667667
fields: Arbitrary {

‎tests/ui/layout/issue-96185-overaligned-enum.stderr

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: layout_of(Aligned1) = Layout {
44
abi: Align(8 bytes),
55
pref: $PREF_ALIGN,
66
},
7-
abi: Aggregate {
7+
abi: Memory {
88
sized: true,
99
},
1010
fields: Arbitrary {
@@ -42,7 +42,7 @@ error: layout_of(Aligned1) = Layout {
4242
abi: Align(8 bytes),
4343
pref: $PREF_ALIGN,
4444
},
45-
abi: Aggregate {
45+
abi: Memory {
4646
sized: true,
4747
},
4848
fields: Arbitrary {
@@ -64,7 +64,7 @@ error: layout_of(Aligned1) = Layout {
6464
abi: Align(8 bytes),
6565
pref: $PREF_ALIGN,
6666
},
67-
abi: Aggregate {
67+
abi: Memory {
6868
sized: true,
6969
},
7070
fields: Arbitrary {
@@ -142,7 +142,7 @@ error: layout_of(Aligned2) = Layout {
142142
abi: Align(1 bytes),
143143
pref: $PREF_ALIGN,
144144
},
145-
abi: Aggregate {
145+
abi: Memory {
146146
sized: true,
147147
},
148148
fields: Arbitrary {
@@ -164,7 +164,7 @@ error: layout_of(Aligned2) = Layout {
164164
abi: Align(1 bytes),
165165
pref: $PREF_ALIGN,
166166
},
167-
abi: Aggregate {
167+
abi: Memory {
168168
sized: true,
169169
},
170170
fields: Arbitrary {

‎tests/ui/layout/struct.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#![crate_type = "lib"]
77

88
#[rustc_layout(abi)]
9-
struct AlignedZstPreventsScalar(i16, [i32; 0]); //~ERROR: abi: Aggregate
9+
struct AlignedZstPreventsScalar(i16, [i32; 0]); //~ERROR: abi: Memory
1010

1111
#[rustc_layout(abi)]
1212
struct AlignedZstButStillScalar(i32, [i16; 0]); //~ERROR: abi: Scalar

‎tests/ui/layout/struct.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error: abi: Aggregate { sized: true }
1+
error: abi: Memory { sized: true }
22
--> $DIR/struct.rs:9:1
33
|
44
LL | struct AlignedZstPreventsScalar(i16, [i32; 0]);

‎tests/ui/layout/thumb-enum.stderr

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ error: layout_of(A) = Layout {
4848
abi: Align(1 bytes),
4949
pref: Align(4 bytes),
5050
},
51-
abi: Aggregate {
51+
abi: Memory {
5252
sized: true,
5353
},
5454
fields: Arbitrary {
@@ -122,7 +122,7 @@ error: layout_of(B) = Layout {
122122
abi: Align(1 bytes),
123123
pref: Align(4 bytes),
124124
},
125-
abi: Aggregate {
125+
abi: Memory {
126126
sized: true,
127127
},
128128
fields: Arbitrary {
@@ -196,7 +196,7 @@ error: layout_of(C) = Layout {
196196
abi: Align(2 bytes),
197197
pref: Align(4 bytes),
198198
},
199-
abi: Aggregate {
199+
abi: Memory {
200200
sized: true,
201201
},
202202
fields: Arbitrary {
@@ -270,7 +270,7 @@ error: layout_of(P) = Layout {
270270
abi: Align(4 bytes),
271271
pref: Align(4 bytes),
272272
},
273-
abi: Aggregate {
273+
abi: Memory {
274274
sized: true,
275275
},
276276
fields: Arbitrary {
@@ -344,7 +344,7 @@ error: layout_of(T) = Layout {
344344
abi: Align(4 bytes),
345345
pref: Align(4 bytes),
346346
},
347-
abi: Aggregate {
347+
abi: Memory {
348348
sized: true,
349349
},
350350
fields: Arbitrary {

‎tests/ui/layout/zero-sized-array-enum-niche.stderr

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: layout_of(Result<[u32; 0], bool>) = Layout {
44
abi: Align(4 bytes),
55
pref: $PREF_ALIGN,
66
},
7-
abi: Aggregate {
7+
abi: Memory {
88
sized: true,
99
},
1010
fields: Arbitrary {
@@ -42,7 +42,7 @@ error: layout_of(Result<[u32; 0], bool>) = Layout {
4242
abi: Align(4 bytes),
4343
pref: $PREF_ALIGN,
4444
},
45-
abi: Aggregate {
45+
abi: Memory {
4646
sized: true,
4747
},
4848
fields: Arbitrary {
@@ -66,7 +66,7 @@ error: layout_of(Result<[u32; 0], bool>) = Layout {
6666
abi: Align(1 bytes),
6767
pref: $PREF_ALIGN,
6868
},
69-
abi: Aggregate {
69+
abi: Memory {
7070
sized: true,
7171
},
7272
fields: Arbitrary {
@@ -109,7 +109,7 @@ error: layout_of(MultipleAlignments) = Layout {
109109
abi: Align(4 bytes),
110110
pref: $PREF_ALIGN,
111111
},
112-
abi: Aggregate {
112+
abi: Memory {
113113
sized: true,
114114
},
115115
fields: Arbitrary {
@@ -147,7 +147,7 @@ error: layout_of(MultipleAlignments) = Layout {
147147
abi: Align(2 bytes),
148148
pref: $PREF_ALIGN,
149149
},
150-
abi: Aggregate {
150+
abi: Memory {
151151
sized: true,
152152
},
153153
fields: Arbitrary {
@@ -171,7 +171,7 @@ error: layout_of(MultipleAlignments) = Layout {
171171
abi: Align(4 bytes),
172172
pref: $PREF_ALIGN,
173173
},
174-
abi: Aggregate {
174+
abi: Memory {
175175
sized: true,
176176
},
177177
fields: Arbitrary {
@@ -195,7 +195,7 @@ error: layout_of(MultipleAlignments) = Layout {
195195
abi: Align(1 bytes),
196196
pref: $PREF_ALIGN,
197197
},
198-
abi: Aggregate {
198+
abi: Memory {
199199
sized: true,
200200
},
201201
fields: Arbitrary {
@@ -238,7 +238,7 @@ error: layout_of(Result<[u32; 0], Packed<NonZero<u16>>>) = Layout {
238238
abi: Align(4 bytes),
239239
pref: $PREF_ALIGN,
240240
},
241-
abi: Aggregate {
241+
abi: Memory {
242242
sized: true,
243243
},
244244
fields: Arbitrary {
@@ -276,7 +276,7 @@ error: layout_of(Result<[u32; 0], Packed<NonZero<u16>>>) = Layout {
276276
abi: Align(4 bytes),
277277
pref: $PREF_ALIGN,
278278
},
279-
abi: Aggregate {
279+
abi: Memory {
280280
sized: true,
281281
},
282282
fields: Arbitrary {
@@ -300,7 +300,7 @@ error: layout_of(Result<[u32; 0], Packed<NonZero<u16>>>) = Layout {
300300
abi: Align(1 bytes),
301301
pref: $PREF_ALIGN,
302302
},
303-
abi: Aggregate {
303+
abi: Memory {
304304
sized: true,
305305
},
306306
fields: Arbitrary {
@@ -343,7 +343,7 @@ error: layout_of(Result<[u32; 0], Packed<U16IsZero>>) = Layout {
343343
abi: Align(4 bytes),
344344
pref: $PREF_ALIGN,
345345
},
346-
abi: Aggregate {
346+
abi: Memory {
347347
sized: true,
348348
},
349349
fields: Arbitrary {
@@ -385,7 +385,7 @@ error: layout_of(Result<[u32; 0], Packed<U16IsZero>>) = Layout {
385385
abi: Align(4 bytes),
386386
pref: $PREF_ALIGN,
387387
},
388-
abi: Aggregate {
388+
abi: Memory {
389389
sized: true,
390390
},
391391
fields: Arbitrary {
@@ -409,7 +409,7 @@ error: layout_of(Result<[u32; 0], Packed<U16IsZero>>) = Layout {
409409
abi: Align(1 bytes),
410410
pref: $PREF_ALIGN,
411411
},
412-
abi: Aggregate {
412+
abi: Memory {
413413
sized: true,
414414
},
415415
fields: Arbitrary {

‎tests/ui/repr/repr-c-dead-variants.aarch64-unknown-linux-gnu.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ error: layout_of(DeadBranchHasOtherField) = Layout {
190190
abi: Align(8 bytes),
191191
pref: $SOME_ALIGN,
192192
},
193-
abi: Aggregate {
193+
abi: Memory {
194194
sized: true,
195195
},
196196
fields: Arbitrary {
@@ -254,7 +254,7 @@ error: layout_of(DeadBranchHasOtherField) = Layout {
254254
abi: Align(8 bytes),
255255
pref: $SOME_ALIGN,
256256
},
257-
abi: Aggregate {
257+
abi: Memory {
258258
sized: true,
259259
},
260260
fields: Arbitrary {

‎tests/ui/repr/repr-c-dead-variants.armebv7r-none-eabi.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ error: layout_of(DeadBranchHasOtherField) = Layout {
190190
abi: Align(8 bytes),
191191
pref: $SOME_ALIGN,
192192
},
193-
abi: Aggregate {
193+
abi: Memory {
194194
sized: true,
195195
},
196196
fields: Arbitrary {
@@ -254,7 +254,7 @@ error: layout_of(DeadBranchHasOtherField) = Layout {
254254
abi: Align(8 bytes),
255255
pref: $SOME_ALIGN,
256256
},
257-
abi: Aggregate {
257+
abi: Memory {
258258
sized: true,
259259
},
260260
fields: Arbitrary {

‎tests/ui/repr/repr-c-dead-variants.i686-pc-windows-msvc.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ error: layout_of(DeadBranchHasOtherField) = Layout {
190190
abi: Align(8 bytes),
191191
pref: $SOME_ALIGN,
192192
},
193-
abi: Aggregate {
193+
abi: Memory {
194194
sized: true,
195195
},
196196
fields: Arbitrary {
@@ -254,7 +254,7 @@ error: layout_of(DeadBranchHasOtherField) = Layout {
254254
abi: Align(8 bytes),
255255
pref: $SOME_ALIGN,
256256
},
257-
abi: Aggregate {
257+
abi: Memory {
258258
sized: true,
259259
},
260260
fields: Arbitrary {

‎tests/ui/repr/repr-c-dead-variants.x86_64-unknown-linux-gnu.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ error: layout_of(DeadBranchHasOtherField) = Layout {
190190
abi: Align(8 bytes),
191191
pref: $SOME_ALIGN,
192192
},
193-
abi: Aggregate {
193+
abi: Memory {
194194
sized: true,
195195
},
196196
fields: Arbitrary {
@@ -254,7 +254,7 @@ error: layout_of(DeadBranchHasOtherField) = Layout {
254254
abi: Align(8 bytes),
255255
pref: $SOME_ALIGN,
256256
},
257-
abi: Aggregate {
257+
abi: Memory {
258258
sized: true,
259259
},
260260
fields: Arbitrary {

‎tests/ui/repr/repr-c-int-dead-variants.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ error: layout_of(DeadBranchHasOtherFieldU8) = Layout {
190190
abi: Align(8 bytes),
191191
pref: $SOME_ALIGN,
192192
},
193-
abi: Aggregate {
193+
abi: Memory {
194194
sized: true,
195195
},
196196
fields: Arbitrary {
@@ -254,7 +254,7 @@ error: layout_of(DeadBranchHasOtherFieldU8) = Layout {
254254
abi: Align(8 bytes),
255255
pref: $SOME_ALIGN,
256256
},
257-
abi: Aggregate {
257+
abi: Memory {
258258
sized: true,
259259
},
260260
fields: Arbitrary {

‎tests/ui/type/pattern_types/range_patterns.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ error: layout_of(Option<(u32) is 1..=>) = Layout {
124124
abi: Align(1 bytes),
125125
pref: $SOME_ALIGN,
126126
},
127-
abi: Aggregate {
127+
abi: Memory {
128128
sized: true,
129129
},
130130
fields: Arbitrary {
@@ -232,7 +232,7 @@ error: layout_of(Option<NonZero<u32>>) = Layout {
232232
abi: Align(1 bytes),
233233
pref: $SOME_ALIGN,
234234
},
235-
abi: Aggregate {
235+
abi: Memory {
236236
sized: true,
237237
},
238238
fields: Arbitrary {

0 commit comments

Comments
 (0)
Please sign in to comment.