Skip to content

Commit 32e3232

Browse files
BoxyUwUBoxyUwU
committed
make type layout use display
1 parent 586a25a commit 32e3232

15 files changed

+66
-66
lines changed

‎compiler/rustc_ty_utils/src/layout.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -826,7 +826,7 @@ fn record_layout_for_printing_outlined<'tcx>(
826826

827827
// (delay format until we actually need it)
828828
let record = |kind, packed, opt_discr_size, variants| {
829-
let type_desc = format!("{:?}", layout.ty);
829+
let type_desc = format!("{}", layout.ty);
830830
cx.tcx.sess.code_stats.record_type_size(
831831
kind,
832832
type_desc,

‎tests/ui/print_type_sizes/async.stdout

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
print-type-size type: `Generator(DefId(0:7 ~ async[505d]::test::{closure#0}), [Adt(std::future::ResumeTy, []), Tuple([]), Tuple([]), GeneratorWitness(Binder([Adt(std::future::ResumeTy, []), Array(Uint(U8), Const { ty: Uint(Usize), kind: Value(Leaf(0x0000000000002000)) }), Generator(DefId(0:4 ~ async[505d]::wait::{closure#0}), [Adt(std::future::ResumeTy, []), Tuple([]), Tuple([]), GeneratorWitness(Binder([], [])), Tuple([])], Static), Tuple([])], [])), Tuple([Array(Uint(U8), Const { ty: Uint(Usize), kind: Value(Leaf(0x0000000000002000)) })])], Static)`: 16386 bytes, alignment: 1 bytes
1+
print-type-size type: `[async fn body@$DIR/async.rs:8:36: 11:2]`: 16386 bytes, alignment: 1 bytes
22
print-type-size discriminant: 1 bytes
33
print-type-size variant `Suspend0`: 16385 bytes
44
print-type-size field `.arg`: 8192 bytes, offset: 0 bytes, alignment: 1 bytes
@@ -10,24 +10,24 @@ print-type-size variant `Returned`: 8192 bytes
1010
print-type-size field `.arg`: 8192 bytes, offset: 0 bytes, alignment: 1 bytes
1111
print-type-size variant `Panicked`: 8192 bytes
1212
print-type-size field `.arg`: 8192 bytes, offset: 0 bytes, alignment: 1 bytes
13-
print-type-size type: `Adt(std::mem::ManuallyDrop, [Array(Uint(U8), Const { ty: Uint(Usize), kind: Value(Leaf(0x0000000000002000)) })])`: 8192 bytes, alignment: 1 bytes
13+
print-type-size type: `ManuallyDrop<[u8; 8192]>`: 8192 bytes, alignment: 1 bytes
1414
print-type-size field `.value`: 8192 bytes
15-
print-type-size type: `Adt(std::mem::MaybeUninit, [Array(Uint(U8), Const { ty: Uint(Usize), kind: Value(Leaf(0x0000000000002000)) })])`: 8192 bytes, alignment: 1 bytes
15+
print-type-size type: `MaybeUninit<[u8; 8192]>`: 8192 bytes, alignment: 1 bytes
1616
print-type-size variant `MaybeUninit`: 8192 bytes
1717
print-type-size field `.uninit`: 0 bytes
1818
print-type-size field `.value`: 8192 bytes
19-
print-type-size type: `Adt(std::mem::ManuallyDrop, [Generator(DefId(0:4 ~ async[505d]::wait::{closure#0}), [Adt(std::future::ResumeTy, []), Tuple([]), Tuple([]), GeneratorWitness(Binder([], [])), Tuple([])], Static)])`: 1 bytes, alignment: 1 bytes
19+
print-type-size type: `ManuallyDrop<[async fn body@$DIR/async.rs:6:17: 6:19]>`: 1 bytes, alignment: 1 bytes
2020
print-type-size field `.value`: 1 bytes
21-
print-type-size type: `Adt(std::mem::MaybeUninit, [Generator(DefId(0:4 ~ async[505d]::wait::{closure#0}), [Adt(std::future::ResumeTy, []), Tuple([]), Tuple([]), GeneratorWitness(Binder([], [])), Tuple([])], Static)])`: 1 bytes, alignment: 1 bytes
21+
print-type-size type: `MaybeUninit<[async fn body@$DIR/async.rs:6:17: 6:19]>`: 1 bytes, alignment: 1 bytes
2222
print-type-size variant `MaybeUninit`: 1 bytes
2323
print-type-size field `.uninit`: 0 bytes
2424
print-type-size field `.value`: 1 bytes
25-
print-type-size type: `Adt(std::task::Poll, [Tuple([])])`: 1 bytes, alignment: 1 bytes
25+
print-type-size type: `Poll<()>`: 1 bytes, alignment: 1 bytes
2626
print-type-size discriminant: 1 bytes
2727
print-type-size variant `Ready`: 0 bytes
2828
print-type-size field `.0`: 0 bytes
2929
print-type-size variant `Pending`: 0 bytes
30-
print-type-size type: `Generator(DefId(0:4 ~ async[505d]::wait::{closure#0}), [Adt(std::future::ResumeTy, []), Tuple([]), Tuple([]), GeneratorWitness(Binder([], [])), Tuple([])], Static)`: 1 bytes, alignment: 1 bytes
30+
print-type-size type: `[async fn body@$DIR/async.rs:6:17: 6:19]`: 1 bytes, alignment: 1 bytes
3131
print-type-size discriminant: 1 bytes
3232
print-type-size variant `Unresumed`: 0 bytes
3333
print-type-size variant `Returned`: 0 bytes

‎tests/ui/print_type_sizes/generator.stdout

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
print-type-size type: `Generator(DefId(0:7 ~ generator[151b]::generator::{closure#0}), [Const { ty: Uint(Usize), kind: Value(Leaf(0x0000000000002000)) }, Tuple([]), Tuple([]), Tuple([]), GeneratorWitness(Binder([Tuple([])], [])), Tuple([Array(Uint(U8), Const { ty: Uint(Usize), kind: Value(Leaf(0x0000000000002000)) })])], Movable)`: 8193 bytes, alignment: 1 bytes
1+
print-type-size type: `[generator@$DIR/generator.rs:10:5: 10:14]`: 8193 bytes, alignment: 1 bytes
22
print-type-size discriminant: 1 bytes
33
print-type-size variant `Unresumed`: 8192 bytes
44
print-type-size field `.array`: 8192 bytes, offset: 0 bytes, alignment: 1 bytes

‎tests/ui/print_type_sizes/generator_discr_placement.stdout

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
print-type-size type: `Generator(DefId(0:4 ~ generator_discr_placement[c59c]::foo::{closure#0}), [Tuple([]), Tuple([]), Tuple([]), GeneratorWitness(Binder([Int(I32), Tuple([])], [])), Tuple([])], Movable)`: 8 bytes, alignment: 4 bytes
1+
print-type-size type: `[generator@$DIR/generator_discr_placement.rs:11:13: 11:15]`: 8 bytes, alignment: 4 bytes
22
print-type-size discriminant: 1 bytes
33
print-type-size variant `Suspend0`: 7 bytes
44
print-type-size padding: 3 bytes

‎tests/ui/print_type_sizes/generics.stdout

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
print-type-size type: `Adt(Pair, [Adt(FiftyBytes, [])])`: 100 bytes, alignment: 1 bytes
1+
print-type-size type: `Pair<FiftyBytes>`: 100 bytes, alignment: 1 bytes
22
print-type-size field `._car`: 50 bytes
33
print-type-size field `._cdr`: 50 bytes
4-
print-type-size type: `Adt(FiftyBytes, [])`: 50 bytes, alignment: 1 bytes
4+
print-type-size type: `FiftyBytes`: 50 bytes, alignment: 1 bytes
55
print-type-size field `.0`: 50 bytes
6-
print-type-size type: `Adt(Pair, [Adt(SevenBytes, [])])`: 14 bytes, alignment: 1 bytes
6+
print-type-size type: `Pair<SevenBytes>`: 14 bytes, alignment: 1 bytes
77
print-type-size field `._car`: 7 bytes
88
print-type-size field `._cdr`: 7 bytes
9-
print-type-size type: `Adt(SevenBytes, [])`: 7 bytes, alignment: 1 bytes
9+
print-type-size type: `SevenBytes`: 7 bytes, alignment: 1 bytes
1010
print-type-size field `.0`: 7 bytes
11-
print-type-size type: `Adt(Pair, [Uint(U8)])`: 2 bytes, alignment: 1 bytes
11+
print-type-size type: `Pair<u8>`: 2 bytes, alignment: 1 bytes
1212
print-type-size field `._car`: 1 bytes
1313
print-type-size field `._cdr`: 1 bytes
14-
print-type-size type: `Adt(ZeroSized, [])`: 0 bytes, alignment: 1 bytes
14+
print-type-size type: `ZeroSized`: 0 bytes, alignment: 1 bytes

‎tests/ui/print_type_sizes/multiple_types.stdout

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
print-type-size type: `Adt(Enum, [])`: 51 bytes, alignment: 1 bytes
1+
print-type-size type: `Enum`: 51 bytes, alignment: 1 bytes
22
print-type-size discriminant: 1 bytes
33
print-type-size variant `Large`: 50 bytes
44
print-type-size field `.0`: 50 bytes
55
print-type-size variant `Small`: 7 bytes
66
print-type-size field `.0`: 7 bytes
7-
print-type-size type: `Adt(FiftyBytes, [])`: 50 bytes, alignment: 1 bytes
7+
print-type-size type: `FiftyBytes`: 50 bytes, alignment: 1 bytes
88
print-type-size field `.0`: 50 bytes
9-
print-type-size type: `Adt(SevenBytes, [])`: 7 bytes, alignment: 1 bytes
9+
print-type-size type: `SevenBytes`: 7 bytes, alignment: 1 bytes
1010
print-type-size field `.0`: 7 bytes

‎tests/ui/print_type_sizes/niche-filling.stdout

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
1-
print-type-size type: `Adt(IndirectNonZero, [])`: 12 bytes, alignment: 4 bytes
1+
print-type-size type: `IndirectNonZero`: 12 bytes, alignment: 4 bytes
22
print-type-size field `.nested`: 8 bytes
33
print-type-size field `.post`: 2 bytes
44
print-type-size field `.pre`: 1 bytes
55
print-type-size end padding: 1 bytes
6-
print-type-size type: `Adt(MyOption, [Adt(IndirectNonZero, [])])`: 12 bytes, alignment: 4 bytes
6+
print-type-size type: `MyOption<IndirectNonZero>`: 12 bytes, alignment: 4 bytes
77
print-type-size variant `Some`: 12 bytes
88
print-type-size field `.0`: 12 bytes
99
print-type-size variant `None`: 0 bytes
10-
print-type-size type: `Adt(EmbeddedDiscr, [])`: 8 bytes, alignment: 4 bytes
10+
print-type-size type: `EmbeddedDiscr`: 8 bytes, alignment: 4 bytes
1111
print-type-size discriminant: 1 bytes
1212
print-type-size variant `Record`: 7 bytes
1313
print-type-size field `.pre`: 1 bytes
1414
print-type-size field `.post`: 2 bytes
1515
print-type-size field `.val`: 4 bytes
1616
print-type-size variant `None`: 0 bytes
17-
print-type-size type: `Adt(MyOption, [Adt(Union1, [Adt(std::num::NonZeroU32, [])])])`: 8 bytes, alignment: 4 bytes
17+
print-type-size type: `MyOption<Union1<NonZeroU32>>`: 8 bytes, alignment: 4 bytes
1818
print-type-size discriminant: 4 bytes
1919
print-type-size variant `Some`: 4 bytes
2020
print-type-size field `.0`: 4 bytes
2121
print-type-size variant `None`: 0 bytes
22-
print-type-size type: `Adt(MyOption, [Adt(Union2, [Adt(std::num::NonZeroU32, []), Adt(std::num::NonZeroU32, [])])])`: 8 bytes, alignment: 4 bytes
22+
print-type-size type: `MyOption<Union2<NonZeroU32, NonZeroU32>>`: 8 bytes, alignment: 4 bytes
2323
print-type-size discriminant: 4 bytes
2424
print-type-size variant `Some`: 4 bytes
2525
print-type-size field `.0`: 4 bytes
2626
print-type-size variant `None`: 0 bytes
27-
print-type-size type: `Adt(MyOption, [Adt(Union2, [Adt(std::num::NonZeroU32, []), Uint(U32)])])`: 8 bytes, alignment: 4 bytes
27+
print-type-size type: `MyOption<Union2<NonZeroU32, u32>>`: 8 bytes, alignment: 4 bytes
2828
print-type-size discriminant: 4 bytes
2929
print-type-size variant `Some`: 4 bytes
3030
print-type-size field `.0`: 4 bytes
3131
print-type-size variant `None`: 0 bytes
32-
print-type-size type: `Adt(NestedNonZero, [])`: 8 bytes, alignment: 4 bytes
32+
print-type-size type: `NestedNonZero`: 8 bytes, alignment: 4 bytes
3333
print-type-size field `.val`: 4 bytes
3434
print-type-size field `.post`: 2 bytes
3535
print-type-size field `.pre`: 1 bytes
3636
print-type-size end padding: 1 bytes
37-
print-type-size type: `Adt(Enum4, [Tuple([]), Char, Tuple([]), Tuple([])])`: 4 bytes, alignment: 4 bytes
37+
print-type-size type: `Enum4<(), char, (), ()>`: 4 bytes, alignment: 4 bytes
3838
print-type-size variant `Two`: 4 bytes
3939
print-type-size field `.0`: 4 bytes
4040
print-type-size variant `One`: 0 bytes
@@ -43,34 +43,34 @@ print-type-size variant `Three`: 0 bytes
4343
print-type-size field `.0`: 0 bytes
4444
print-type-size variant `Four`: 0 bytes
4545
print-type-size field `.0`: 0 bytes
46-
print-type-size type: `Adt(MyNotNegativeOne, [])`: 4 bytes, alignment: 4 bytes
46+
print-type-size type: `MyNotNegativeOne`: 4 bytes, alignment: 4 bytes
4747
print-type-size field `._i`: 4 bytes
48-
print-type-size type: `Adt(MyOption, [Adt(MyNotNegativeOne, [])])`: 4 bytes, alignment: 4 bytes
48+
print-type-size type: `MyOption<MyNotNegativeOne>`: 4 bytes, alignment: 4 bytes
4949
print-type-size variant `Some`: 4 bytes
5050
print-type-size field `.0`: 4 bytes
5151
print-type-size variant `None`: 0 bytes
52-
print-type-size type: `Adt(MyOption, [Adt(std::num::NonZeroU32, [])])`: 4 bytes, alignment: 4 bytes
52+
print-type-size type: `MyOption<NonZeroU32>`: 4 bytes, alignment: 4 bytes
5353
print-type-size variant `Some`: 4 bytes
5454
print-type-size field `.0`: 4 bytes
5555
print-type-size variant `None`: 0 bytes
56-
print-type-size type: `Adt(MyOption, [Char])`: 4 bytes, alignment: 4 bytes
56+
print-type-size type: `MyOption<char>`: 4 bytes, alignment: 4 bytes
5757
print-type-size variant `Some`: 4 bytes
5858
print-type-size field `.0`: 4 bytes
5959
print-type-size variant `None`: 0 bytes
60-
print-type-size type: `Adt(Union1, [Adt(std::num::NonZeroU32, [])])`: 4 bytes, alignment: 4 bytes
60+
print-type-size type: `NonZeroU32`: 4 bytes, alignment: 4 bytes
61+
print-type-size field `.0`: 4 bytes
62+
print-type-size type: `Union1<NonZeroU32>`: 4 bytes, alignment: 4 bytes
6163
print-type-size variant `Union1`: 4 bytes
6264
print-type-size field `.a`: 4 bytes
63-
print-type-size type: `Adt(Union2, [Adt(std::num::NonZeroU32, []), Adt(std::num::NonZeroU32, [])])`: 4 bytes, alignment: 4 bytes
65+
print-type-size type: `Union2<NonZeroU32, NonZeroU32>`: 4 bytes, alignment: 4 bytes
6466
print-type-size variant `Union2`: 4 bytes
6567
print-type-size field `.a`: 4 bytes
6668
print-type-size field `.b`: 4 bytes, offset: 0 bytes, alignment: 4 bytes
67-
print-type-size type: `Adt(Union2, [Adt(std::num::NonZeroU32, []), Uint(U32)])`: 4 bytes, alignment: 4 bytes
69+
print-type-size type: `Union2<NonZeroU32, u32>`: 4 bytes, alignment: 4 bytes
6870
print-type-size variant `Union2`: 4 bytes
6971
print-type-size field `.a`: 4 bytes
7072
print-type-size field `.b`: 4 bytes, offset: 0 bytes, alignment: 4 bytes
71-
print-type-size type: `Adt(std::num::NonZeroU32, [])`: 4 bytes, alignment: 4 bytes
72-
print-type-size field `.0`: 4 bytes
73-
print-type-size type: `Adt(Enum4, [Tuple([]), Tuple([]), Tuple([]), Adt(MyOption, [Uint(U8)])])`: 2 bytes, alignment: 1 bytes
73+
print-type-size type: `Enum4<(), (), (), MyOption<u8>>`: 2 bytes, alignment: 1 bytes
7474
print-type-size variant `Four`: 2 bytes
7575
print-type-size field `.0`: 2 bytes
7676
print-type-size variant `One`: 0 bytes
@@ -79,16 +79,16 @@ print-type-size variant `Two`: 0 bytes
7979
print-type-size field `.0`: 0 bytes
8080
print-type-size variant `Three`: 0 bytes
8181
print-type-size field `.0`: 0 bytes
82-
print-type-size type: `Adt(MyOption, [Adt(MyOption, [Uint(U8)])])`: 2 bytes, alignment: 1 bytes
82+
print-type-size type: `MyOption<MyOption<u8>>`: 2 bytes, alignment: 1 bytes
8383
print-type-size variant `Some`: 2 bytes
8484
print-type-size field `.0`: 2 bytes
8585
print-type-size variant `None`: 0 bytes
86-
print-type-size type: `Adt(MyOption, [Uint(U8)])`: 2 bytes, alignment: 1 bytes
86+
print-type-size type: `MyOption<u8>`: 2 bytes, alignment: 1 bytes
8787
print-type-size discriminant: 1 bytes
8888
print-type-size variant `Some`: 1 bytes
8989
print-type-size field `.0`: 1 bytes
9090
print-type-size variant `None`: 0 bytes
91-
print-type-size type: `Adt(Enum4, [Tuple([]), Tuple([]), Bool, Tuple([])])`: 1 bytes, alignment: 1 bytes
91+
print-type-size type: `Enum4<(), (), bool, ()>`: 1 bytes, alignment: 1 bytes
9292
print-type-size variant `Three`: 1 bytes
9393
print-type-size field `.0`: 1 bytes
9494
print-type-size variant `One`: 0 bytes
@@ -97,15 +97,15 @@ print-type-size variant `Two`: 0 bytes
9797
print-type-size field `.0`: 0 bytes
9898
print-type-size variant `Four`: 0 bytes
9999
print-type-size field `.0`: 0 bytes
100-
print-type-size type: `Adt(MyOption, [Adt(std::cmp::Ordering, [])])`: 1 bytes, alignment: 1 bytes
100+
print-type-size type: `MyOption<bool>`: 1 bytes, alignment: 1 bytes
101101
print-type-size variant `Some`: 1 bytes
102102
print-type-size field `.0`: 1 bytes
103103
print-type-size variant `None`: 0 bytes
104-
print-type-size type: `Adt(MyOption, [Bool])`: 1 bytes, alignment: 1 bytes
104+
print-type-size type: `MyOption<std::cmp::Ordering>`: 1 bytes, alignment: 1 bytes
105105
print-type-size variant `Some`: 1 bytes
106106
print-type-size field `.0`: 1 bytes
107107
print-type-size variant `None`: 0 bytes
108-
print-type-size type: `Adt(std::cmp::Ordering, [])`: 1 bytes, alignment: 1 bytes
108+
print-type-size type: `std::cmp::Ordering`: 1 bytes, alignment: 1 bytes
109109
print-type-size discriminant: 1 bytes
110110
print-type-size variant `Less`: 0 bytes
111111
print-type-size variant `Equal`: 0 bytes

‎tests/ui/print_type_sizes/no_duplicates.stdout

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
print-type-size type: `Adt(SevenBytes, [])`: 7 bytes, alignment: 1 bytes
1+
print-type-size type: `SevenBytes`: 7 bytes, alignment: 1 bytes
22
print-type-size field `.0`: 7 bytes

‎tests/ui/print_type_sizes/packed.stdout

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
print-type-size type: `Adt(Packed2C, [])`: 12 bytes, alignment: 2 bytes
1+
print-type-size type: `Packed2C`: 12 bytes, alignment: 2 bytes
22
print-type-size field `.a`: 1 bytes
33
print-type-size field `.b`: 1 bytes
44
print-type-size field `.g`: 4 bytes
@@ -7,22 +7,22 @@ print-type-size padding: 1 bytes
77
print-type-size field `.h`: 2 bytes
88
print-type-size field `.d`: 1 bytes
99
print-type-size end padding: 1 bytes
10-
print-type-size type: `Adt(Padded, [])`: 12 bytes, alignment: 4 bytes
10+
print-type-size type: `Padded`: 12 bytes, alignment: 4 bytes
1111
print-type-size field `.g`: 4 bytes
1212
print-type-size field `.h`: 2 bytes
1313
print-type-size field `.a`: 1 bytes
1414
print-type-size field `.b`: 1 bytes
1515
print-type-size field `.c`: 1 bytes
1616
print-type-size field `.d`: 1 bytes
1717
print-type-size end padding: 2 bytes
18-
print-type-size type: `Adt(Packed1, [])`: 10 bytes, alignment: 1 bytes
18+
print-type-size type: `Packed1`: 10 bytes, alignment: 1 bytes
1919
print-type-size field `.a`: 1 bytes
2020
print-type-size field `.b`: 1 bytes
2121
print-type-size field `.g`: 4 bytes
2222
print-type-size field `.c`: 1 bytes
2323
print-type-size field `.h`: 2 bytes
2424
print-type-size field `.d`: 1 bytes
25-
print-type-size type: `Adt(Packed2, [])`: 10 bytes, alignment: 2 bytes
25+
print-type-size type: `Packed2`: 10 bytes, alignment: 2 bytes
2626
print-type-size field `.g`: 4 bytes
2727
print-type-size field `.h`: 2 bytes
2828
print-type-size field `.a`: 1 bytes

‎tests/ui/print_type_sizes/padding.stdout

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
print-type-size type: `Adt(E1, [])`: 12 bytes, alignment: 4 bytes
1+
print-type-size type: `E1`: 12 bytes, alignment: 4 bytes
22
print-type-size discriminant: 1 bytes
33
print-type-size variant `B`: 11 bytes
44
print-type-size padding: 3 bytes
@@ -7,7 +7,7 @@ print-type-size variant `A`: 7 bytes
77
print-type-size field `.1`: 1 bytes
88
print-type-size padding: 2 bytes
99
print-type-size field `.0`: 4 bytes, alignment: 4 bytes
10-
print-type-size type: `Adt(E2, [])`: 12 bytes, alignment: 4 bytes
10+
print-type-size type: `E2`: 12 bytes, alignment: 4 bytes
1111
print-type-size discriminant: 1 bytes
1212
print-type-size variant `B`: 11 bytes
1313
print-type-size padding: 3 bytes
@@ -16,7 +16,7 @@ print-type-size variant `A`: 7 bytes
1616
print-type-size field `.0`: 1 bytes
1717
print-type-size padding: 2 bytes
1818
print-type-size field `.1`: 4 bytes, alignment: 4 bytes
19-
print-type-size type: `Adt(S, [])`: 8 bytes, alignment: 4 bytes
19+
print-type-size type: `S`: 8 bytes, alignment: 4 bytes
2020
print-type-size field `.g`: 4 bytes
2121
print-type-size field `.a`: 1 bytes
2222
print-type-size field `.b`: 1 bytes

‎tests/ui/print_type_sizes/repr-align.stdout

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
print-type-size type: `Adt(E, [])`: 32 bytes, alignment: 16 bytes
1+
print-type-size type: `E`: 32 bytes, alignment: 16 bytes
22
print-type-size discriminant: 4 bytes
33
print-type-size variant `B`: 28 bytes
44
print-type-size padding: 12 bytes
55
print-type-size field `.0`: 16 bytes, alignment: 16 bytes
66
print-type-size variant `A`: 4 bytes
77
print-type-size field `.0`: 4 bytes
8-
print-type-size type: `Adt(S, [])`: 32 bytes, alignment: 16 bytes
8+
print-type-size type: `S`: 32 bytes, alignment: 16 bytes
99
print-type-size field `.c`: 16 bytes
1010
print-type-size field `.a`: 4 bytes
1111
print-type-size field `.b`: 4 bytes
1212
print-type-size field `.d`: 1 bytes
1313
print-type-size end padding: 7 bytes
14-
print-type-size type: `Adt(A, [])`: 16 bytes, alignment: 16 bytes
14+
print-type-size type: `A`: 16 bytes, alignment: 16 bytes
1515
print-type-size field `.0`: 4 bytes
1616
print-type-size end padding: 12 bytes

‎tests/ui/print_type_sizes/repr_int_c.stdout

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
print-type-size type: `Adt(ReprCu8, [])`: 4 bytes, alignment: 2 bytes
1+
print-type-size type: `ReprCu8`: 4 bytes, alignment: 2 bytes
22
print-type-size discriminant: 1 bytes
33
print-type-size variant `A`: 3 bytes
44
print-type-size padding: 1 bytes
55
print-type-size field `.0`: 2 bytes, alignment: 2 bytes
66
print-type-size variant `B`: 1 bytes
7-
print-type-size type: `Adt(Repru8, [])`: 4 bytes, alignment: 2 bytes
7+
print-type-size type: `Repru8`: 4 bytes, alignment: 2 bytes
88
print-type-size discriminant: 1 bytes
99
print-type-size variant `A`: 3 bytes
1010
print-type-size padding: 1 bytes

‎tests/ui/print_type_sizes/uninhabited.stdout

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
print-type-size type: `Adt(std::result::Result, [Uint(U32), Never])`: 4 bytes, alignment: 4 bytes
1+
print-type-size type: `Result<u32, !>`: 4 bytes, alignment: 4 bytes
22
print-type-size variant `Ok`: 4 bytes
33
print-type-size field `.0`: 4 bytes
4-
print-type-size type: `Adt(std::option::Option, [Never])`: 0 bytes, alignment: 1 bytes
4+
print-type-size type: `Option<!>`: 0 bytes, alignment: 1 bytes
55
print-type-size variant `None`: 0 bytes
6-
print-type-size type: `Adt(std::result::Result, [Never, Never])`: 0 bytes, alignment: 1 bytes
6+
print-type-size type: `Result<!, !>`: 0 bytes, alignment: 1 bytes

0 commit comments

Comments
 (0)