Skip to content

Commit 007cdfe

Browse files
jieyouxujieyouxu
authored
Rollup merge of rust-lang#137805 - RalfJung:layout-debug-print, r=Noratrieb
adjust Layout debug printing to match the internal field name The field got renamed a while ago, but the debug printing was not updated to match.
2 parents b8855d8 + 476b098 commit 007cdfe

21 files changed

+162
-162
lines changed

‎compiler/rustc_abi/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1812,7 +1812,7 @@ where
18121812
f.debug_struct("Layout")
18131813
.field("size", size)
18141814
.field("align", align)
1815-
.field("abi", backend_repr)
1815+
.field("backend_repr", backend_repr)
18161816
.field("fields", fields)
18171817
.field("largest_niche", largest_niche)
18181818
.field("uninhabited", uninhabited)

‎tests/ui/abi/c-zst.aarch64-darwin.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: Memory {
12+
backend_repr: Memory {
1313
sized: true,
1414
},
1515
fields: Arbitrary {
@@ -38,7 +38,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
3838
abi: $SOME_ALIGN,
3939
pref: $SOME_ALIGN,
4040
},
41-
abi: Memory {
41+
backend_repr: Memory {
4242
sized: true,
4343
},
4444
fields: Arbitrary {

‎tests/ui/abi/c-zst.powerpc-linux.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: Memory {
12+
backend_repr: Memory {
1313
sized: true,
1414
},
1515
fields: Arbitrary {
@@ -49,7 +49,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
4949
abi: $SOME_ALIGN,
5050
pref: $SOME_ALIGN,
5151
},
52-
abi: Memory {
52+
backend_repr: Memory {
5353
sized: true,
5454
},
5555
fields: Arbitrary {

‎tests/ui/abi/c-zst.s390x-linux.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: Memory {
12+
backend_repr: Memory {
1313
sized: true,
1414
},
1515
fields: Arbitrary {
@@ -49,7 +49,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
4949
abi: $SOME_ALIGN,
5050
pref: $SOME_ALIGN,
5151
},
52-
abi: Memory {
52+
backend_repr: Memory {
5353
sized: true,
5454
},
5555
fields: Arbitrary {

‎tests/ui/abi/c-zst.sparc64-linux.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: Memory {
12+
backend_repr: Memory {
1313
sized: true,
1414
},
1515
fields: Arbitrary {
@@ -49,7 +49,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
4949
abi: $SOME_ALIGN,
5050
pref: $SOME_ALIGN,
5151
},
52-
abi: Memory {
52+
backend_repr: Memory {
5353
sized: true,
5454
},
5555
fields: Arbitrary {

‎tests/ui/abi/c-zst.x86_64-linux.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: Memory {
12+
backend_repr: Memory {
1313
sized: true,
1414
},
1515
fields: Arbitrary {
@@ -38,7 +38,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
3838
abi: $SOME_ALIGN,
3939
pref: $SOME_ALIGN,
4040
},
41-
abi: Memory {
41+
backend_repr: Memory {
4242
sized: true,
4343
},
4444
fields: Arbitrary {

‎tests/ui/abi/c-zst.x86_64-pc-windows-gnu.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: Memory {
12+
backend_repr: Memory {
1313
sized: true,
1414
},
1515
fields: Arbitrary {
@@ -49,7 +49,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
4949
abi: $SOME_ALIGN,
5050
pref: $SOME_ALIGN,
5151
},
52-
abi: Memory {
52+
backend_repr: Memory {
5353
sized: true,
5454
},
5555
fields: Arbitrary {

‎tests/ui/abi/debug.stderr‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ error: fn_abi_of(test) = FnAbi {
99
abi: $SOME_ALIGN,
1010
pref: $SOME_ALIGN,
1111
},
12-
abi: Scalar(
12+
backend_repr: Scalar(
1313
Initialized {
1414
value: Int(
1515
I8,
@@ -48,7 +48,7 @@ error: fn_abi_of(test) = FnAbi {
4848
abi: $SOME_ALIGN,
4949
pref: $SOME_ALIGN,
5050
},
51-
abi: Scalar(
51+
backend_repr: Scalar(
5252
Initialized {
5353
value: Int(
5454
I8,
@@ -107,7 +107,7 @@ error: fn_abi_of(TestFnPtr) = FnAbi {
107107
abi: $SOME_ALIGN,
108108
pref: $SOME_ALIGN,
109109
},
110-
abi: Scalar(
110+
backend_repr: Scalar(
111111
Initialized {
112112
value: Int(
113113
I8,
@@ -155,7 +155,7 @@ error: fn_abi_of(TestFnPtr) = FnAbi {
155155
abi: $SOME_ALIGN,
156156
pref: $SOME_ALIGN,
157157
},
158-
abi: Scalar(
158+
backend_repr: Scalar(
159159
Initialized {
160160
value: Int(
161161
I8,
@@ -205,7 +205,7 @@ error: fn_abi_of(test_generic) = FnAbi {
205205
abi: $SOME_ALIGN,
206206
pref: $SOME_ALIGN,
207207
},
208-
abi: Scalar(
208+
backend_repr: Scalar(
209209
Initialized {
210210
value: Pointer(
211211
AddressSpace(
@@ -245,7 +245,7 @@ error: fn_abi_of(test_generic) = FnAbi {
245245
abi: $SOME_ALIGN,
246246
pref: $SOME_ALIGN,
247247
},
248-
abi: Memory {
248+
backend_repr: Memory {
249249
sized: true,
250250
},
251251
fields: Arbitrary {
@@ -292,7 +292,7 @@ error: ABIs are not compatible
292292
abi: $SOME_ALIGN,
293293
pref: $SOME_ALIGN,
294294
},
295-
abi: Scalar(
295+
backend_repr: Scalar(
296296
Initialized {
297297
value: Int(
298298
I8,
@@ -331,7 +331,7 @@ error: ABIs are not compatible
331331
abi: $SOME_ALIGN,
332332
pref: $SOME_ALIGN,
333333
},
334-
abi: Memory {
334+
backend_repr: Memory {
335335
sized: true,
336336
},
337337
fields: Arbitrary {
@@ -366,7 +366,7 @@ error: ABIs are not compatible
366366
abi: $SOME_ALIGN,
367367
pref: $SOME_ALIGN,
368368
},
369-
abi: Scalar(
369+
backend_repr: Scalar(
370370
Initialized {
371371
value: Int(
372372
I32,
@@ -405,7 +405,7 @@ error: ABIs are not compatible
405405
abi: $SOME_ALIGN,
406406
pref: $SOME_ALIGN,
407407
},
408-
abi: Memory {
408+
backend_repr: Memory {
409409
sized: true,
410410
},
411411
fields: Arbitrary {
@@ -446,7 +446,7 @@ error: ABIs are not compatible
446446
abi: $SOME_ALIGN,
447447
pref: $SOME_ALIGN,
448448
},
449-
abi: Memory {
449+
backend_repr: Memory {
450450
sized: true,
451451
},
452452
fields: Array {
@@ -486,7 +486,7 @@ error: ABIs are not compatible
486486
abi: $SOME_ALIGN,
487487
pref: $SOME_ALIGN,
488488
},
489-
abi: Memory {
489+
backend_repr: Memory {
490490
sized: true,
491491
},
492492
fields: Arbitrary {
@@ -521,7 +521,7 @@ error: ABIs are not compatible
521521
abi: $SOME_ALIGN,
522522
pref: $SOME_ALIGN,
523523
},
524-
abi: Memory {
524+
backend_repr: Memory {
525525
sized: true,
526526
},
527527
fields: Array {
@@ -561,7 +561,7 @@ error: ABIs are not compatible
561561
abi: $SOME_ALIGN,
562562
pref: $SOME_ALIGN,
563563
},
564-
abi: Memory {
564+
backend_repr: Memory {
565565
sized: true,
566566
},
567567
fields: Arbitrary {
@@ -602,7 +602,7 @@ error: ABIs are not compatible
602602
abi: $SOME_ALIGN,
603603
pref: $SOME_ALIGN,
604604
},
605-
abi: Scalar(
605+
backend_repr: Scalar(
606606
Initialized {
607607
value: Float(
608608
F32,
@@ -640,7 +640,7 @@ error: ABIs are not compatible
640640
abi: $SOME_ALIGN,
641641
pref: $SOME_ALIGN,
642642
},
643-
abi: Memory {
643+
backend_repr: Memory {
644644
sized: true,
645645
},
646646
fields: Arbitrary {
@@ -675,7 +675,7 @@ error: ABIs are not compatible
675675
abi: $SOME_ALIGN,
676676
pref: $SOME_ALIGN,
677677
},
678-
abi: Scalar(
678+
backend_repr: Scalar(
679679
Initialized {
680680
value: Int(
681681
I32,
@@ -714,7 +714,7 @@ error: ABIs are not compatible
714714
abi: $SOME_ALIGN,
715715
pref: $SOME_ALIGN,
716716
},
717-
abi: Memory {
717+
backend_repr: Memory {
718718
sized: true,
719719
},
720720
fields: Arbitrary {
@@ -755,7 +755,7 @@ error: ABIs are not compatible
755755
abi: $SOME_ALIGN,
756756
pref: $SOME_ALIGN,
757757
},
758-
abi: Scalar(
758+
backend_repr: Scalar(
759759
Initialized {
760760
value: Int(
761761
I32,
@@ -794,7 +794,7 @@ error: ABIs are not compatible
794794
abi: $SOME_ALIGN,
795795
pref: $SOME_ALIGN,
796796
},
797-
abi: Memory {
797+
backend_repr: Memory {
798798
sized: true,
799799
},
800800
fields: Arbitrary {
@@ -829,7 +829,7 @@ error: ABIs are not compatible
829829
abi: $SOME_ALIGN,
830830
pref: $SOME_ALIGN,
831831
},
832-
abi: Scalar(
832+
backend_repr: Scalar(
833833
Initialized {
834834
value: Int(
835835
I32,
@@ -868,7 +868,7 @@ error: ABIs are not compatible
868868
abi: $SOME_ALIGN,
869869
pref: $SOME_ALIGN,
870870
},
871-
abi: Memory {
871+
backend_repr: Memory {
872872
sized: true,
873873
},
874874
fields: Arbitrary {
@@ -923,7 +923,7 @@ error: fn_abi_of(assoc_test) = FnAbi {
923923
abi: $SOME_ALIGN,
924924
pref: $SOME_ALIGN,
925925
},
926-
abi: Scalar(
926+
backend_repr: Scalar(
927927
Initialized {
928928
value: Pointer(
929929
AddressSpace(
@@ -975,7 +975,7 @@ error: fn_abi_of(assoc_test) = FnAbi {
975975
abi: $SOME_ALIGN,
976976
pref: $SOME_ALIGN,
977977
},
978-
abi: Memory {
978+
backend_repr: Memory {
979979
sized: true,
980980
},
981981
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: Memory {
12+
backend_repr: Memory {
1313
sized: true,
1414
},
1515
fields: Arbitrary {
@@ -38,7 +38,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
3838
abi: $SOME_ALIGN,
3939
pref: $SOME_ALIGN,
4040
},
41-
abi: Memory {
41+
backend_repr: Memory {
4242
sized: true,
4343
},
4444
fields: Arbitrary {

0 commit comments

Comments
 (0)