Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adjust Layout debug printing to match the internal field name #137805

Merged
merged 1 commit into from
Mar 7, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compiler/rustc_abi/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1812,7 +1812,7 @@ where
f.debug_struct("Layout")
.field("size", size)
.field("align", align)
.field("abi", backend_repr)
.field("backend_repr", backend_repr)
.field("fields", fields)
.field("largest_niche", largest_niche)
.field("uninhabited", uninhabited)
4 changes: 2 additions & 2 deletions tests/ui/abi/c-zst.aarch64-darwin.stderr
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Memory {
backend_repr: Memory {
sized: true,
},
fields: Arbitrary {
@@ -38,7 +38,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Memory {
backend_repr: Memory {
sized: true,
},
fields: Arbitrary {
4 changes: 2 additions & 2 deletions tests/ui/abi/c-zst.powerpc-linux.stderr
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Memory {
backend_repr: Memory {
sized: true,
},
fields: Arbitrary {
@@ -49,7 +49,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Memory {
backend_repr: Memory {
sized: true,
},
fields: Arbitrary {
4 changes: 2 additions & 2 deletions tests/ui/abi/c-zst.s390x-linux.stderr
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Memory {
backend_repr: Memory {
sized: true,
},
fields: Arbitrary {
@@ -49,7 +49,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Memory {
backend_repr: Memory {
sized: true,
},
fields: Arbitrary {
4 changes: 2 additions & 2 deletions tests/ui/abi/c-zst.sparc64-linux.stderr
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Memory {
backend_repr: Memory {
sized: true,
},
fields: Arbitrary {
@@ -49,7 +49,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Memory {
backend_repr: Memory {
sized: true,
},
fields: Arbitrary {
4 changes: 2 additions & 2 deletions tests/ui/abi/c-zst.x86_64-linux.stderr
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Memory {
backend_repr: Memory {
sized: true,
},
fields: Arbitrary {
@@ -38,7 +38,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Memory {
backend_repr: Memory {
sized: true,
},
fields: Arbitrary {
4 changes: 2 additions & 2 deletions tests/ui/abi/c-zst.x86_64-pc-windows-gnu.stderr
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Memory {
backend_repr: Memory {
sized: true,
},
fields: Arbitrary {
@@ -49,7 +49,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Memory {
backend_repr: Memory {
sized: true,
},
fields: Arbitrary {
48 changes: 24 additions & 24 deletions tests/ui/abi/debug.stderr
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ error: fn_abi_of(test) = FnAbi {
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Scalar(
backend_repr: Scalar(
Initialized {
value: Int(
I8,
@@ -48,7 +48,7 @@ error: fn_abi_of(test) = FnAbi {
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Scalar(
backend_repr: Scalar(
Initialized {
value: Int(
I8,
@@ -107,7 +107,7 @@ error: fn_abi_of(TestFnPtr) = FnAbi {
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Scalar(
backend_repr: Scalar(
Initialized {
value: Int(
I8,
@@ -155,7 +155,7 @@ error: fn_abi_of(TestFnPtr) = FnAbi {
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Scalar(
backend_repr: Scalar(
Initialized {
value: Int(
I8,
@@ -205,7 +205,7 @@ error: fn_abi_of(test_generic) = FnAbi {
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Scalar(
backend_repr: Scalar(
Initialized {
value: Pointer(
AddressSpace(
@@ -245,7 +245,7 @@ error: fn_abi_of(test_generic) = FnAbi {
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Memory {
backend_repr: Memory {
sized: true,
},
fields: Arbitrary {
@@ -292,7 +292,7 @@ error: ABIs are not compatible
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Scalar(
backend_repr: Scalar(
Initialized {
value: Int(
I8,
@@ -331,7 +331,7 @@ error: ABIs are not compatible
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Memory {
backend_repr: Memory {
sized: true,
},
fields: Arbitrary {
@@ -366,7 +366,7 @@ error: ABIs are not compatible
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Scalar(
backend_repr: Scalar(
Initialized {
value: Int(
I32,
@@ -405,7 +405,7 @@ error: ABIs are not compatible
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Memory {
backend_repr: Memory {
sized: true,
},
fields: Arbitrary {
@@ -446,7 +446,7 @@ error: ABIs are not compatible
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Memory {
backend_repr: Memory {
sized: true,
},
fields: Array {
@@ -486,7 +486,7 @@ error: ABIs are not compatible
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Memory {
backend_repr: Memory {
sized: true,
},
fields: Arbitrary {
@@ -521,7 +521,7 @@ error: ABIs are not compatible
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Memory {
backend_repr: Memory {
sized: true,
},
fields: Array {
@@ -561,7 +561,7 @@ error: ABIs are not compatible
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Memory {
backend_repr: Memory {
sized: true,
},
fields: Arbitrary {
@@ -602,7 +602,7 @@ error: ABIs are not compatible
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Scalar(
backend_repr: Scalar(
Initialized {
value: Float(
F32,
@@ -640,7 +640,7 @@ error: ABIs are not compatible
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Memory {
backend_repr: Memory {
sized: true,
},
fields: Arbitrary {
@@ -675,7 +675,7 @@ error: ABIs are not compatible
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Scalar(
backend_repr: Scalar(
Initialized {
value: Int(
I32,
@@ -714,7 +714,7 @@ error: ABIs are not compatible
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Memory {
backend_repr: Memory {
sized: true,
},
fields: Arbitrary {
@@ -755,7 +755,7 @@ error: ABIs are not compatible
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Scalar(
backend_repr: Scalar(
Initialized {
value: Int(
I32,
@@ -794,7 +794,7 @@ error: ABIs are not compatible
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Memory {
backend_repr: Memory {
sized: true,
},
fields: Arbitrary {
@@ -829,7 +829,7 @@ error: ABIs are not compatible
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Scalar(
backend_repr: Scalar(
Initialized {
value: Int(
I32,
@@ -868,7 +868,7 @@ error: ABIs are not compatible
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Memory {
backend_repr: Memory {
sized: true,
},
fields: Arbitrary {
@@ -923,7 +923,7 @@ error: fn_abi_of(assoc_test) = FnAbi {
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Scalar(
backend_repr: Scalar(
Initialized {
value: Pointer(
AddressSpace(
@@ -975,7 +975,7 @@ error: fn_abi_of(assoc_test) = FnAbi {
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Memory {
backend_repr: Memory {
sized: true,
},
fields: Arbitrary {
4 changes: 2 additions & 2 deletions tests/ui/abi/sysv64-zst.stderr
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Memory {
backend_repr: Memory {
sized: true,
},
fields: Arbitrary {
@@ -38,7 +38,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
abi: $SOME_ALIGN,
pref: $SOME_ALIGN,
},
abi: Memory {
backend_repr: Memory {
sized: true,
},
fields: Arbitrary {
Loading
Loading