Skip to content

Commit 50787e1

Browse files
YingkaiLi-VMYingkaiLi-VM
committed
Fix conflict in debug.riscv64.stderr file
1 parent c395bdd commit 50787e1

File tree

1 file changed

+24
-48
lines changed

1 file changed

+24
-48
lines changed

‎tests/ui/abi/debug.riscv64.stderr

Lines changed: 24 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ error: fn_abi_of(test) = FnAbi {
55
ty: u8,
66
layout: Layout {
77
size: Size(1 bytes),
8-
align: AbiAndPrefAlign {
8+
align: AbiAlign {
99
abi: $SOME_ALIGN,
10-
pref: $SOME_ALIGN,
1110
},
1211
backend_repr: Scalar(
1312
Initialized {
@@ -44,9 +43,8 @@ error: fn_abi_of(test) = FnAbi {
4443
ty: bool,
4544
layout: Layout {
4645
size: Size(1 bytes),
47-
align: AbiAndPrefAlign {
46+
align: AbiAlign {
4847
abi: $SOME_ALIGN,
49-
pref: $SOME_ALIGN,
5048
},
5149
backend_repr: Scalar(
5250
Initialized {
@@ -103,9 +101,8 @@ error: fn_abi_of(TestFnPtr) = FnAbi {
103101
ty: bool,
104102
layout: Layout {
105103
size: Size(1 bytes),
106-
align: AbiAndPrefAlign {
104+
align: AbiAlign {
107105
abi: $SOME_ALIGN,
108-
pref: $SOME_ALIGN,
109106
},
110107
backend_repr: Scalar(
111108
Initialized {
@@ -151,9 +148,8 @@ error: fn_abi_of(TestFnPtr) = FnAbi {
151148
ty: u8,
152149
layout: Layout {
153150
size: Size(1 bytes),
154-
align: AbiAndPrefAlign {
151+
align: AbiAlign {
155152
abi: $SOME_ALIGN,
156-
pref: $SOME_ALIGN,
157153
},
158154
backend_repr: Scalar(
159155
Initialized {
@@ -201,9 +197,8 @@ error: fn_abi_of(test_generic) = FnAbi {
201197
ty: *const T,
202198
layout: Layout {
203199
size: $SOME_SIZE,
204-
align: AbiAndPrefAlign {
200+
align: AbiAlign {
205201
abi: $SOME_ALIGN,
206-
pref: $SOME_ALIGN,
207202
},
208203
backend_repr: Scalar(
209204
Initialized {
@@ -241,9 +236,8 @@ error: fn_abi_of(test_generic) = FnAbi {
241236
ty: (),
242237
layout: Layout {
243238
size: Size(0 bytes),
244-
align: AbiAndPrefAlign {
239+
align: AbiAlign {
245240
abi: $SOME_ALIGN,
246-
pref: $SOME_ALIGN,
247241
},
248242
backend_repr: Memory {
249243
sized: true,
@@ -288,9 +282,8 @@ error: ABIs are not compatible
288282
ty: u8,
289283
layout: Layout {
290284
size: Size(1 bytes),
291-
align: AbiAndPrefAlign {
285+
align: AbiAlign {
292286
abi: $SOME_ALIGN,
293-
pref: $SOME_ALIGN,
294287
},
295288
backend_repr: Scalar(
296289
Initialized {
@@ -327,9 +320,8 @@ error: ABIs are not compatible
327320
ty: (),
328321
layout: Layout {
329322
size: Size(0 bytes),
330-
align: AbiAndPrefAlign {
323+
align: AbiAlign {
331324
abi: $SOME_ALIGN,
332-
pref: $SOME_ALIGN,
333325
},
334326
backend_repr: Memory {
335327
sized: true,
@@ -362,9 +354,8 @@ error: ABIs are not compatible
362354
ty: u32,
363355
layout: Layout {
364356
size: $SOME_SIZE,
365-
align: AbiAndPrefAlign {
357+
align: AbiAlign {
366358
abi: $SOME_ALIGN,
367-
pref: $SOME_ALIGN,
368359
},
369360
backend_repr: Scalar(
370361
Initialized {
@@ -401,9 +392,8 @@ error: ABIs are not compatible
401392
ty: (),
402393
layout: Layout {
403394
size: Size(0 bytes),
404-
align: AbiAndPrefAlign {
395+
align: AbiAlign {
405396
abi: $SOME_ALIGN,
406-
pref: $SOME_ALIGN,
407397
},
408398
backend_repr: Memory {
409399
sized: true,
@@ -442,9 +432,8 @@ error: ABIs are not compatible
442432
ty: [u8; 32],
443433
layout: Layout {
444434
size: Size(32 bytes),
445-
align: AbiAndPrefAlign {
435+
align: AbiAlign {
446436
abi: $SOME_ALIGN,
447-
pref: $SOME_ALIGN,
448437
},
449438
backend_repr: Memory {
450439
sized: true,
@@ -482,9 +471,8 @@ error: ABIs are not compatible
482471
ty: (),
483472
layout: Layout {
484473
size: Size(0 bytes),
485-
align: AbiAndPrefAlign {
474+
align: AbiAlign {
486475
abi: $SOME_ALIGN,
487-
pref: $SOME_ALIGN,
488476
},
489477
backend_repr: Memory {
490478
sized: true,
@@ -517,9 +505,8 @@ error: ABIs are not compatible
517505
ty: [u32; 32],
518506
layout: Layout {
519507
size: Size(128 bytes),
520-
align: AbiAndPrefAlign {
508+
align: AbiAlign {
521509
abi: $SOME_ALIGN,
522-
pref: $SOME_ALIGN,
523510
},
524511
backend_repr: Memory {
525512
sized: true,
@@ -557,9 +544,8 @@ error: ABIs are not compatible
557544
ty: (),
558545
layout: Layout {
559546
size: Size(0 bytes),
560-
align: AbiAndPrefAlign {
547+
align: AbiAlign {
561548
abi: $SOME_ALIGN,
562-
pref: $SOME_ALIGN,
563549
},
564550
backend_repr: Memory {
565551
sized: true,
@@ -598,9 +584,8 @@ error: ABIs are not compatible
598584
ty: f32,
599585
layout: Layout {
600586
size: $SOME_SIZE,
601-
align: AbiAndPrefAlign {
587+
align: AbiAlign {
602588
abi: $SOME_ALIGN,
603-
pref: $SOME_ALIGN,
604589
},
605590
backend_repr: Scalar(
606591
Initialized {
@@ -636,9 +621,8 @@ error: ABIs are not compatible
636621
ty: (),
637622
layout: Layout {
638623
size: Size(0 bytes),
639-
align: AbiAndPrefAlign {
624+
align: AbiAlign {
640625
abi: $SOME_ALIGN,
641-
pref: $SOME_ALIGN,
642626
},
643627
backend_repr: Memory {
644628
sized: true,
@@ -671,9 +655,8 @@ error: ABIs are not compatible
671655
ty: u32,
672656
layout: Layout {
673657
size: $SOME_SIZE,
674-
align: AbiAndPrefAlign {
658+
align: AbiAlign {
675659
abi: $SOME_ALIGN,
676-
pref: $SOME_ALIGN,
677660
},
678661
backend_repr: Scalar(
679662
Initialized {
@@ -710,9 +693,8 @@ error: ABIs are not compatible
710693
ty: (),
711694
layout: Layout {
712695
size: Size(0 bytes),
713-
align: AbiAndPrefAlign {
696+
align: AbiAlign {
714697
abi: $SOME_ALIGN,
715-
pref: $SOME_ALIGN,
716698
},
717699
backend_repr: Memory {
718700
sized: true,
@@ -751,9 +733,8 @@ error: ABIs are not compatible
751733
ty: i32,
752734
layout: Layout {
753735
size: $SOME_SIZE,
754-
align: AbiAndPrefAlign {
736+
align: AbiAlign {
755737
abi: $SOME_ALIGN,
756-
pref: $SOME_ALIGN,
757738
},
758739
backend_repr: Scalar(
759740
Initialized {
@@ -790,9 +771,8 @@ error: ABIs are not compatible
790771
ty: (),
791772
layout: Layout {
792773
size: Size(0 bytes),
793-
align: AbiAndPrefAlign {
774+
align: AbiAlign {
794775
abi: $SOME_ALIGN,
795-
pref: $SOME_ALIGN,
796776
},
797777
backend_repr: Memory {
798778
sized: true,
@@ -825,9 +805,8 @@ error: ABIs are not compatible
825805
ty: u32,
826806
layout: Layout {
827807
size: $SOME_SIZE,
828-
align: AbiAndPrefAlign {
808+
align: AbiAlign {
829809
abi: $SOME_ALIGN,
830-
pref: $SOME_ALIGN,
831810
},
832811
backend_repr: Scalar(
833812
Initialized {
@@ -864,9 +843,8 @@ error: ABIs are not compatible
864843
ty: (),
865844
layout: Layout {
866845
size: Size(0 bytes),
867-
align: AbiAndPrefAlign {
846+
align: AbiAlign {
868847
abi: $SOME_ALIGN,
869-
pref: $SOME_ALIGN,
870848
},
871849
backend_repr: Memory {
872850
sized: true,
@@ -925,9 +903,8 @@ error: fn_abi_of(assoc_test) = FnAbi {
925903
ty: &S,
926904
layout: Layout {
927905
size: $SOME_SIZE,
928-
align: AbiAndPrefAlign {
906+
align: AbiAlign {
929907
abi: $SOME_ALIGN,
930-
pref: $SOME_ALIGN,
931908
},
932909
backend_repr: Scalar(
933910
Initialized {
@@ -977,9 +954,8 @@ error: fn_abi_of(assoc_test) = FnAbi {
977954
ty: (),
978955
layout: Layout {
979956
size: Size(0 bytes),
980-
align: AbiAndPrefAlign {
957+
align: AbiAlign {
981958
abi: $SOME_ALIGN,
982-
pref: $SOME_ALIGN,
983959
},
984960
backend_repr: Memory {
985961
sized: true,

0 commit comments

Comments
 (0)