Skip to content

Commit e25916c

Browse files
workingjubileeworkingjubilee
committed
tests: Bless rustc_abi::Abi::Aggregate => ::Memory 
1 parent 9bd64a1 commit e25916c

27 files changed

+164
-97
lines changed

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

+3-3
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:63:1
6262
|
6363
LL | extern "C" fn pass_zst(_: ()) {}
6464
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

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

+3-3
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:63:1
7373
|
7474
LL | extern "C" fn pass_zst(_: ()) {}
7575
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

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

+3-3
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:63:1
7373
|
7474
LL | extern "C" fn pass_zst(_: ()) {}
7575
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

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

+3-3
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:63:1
7373
|
7474
LL | extern "C" fn pass_zst(_: ()) {}
7575
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

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

+3-3
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:63:1
6262
|
6363
LL | extern "C" fn pass_zst(_: ()) {}
6464
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

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

+3-3
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:63:1
7373
|
7474
LL | extern "C" fn pass_zst(_: ()) {}
7575
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

‎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 {

‎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 {

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

+3-3
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

+3-3
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
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

0 commit comments

Comments
 (0)