mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-23 15:23:46 +00:00
64ea8eb1a9
The `Debug` impl for `Ty` just calls the `Display` impl for `Ty`. This is surprising and annoying. In particular, it means `Debug` doesn't show as much information as `Debug` for `TyKind` does. And `Debug` is used in some user-facing error messages, which seems bad. This commit changes the `Debug` impl for `Ty` to call the `Debug` impl for `TyKind`. It also does a number of follow-up changes to preserve existing output, many of which involve inserting `with_no_trimmed_paths!` calls. It also adds `Display` impls for `UserType` and `Canonical`. Some tests have changes to expected output: - Those that use the `rustc_abi(debug)` attribute. - Those that use the `EMIT_MIR` annotation. In each case the output is slightly uglier than before. This isn't ideal, but it's pretty weird (particularly for the attribute) that the output is using `Debug` in the first place. They're fairly obscure attributes (I hadn't heard of them) so I'm not worried by this. For `async-is-unwindsafe.stderr`, there is one line that now lacks a full path. This is a consistency improvement, because all the other mentions of `Context` in this test lack a path.
451 lines
15 KiB
Plaintext
451 lines
15 KiB
Plaintext
error: layout_of(Result<[u32; 0], bool>) = Layout {
|
|
size: Size(4 bytes),
|
|
align: AbiAndPrefAlign {
|
|
abi: Align(4 bytes),
|
|
pref: $PREF_ALIGN,
|
|
},
|
|
abi: Aggregate {
|
|
sized: true,
|
|
},
|
|
fields: Arbitrary {
|
|
offsets: [
|
|
Size(0 bytes),
|
|
],
|
|
memory_index: [
|
|
0,
|
|
],
|
|
},
|
|
largest_niche: Some(
|
|
Niche {
|
|
offset: Size(0 bytes),
|
|
value: Int(
|
|
I8,
|
|
false,
|
|
),
|
|
valid_range: 0..=1,
|
|
},
|
|
),
|
|
variants: Multiple {
|
|
tag: Initialized {
|
|
value: Int(
|
|
I8,
|
|
false,
|
|
),
|
|
valid_range: 0..=1,
|
|
},
|
|
tag_encoding: Direct,
|
|
tag_field: 0,
|
|
variants: [
|
|
Layout {
|
|
size: Size(4 bytes),
|
|
align: AbiAndPrefAlign {
|
|
abi: Align(4 bytes),
|
|
pref: $PREF_ALIGN,
|
|
},
|
|
abi: Aggregate {
|
|
sized: true,
|
|
},
|
|
fields: Arbitrary {
|
|
offsets: [
|
|
Size(4 bytes),
|
|
],
|
|
memory_index: [
|
|
0,
|
|
],
|
|
},
|
|
largest_niche: None,
|
|
variants: Single {
|
|
index: 0,
|
|
},
|
|
max_repr_align: None,
|
|
unadjusted_abi_align: Align(4 bytes),
|
|
},
|
|
Layout {
|
|
size: Size(2 bytes),
|
|
align: AbiAndPrefAlign {
|
|
abi: Align(1 bytes),
|
|
pref: $PREF_ALIGN,
|
|
},
|
|
abi: Aggregate {
|
|
sized: true,
|
|
},
|
|
fields: Arbitrary {
|
|
offsets: [
|
|
Size(1 bytes),
|
|
],
|
|
memory_index: [
|
|
0,
|
|
],
|
|
},
|
|
largest_niche: Some(
|
|
Niche {
|
|
offset: Size(1 bytes),
|
|
value: Int(
|
|
I8,
|
|
false,
|
|
),
|
|
valid_range: 0..=1,
|
|
},
|
|
),
|
|
variants: Single {
|
|
index: 1,
|
|
},
|
|
max_repr_align: None,
|
|
unadjusted_abi_align: Align(1 bytes),
|
|
},
|
|
],
|
|
},
|
|
max_repr_align: None,
|
|
unadjusted_abi_align: Align(4 bytes),
|
|
}
|
|
--> $DIR/zero-sized-array-enum-niche.rs:13:1
|
|
|
|
|
LL | type AlignedResult = Result<[u32; 0], bool>;
|
|
| ^^^^^^^^^^^^^^^^^^
|
|
|
|
error: layout_of(MultipleAlignments) = Layout {
|
|
size: Size(4 bytes),
|
|
align: AbiAndPrefAlign {
|
|
abi: Align(4 bytes),
|
|
pref: $PREF_ALIGN,
|
|
},
|
|
abi: Aggregate {
|
|
sized: true,
|
|
},
|
|
fields: Arbitrary {
|
|
offsets: [
|
|
Size(0 bytes),
|
|
],
|
|
memory_index: [
|
|
0,
|
|
],
|
|
},
|
|
largest_niche: Some(
|
|
Niche {
|
|
offset: Size(0 bytes),
|
|
value: Int(
|
|
I8,
|
|
false,
|
|
),
|
|
valid_range: 0..=2,
|
|
},
|
|
),
|
|
variants: Multiple {
|
|
tag: Initialized {
|
|
value: Int(
|
|
I8,
|
|
false,
|
|
),
|
|
valid_range: 0..=2,
|
|
},
|
|
tag_encoding: Direct,
|
|
tag_field: 0,
|
|
variants: [
|
|
Layout {
|
|
size: Size(2 bytes),
|
|
align: AbiAndPrefAlign {
|
|
abi: Align(2 bytes),
|
|
pref: $PREF_ALIGN,
|
|
},
|
|
abi: Aggregate {
|
|
sized: true,
|
|
},
|
|
fields: Arbitrary {
|
|
offsets: [
|
|
Size(2 bytes),
|
|
],
|
|
memory_index: [
|
|
0,
|
|
],
|
|
},
|
|
largest_niche: None,
|
|
variants: Single {
|
|
index: 0,
|
|
},
|
|
max_repr_align: None,
|
|
unadjusted_abi_align: Align(2 bytes),
|
|
},
|
|
Layout {
|
|
size: Size(4 bytes),
|
|
align: AbiAndPrefAlign {
|
|
abi: Align(4 bytes),
|
|
pref: $PREF_ALIGN,
|
|
},
|
|
abi: Aggregate {
|
|
sized: true,
|
|
},
|
|
fields: Arbitrary {
|
|
offsets: [
|
|
Size(4 bytes),
|
|
],
|
|
memory_index: [
|
|
0,
|
|
],
|
|
},
|
|
largest_niche: None,
|
|
variants: Single {
|
|
index: 1,
|
|
},
|
|
max_repr_align: None,
|
|
unadjusted_abi_align: Align(4 bytes),
|
|
},
|
|
Layout {
|
|
size: Size(2 bytes),
|
|
align: AbiAndPrefAlign {
|
|
abi: Align(1 bytes),
|
|
pref: $PREF_ALIGN,
|
|
},
|
|
abi: Aggregate {
|
|
sized: true,
|
|
},
|
|
fields: Arbitrary {
|
|
offsets: [
|
|
Size(1 bytes),
|
|
],
|
|
memory_index: [
|
|
0,
|
|
],
|
|
},
|
|
largest_niche: Some(
|
|
Niche {
|
|
offset: Size(1 bytes),
|
|
value: Int(
|
|
I8,
|
|
false,
|
|
),
|
|
valid_range: 0..=1,
|
|
},
|
|
),
|
|
variants: Single {
|
|
index: 2,
|
|
},
|
|
max_repr_align: None,
|
|
unadjusted_abi_align: Align(1 bytes),
|
|
},
|
|
],
|
|
},
|
|
max_repr_align: None,
|
|
unadjusted_abi_align: Align(4 bytes),
|
|
}
|
|
--> $DIR/zero-sized-array-enum-niche.rs:21:1
|
|
|
|
|
LL | enum MultipleAlignments {
|
|
| ^^^^^^^^^^^^^^^^^^^^^^^
|
|
|
|
error: layout_of(Result<[u32; 0], Packed<NonZeroU16>>) = Layout {
|
|
size: Size(4 bytes),
|
|
align: AbiAndPrefAlign {
|
|
abi: Align(4 bytes),
|
|
pref: $PREF_ALIGN,
|
|
},
|
|
abi: Aggregate {
|
|
sized: true,
|
|
},
|
|
fields: Arbitrary {
|
|
offsets: [
|
|
Size(0 bytes),
|
|
],
|
|
memory_index: [
|
|
0,
|
|
],
|
|
},
|
|
largest_niche: Some(
|
|
Niche {
|
|
offset: Size(0 bytes),
|
|
value: Int(
|
|
I8,
|
|
false,
|
|
),
|
|
valid_range: 0..=1,
|
|
},
|
|
),
|
|
variants: Multiple {
|
|
tag: Initialized {
|
|
value: Int(
|
|
I8,
|
|
false,
|
|
),
|
|
valid_range: 0..=1,
|
|
},
|
|
tag_encoding: Direct,
|
|
tag_field: 0,
|
|
variants: [
|
|
Layout {
|
|
size: Size(4 bytes),
|
|
align: AbiAndPrefAlign {
|
|
abi: Align(4 bytes),
|
|
pref: $PREF_ALIGN,
|
|
},
|
|
abi: Aggregate {
|
|
sized: true,
|
|
},
|
|
fields: Arbitrary {
|
|
offsets: [
|
|
Size(4 bytes),
|
|
],
|
|
memory_index: [
|
|
0,
|
|
],
|
|
},
|
|
largest_niche: None,
|
|
variants: Single {
|
|
index: 0,
|
|
},
|
|
max_repr_align: None,
|
|
unadjusted_abi_align: Align(4 bytes),
|
|
},
|
|
Layout {
|
|
size: Size(3 bytes),
|
|
align: AbiAndPrefAlign {
|
|
abi: Align(1 bytes),
|
|
pref: $PREF_ALIGN,
|
|
},
|
|
abi: Aggregate {
|
|
sized: true,
|
|
},
|
|
fields: Arbitrary {
|
|
offsets: [
|
|
Size(1 bytes),
|
|
],
|
|
memory_index: [
|
|
0,
|
|
],
|
|
},
|
|
largest_niche: Some(
|
|
Niche {
|
|
offset: Size(1 bytes),
|
|
value: Int(
|
|
I16,
|
|
false,
|
|
),
|
|
valid_range: 1..=65535,
|
|
},
|
|
),
|
|
variants: Single {
|
|
index: 1,
|
|
},
|
|
max_repr_align: None,
|
|
unadjusted_abi_align: Align(1 bytes),
|
|
},
|
|
],
|
|
},
|
|
max_repr_align: None,
|
|
unadjusted_abi_align: Align(4 bytes),
|
|
}
|
|
--> $DIR/zero-sized-array-enum-niche.rs:37:1
|
|
|
|
|
LL | type NicheLosesToTagged = Result<[u32; 0], Packed<std::num::NonZeroU16>>;
|
|
| ^^^^^^^^^^^^^^^^^^^^^^^
|
|
|
|
error: layout_of(Result<[u32; 0], Packed<U16IsZero>>) = Layout {
|
|
size: Size(4 bytes),
|
|
align: AbiAndPrefAlign {
|
|
abi: Align(4 bytes),
|
|
pref: $PREF_ALIGN,
|
|
},
|
|
abi: Aggregate {
|
|
sized: true,
|
|
},
|
|
fields: Arbitrary {
|
|
offsets: [
|
|
Size(0 bytes),
|
|
],
|
|
memory_index: [
|
|
0,
|
|
],
|
|
},
|
|
largest_niche: Some(
|
|
Niche {
|
|
offset: Size(0 bytes),
|
|
value: Int(
|
|
I16,
|
|
false,
|
|
),
|
|
valid_range: 0..=1,
|
|
},
|
|
),
|
|
variants: Multiple {
|
|
tag: Initialized {
|
|
value: Int(
|
|
I16,
|
|
false,
|
|
),
|
|
valid_range: 0..=1,
|
|
},
|
|
tag_encoding: Niche {
|
|
untagged_variant: 1,
|
|
niche_variants: 0..=0,
|
|
niche_start: 1,
|
|
},
|
|
tag_field: 0,
|
|
variants: [
|
|
Layout {
|
|
size: Size(0 bytes),
|
|
align: AbiAndPrefAlign {
|
|
abi: Align(4 bytes),
|
|
pref: $PREF_ALIGN,
|
|
},
|
|
abi: Aggregate {
|
|
sized: true,
|
|
},
|
|
fields: Arbitrary {
|
|
offsets: [
|
|
Size(0 bytes),
|
|
],
|
|
memory_index: [
|
|
0,
|
|
],
|
|
},
|
|
largest_niche: None,
|
|
variants: Single {
|
|
index: 0,
|
|
},
|
|
max_repr_align: None,
|
|
unadjusted_abi_align: Align(4 bytes),
|
|
},
|
|
Layout {
|
|
size: Size(2 bytes),
|
|
align: AbiAndPrefAlign {
|
|
abi: Align(1 bytes),
|
|
pref: $PREF_ALIGN,
|
|
},
|
|
abi: Aggregate {
|
|
sized: true,
|
|
},
|
|
fields: Arbitrary {
|
|
offsets: [
|
|
Size(0 bytes),
|
|
],
|
|
memory_index: [
|
|
0,
|
|
],
|
|
},
|
|
largest_niche: Some(
|
|
Niche {
|
|
offset: Size(0 bytes),
|
|
value: Int(
|
|
I16,
|
|
false,
|
|
),
|
|
valid_range: 0..=0,
|
|
},
|
|
),
|
|
variants: Single {
|
|
index: 1,
|
|
},
|
|
max_repr_align: None,
|
|
unadjusted_abi_align: Align(1 bytes),
|
|
},
|
|
],
|
|
},
|
|
max_repr_align: None,
|
|
unadjusted_abi_align: Align(4 bytes),
|
|
}
|
|
--> $DIR/zero-sized-array-enum-niche.rs:44:1
|
|
|
|
|
LL | type NicheWinsOverTagged = Result<[u32; 0], Packed<U16IsZero>>;
|
|
| ^^^^^^^^^^^^^^^^^^^^^^^^
|
|
|
|
error: aborting due to 4 previous errors
|
|
|