Skip to content

Commit 3c145da

Browse files
workingjubileeworkingjubilee
committed
tests: Bless rustc_abi::Abi::Aggregate => ::Memory 
1 parent 11f9217 commit 3c145da

20 files changed

+77
-77
lines changed

Diff for: ‎tests/ui/abi/c-zst.other-linux.stderr

+2-2
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 {

Diff for: ‎tests/ui/abi/debug.stderr

+12-12
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 {

Diff for: ‎tests/ui/abi/sysv64-zst.stderr

+2-2
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 {

Diff for: ‎tests/ui/abi/win64-zst.other.stderr

+2-2
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 {

Diff for: ‎tests/ui/layout/debug.stderr

+10-10
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(

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

+1-1
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
}

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

+1-1
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 {

Diff for: ‎tests/ui/layout/hexagon-enum.stderr

+5-5
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 {

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

+5-5
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 {

0 commit comments

Comments
 (0)