Skip to content

Commit 6ff9b16

Browse files
zachs18zachs18
committed
Update ui tests that changed debug output.
1 parent 134235b commit 6ff9b16

6 files changed

+209
-26
lines changed

‎tests/ui/layout/debug.stderr

+4-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,9 @@ error: layout_of(E) = Layout {
7171
abi: Align(4 bytes),
7272
pref: $SOME_ALIGN,
7373
},
74-
abi: Uninhabited,
74+
abi: Memory {
75+
sized: true,
76+
},
7577
fields: Arbitrary {
7678
offsets: [
7779
Size(4 bytes),
@@ -85,6 +87,7 @@ error: layout_of(E) = Layout {
8587
],
8688
},
8789
largest_niche: None,
90+
uninhabited: true,
8891
variants: Single {
8992
index: 1,
9093
},

‎tests/ui/repr/repr-c-dead-variants.aarch64-unknown-linux-gnu.stderr

+41-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,15 @@ error: layout_of(Univariant) = Layout {
44
abi: Align(4 bytes),
55
pref: $SOME_ALIGN,
66
},
7-
abi: Uninhabited,
7+
abi: Scalar(
8+
Initialized {
9+
value: Int(
10+
I32,
11+
false,
12+
),
13+
valid_range: 0..=0,
14+
},
15+
),
816
fields: Arbitrary {
917
offsets: [
1018
Size(0 bytes),
@@ -23,6 +31,7 @@ error: layout_of(Univariant) = Layout {
2331
valid_range: 0..=0,
2432
},
2533
),
34+
uninhabited: true,
2635
variants: Multiple {
2736
tag: Initialized {
2837
value: Int(
@@ -40,7 +49,15 @@ error: layout_of(Univariant) = Layout {
4049
abi: Align(4 bytes),
4150
pref: $SOME_ALIGN,
4251
},
43-
abi: Uninhabited,
52+
abi: Scalar(
53+
Initialized {
54+
value: Int(
55+
I32,
56+
false,
57+
),
58+
valid_range: 0..=0,
59+
},
60+
),
4461
fields: Arbitrary {
4562
offsets: [
4663
Size(4 bytes),
@@ -50,6 +67,7 @@ error: layout_of(Univariant) = Layout {
5067
],
5168
},
5269
largest_niche: None,
70+
uninhabited: true,
5371
variants: Single {
5472
index: 0,
5573
},
@@ -120,12 +138,26 @@ error: layout_of(TwoVariants) = Layout {
120138
tag_field: 0,
121139
variants: [
122140
Layout {
123-
size: Size(4 bytes),
141+
size: Size(8 bytes),
124142
align: AbiAndPrefAlign {
125143
abi: Align(4 bytes),
126144
pref: $SOME_ALIGN,
127145
},
128-
abi: Uninhabited,
146+
abi: ScalarPair(
147+
Initialized {
148+
value: Int(
149+
I32,
150+
false,
151+
),
152+
valid_range: 0..=1,
153+
},
154+
Union {
155+
value: Int(
156+
I8,
157+
false,
158+
),
159+
},
160+
),
129161
fields: Arbitrary {
130162
offsets: [
131163
Size(4 bytes),
@@ -135,6 +167,7 @@ error: layout_of(TwoVariants) = Layout {
135167
],
136168
},
137169
largest_niche: None,
170+
uninhabited: true,
138171
variants: Single {
139172
index: 0,
140173
},
@@ -236,7 +269,9 @@ error: layout_of(DeadBranchHasOtherField) = Layout {
236269
abi: Align(8 bytes),
237270
pref: $SOME_ALIGN,
238271
},
239-
abi: Uninhabited,
272+
abi: Memory {
273+
sized: true,
274+
},
240275
fields: Arbitrary {
241276
offsets: [
242277
Size(8 bytes),
@@ -248,6 +283,7 @@ error: layout_of(DeadBranchHasOtherField) = Layout {
248283
],
249284
},
250285
largest_niche: None,
286+
uninhabited: true,
251287
variants: Single {
252288
index: 0,
253289
},

‎tests/ui/repr/repr-c-dead-variants.armebv7r-none-eabi.stderr

+41-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,15 @@ error: layout_of(Univariant) = Layout {
44
abi: Align(1 bytes),
55
pref: $SOME_ALIGN,
66
},
7-
abi: Uninhabited,
7+
abi: Scalar(
8+
Initialized {
9+
value: Int(
10+
I8,
11+
false,
12+
),
13+
valid_range: 0..=0,
14+
},
15+
),
816
fields: Arbitrary {
917
offsets: [
1018
Size(0 bytes),
@@ -23,6 +31,7 @@ error: layout_of(Univariant) = Layout {
2331
valid_range: 0..=0,
2432
},
2533
),
34+
uninhabited: true,
2635
variants: Multiple {
2736
tag: Initialized {
2837
value: Int(
@@ -40,7 +49,15 @@ error: layout_of(Univariant) = Layout {
4049
abi: Align(1 bytes),
4150
pref: $SOME_ALIGN,
4251
},
43-
abi: Uninhabited,
52+
abi: Scalar(
53+
Initialized {
54+
value: Int(
55+
I8,
56+
false,
57+
),
58+
valid_range: 0..=0,
59+
},
60+
),
4461
fields: Arbitrary {
4562
offsets: [
4663
Size(1 bytes),
@@ -50,6 +67,7 @@ error: layout_of(Univariant) = Layout {
5067
],
5168
},
5269
largest_niche: None,
70+
uninhabited: true,
5371
variants: Single {
5472
index: 0,
5573
},
@@ -120,12 +138,26 @@ error: layout_of(TwoVariants) = Layout {
120138
tag_field: 0,
121139
variants: [
122140
Layout {
123-
size: Size(1 bytes),
141+
size: Size(2 bytes),
124142
align: AbiAndPrefAlign {
125143
abi: Align(1 bytes),
126144
pref: $SOME_ALIGN,
127145
},
128-
abi: Uninhabited,
146+
abi: ScalarPair(
147+
Initialized {
148+
value: Int(
149+
I8,
150+
false,
151+
),
152+
valid_range: 0..=1,
153+
},
154+
Union {
155+
value: Int(
156+
I8,
157+
false,
158+
),
159+
},
160+
),
129161
fields: Arbitrary {
130162
offsets: [
131163
Size(1 bytes),
@@ -135,6 +167,7 @@ error: layout_of(TwoVariants) = Layout {
135167
],
136168
},
137169
largest_niche: None,
170+
uninhabited: true,
138171
variants: Single {
139172
index: 0,
140173
},
@@ -236,7 +269,9 @@ error: layout_of(DeadBranchHasOtherField) = Layout {
236269
abi: Align(8 bytes),
237270
pref: $SOME_ALIGN,
238271
},
239-
abi: Uninhabited,
272+
abi: Memory {
273+
sized: true,
274+
},
240275
fields: Arbitrary {
241276
offsets: [
242277
Size(8 bytes),
@@ -248,6 +283,7 @@ error: layout_of(DeadBranchHasOtherField) = Layout {
248283
],
249284
},
250285
largest_niche: None,
286+
uninhabited: true,
251287
variants: Single {
252288
index: 0,
253289
},

‎tests/ui/repr/repr-c-dead-variants.i686-pc-windows-msvc.stderr

+41-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,15 @@ error: layout_of(Univariant) = Layout {
44
abi: Align(4 bytes),
55
pref: $SOME_ALIGN,
66
},
7-
abi: Uninhabited,
7+
abi: Scalar(
8+
Initialized {
9+
value: Int(
10+
I32,
11+
false,
12+
),
13+
valid_range: 0..=0,
14+
},
15+
),
816
fields: Arbitrary {
917
offsets: [
1018
Size(0 bytes),
@@ -23,6 +31,7 @@ error: layout_of(Univariant) = Layout {
2331
valid_range: 0..=0,
2432
},
2533
),
34+
uninhabited: true,
2635
variants: Multiple {
2736
tag: Initialized {
2837
value: Int(
@@ -40,7 +49,15 @@ error: layout_of(Univariant) = Layout {
4049
abi: Align(4 bytes),
4150
pref: $SOME_ALIGN,
4251
},
43-
abi: Uninhabited,
52+
abi: Scalar(
53+
Initialized {
54+
value: Int(
55+
I32,
56+
false,
57+
),
58+
valid_range: 0..=0,
59+
},
60+
),
4461
fields: Arbitrary {
4562
offsets: [
4663
Size(4 bytes),
@@ -50,6 +67,7 @@ error: layout_of(Univariant) = Layout {
5067
],
5168
},
5269
largest_niche: None,
70+
uninhabited: true,
5371
variants: Single {
5472
index: 0,
5573
},
@@ -120,12 +138,26 @@ error: layout_of(TwoVariants) = Layout {
120138
tag_field: 0,
121139
variants: [
122140
Layout {
123-
size: Size(4 bytes),
141+
size: Size(8 bytes),
124142
align: AbiAndPrefAlign {
125143
abi: Align(4 bytes),
126144
pref: $SOME_ALIGN,
127145
},
128-
abi: Uninhabited,
146+
abi: ScalarPair(
147+
Initialized {
148+
value: Int(
149+
I32,
150+
false,
151+
),
152+
valid_range: 0..=1,
153+
},
154+
Union {
155+
value: Int(
156+
I8,
157+
false,
158+
),
159+
},
160+
),
129161
fields: Arbitrary {
130162
offsets: [
131163
Size(4 bytes),
@@ -135,6 +167,7 @@ error: layout_of(TwoVariants) = Layout {
135167
],
136168
},
137169
largest_niche: None,
170+
uninhabited: true,
138171
variants: Single {
139172
index: 0,
140173
},
@@ -236,7 +269,9 @@ error: layout_of(DeadBranchHasOtherField) = Layout {
236269
abi: Align(8 bytes),
237270
pref: $SOME_ALIGN,
238271
},
239-
abi: Uninhabited,
272+
abi: Memory {
273+
sized: true,
274+
},
240275
fields: Arbitrary {
241276
offsets: [
242277
Size(8 bytes),
@@ -248,6 +283,7 @@ error: layout_of(DeadBranchHasOtherField) = Layout {
248283
],
249284
},
250285
largest_niche: None,
286+
uninhabited: true,
251287
variants: Single {
252288
index: 0,
253289
},

0 commit comments

Comments
 (0)