Skip to content

Commit 4c1dbc3

Browse files
erikdesjardinserikdesjardins
committed
bless layout tests for has_repr_align in debug output
1 parent 00b3eca commit 4c1dbc3

6 files changed

+74
-0
lines changed

‎tests/ui/layout/debug.stderr

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ error: layout_of(E) = Layout {
5353
variants: Single {
5454
index: 0,
5555
},
56+
has_repr_align: false,
5657
},
5758
Layout {
5859
size: Size(12 bytes),
@@ -77,9 +78,11 @@ error: layout_of(E) = Layout {
7778
variants: Single {
7879
index: 1,
7980
},
81+
has_repr_align: false,
8082
},
8183
],
8284
},
85+
has_repr_align: false,
8386
}
8487
--> $DIR/debug.rs:7:1
8588
|
@@ -124,6 +127,7 @@ error: layout_of(S) = Layout {
124127
variants: Single {
125128
index: 0,
126129
},
130+
has_repr_align: false,
127131
}
128132
--> $DIR/debug.rs:10:1
129133
|
@@ -146,6 +150,7 @@ error: layout_of(U) = Layout {
146150
variants: Single {
147151
index: 0,
148152
},
153+
has_repr_align: false,
149154
}
150155
--> $DIR/debug.rs:13:1
151156
|
@@ -237,6 +242,7 @@ error: layout_of(std::result::Result<i32, i32>) = Layout {
237242
variants: Single {
238243
index: 0,
239244
},
245+
has_repr_align: false,
240246
},
241247
Layout {
242248
size: Size(8 bytes),
@@ -272,9 +278,11 @@ error: layout_of(std::result::Result<i32, i32>) = Layout {
272278
variants: Single {
273279
index: 1,
274280
},
281+
has_repr_align: false,
275282
},
276283
],
277284
},
285+
has_repr_align: false,
278286
}
279287
--> $DIR/debug.rs:16:1
280288
|
@@ -301,6 +309,7 @@ error: layout_of(i32) = Layout {
301309
variants: Single {
302310
index: 0,
303311
},
312+
has_repr_align: false,
304313
}
305314
--> $DIR/debug.rs:19:1
306315
|
@@ -323,6 +332,7 @@ error: layout_of(V) = Layout {
323332
variants: Single {
324333
index: 0,
325334
},
335+
has_repr_align: false,
326336
}
327337
--> $DIR/debug.rs:22:1
328338
|
@@ -345,6 +355,7 @@ error: layout_of(W) = Layout {
345355
variants: Single {
346356
index: 0,
347357
},
358+
has_repr_align: false,
348359
}
349360
--> $DIR/debug.rs:28:1
350361
|
@@ -367,6 +378,7 @@ error: layout_of(Y) = Layout {
367378
variants: Single {
368379
index: 0,
369380
},
381+
has_repr_align: false,
370382
}
371383
--> $DIR/debug.rs:34:1
372384
|
@@ -389,6 +401,7 @@ error: layout_of(P1) = Layout {
389401
variants: Single {
390402
index: 0,
391403
},
404+
has_repr_align: false,
392405
}
393406
--> $DIR/debug.rs:41:1
394407
|
@@ -411,6 +424,7 @@ error: layout_of(P2) = Layout {
411424
variants: Single {
412425
index: 0,
413426
},
427+
has_repr_align: false,
414428
}
415429
--> $DIR/debug.rs:45:1
416430
|
@@ -433,6 +447,7 @@ error: layout_of(P3) = Layout {
433447
variants: Single {
434448
index: 0,
435449
},
450+
has_repr_align: false,
436451
}
437452
--> $DIR/debug.rs:53:1
438453
|
@@ -455,6 +470,7 @@ error: layout_of(P4) = Layout {
455470
variants: Single {
456471
index: 0,
457472
},
473+
has_repr_align: false,
458474
}
459475
--> $DIR/debug.rs:57:1
460476
|
@@ -482,6 +498,7 @@ error: layout_of(P5) = Layout {
482498
variants: Single {
483499
index: 0,
484500
},
501+
has_repr_align: false,
485502
}
486503
--> $DIR/debug.rs:61:1
487504
|
@@ -509,6 +526,7 @@ error: layout_of(std::mem::MaybeUninit<u8>) = Layout {
509526
variants: Single {
510527
index: 0,
511528
},
529+
has_repr_align: false,
512530
}
513531
--> $DIR/debug.rs:64:1
514532
|

‎tests/ui/layout/hexagon-enum.stderr

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,11 @@ error: layout_of(A) = Layout {
5959
variants: Single {
6060
index: 0,
6161
},
62+
has_repr_align: false,
6263
},
6364
],
6465
},
66+
has_repr_align: false,
6567
}
6668
--> $DIR/hexagon-enum.rs:16:1
6769
|
@@ -129,9 +131,11 @@ error: layout_of(B) = Layout {
129131
variants: Single {
130132
index: 0,
131133
},
134+
has_repr_align: false,
132135
},
133136
],
134137
},
138+
has_repr_align: false,
135139
}
136140
--> $DIR/hexagon-enum.rs:20:1
137141
|
@@ -199,9 +203,11 @@ error: layout_of(C) = Layout {
199203
variants: Single {
200204
index: 0,
201205
},
206+
has_repr_align: false,
202207
},
203208
],
204209
},
210+
has_repr_align: false,
205211
}
206212
--> $DIR/hexagon-enum.rs:24:1
207213
|
@@ -269,9 +275,11 @@ error: layout_of(P) = Layout {
269275
variants: Single {
270276
index: 0,
271277
},
278+
has_repr_align: false,
272279
},
273280
],
274281
},
282+
has_repr_align: false,
275283
}
276284
--> $DIR/hexagon-enum.rs:28:1
277285
|
@@ -339,9 +347,11 @@ error: layout_of(T) = Layout {
339347
variants: Single {
340348
index: 0,
341349
},
350+
has_repr_align: false,
342351
},
343352
],
344353
},
354+
has_repr_align: false,
345355
}
346356
--> $DIR/hexagon-enum.rs:34:1
347357
|

‎tests/ui/layout/issue-96158-scalarpair-payload-might-be-uninit.stderr

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ error: layout_of(MissingPayloadField) = Layout {
8181
variants: Single {
8282
index: 0,
8383
},
84+
has_repr_align: false,
8485
},
8586
Layout {
8687
size: Size(1 bytes),
@@ -99,9 +100,11 @@ error: layout_of(MissingPayloadField) = Layout {
99100
variants: Single {
100101
index: 1,
101102
},
103+
has_repr_align: false,
102104
},
103105
],
104106
},
107+
has_repr_align: false,
105108
}
106109
--> $DIR/issue-96158-scalarpair-payload-might-be-uninit.rs:16:1
107110
|
@@ -193,6 +196,7 @@ error: layout_of(CommonPayloadField) = Layout {
193196
variants: Single {
194197
index: 0,
195198
},
199+
has_repr_align: false,
196200
},
197201
Layout {
198202
size: Size(2 bytes),
@@ -228,9 +232,11 @@ error: layout_of(CommonPayloadField) = Layout {
228232
variants: Single {
229233
index: 1,
230234
},
235+
has_repr_align: false,
231236
},
232237
],
233238
},
239+
has_repr_align: false,
234240
}
235241
--> $DIR/issue-96158-scalarpair-payload-might-be-uninit.rs:25:1
236242
|
@@ -320,6 +326,7 @@ error: layout_of(CommonPayloadFieldIsMaybeUninit) = Layout {
320326
variants: Single {
321327
index: 0,
322328
},
329+
has_repr_align: false,
323330
},
324331
Layout {
325332
size: Size(2 bytes),
@@ -354,9 +361,11 @@ error: layout_of(CommonPayloadFieldIsMaybeUninit) = Layout {
354361
variants: Single {
355362
index: 1,
356363
},
364+
has_repr_align: false,
357365
},
358366
],
359367
},
368+
has_repr_align: false,
360369
}
361370
--> $DIR/issue-96158-scalarpair-payload-might-be-uninit.rs:33:1
362371
|
@@ -462,6 +471,7 @@ error: layout_of(NicheFirst) = Layout {
462471
variants: Single {
463472
index: 0,
464473
},
474+
has_repr_align: false,
465475
},
466476
Layout {
467477
size: Size(0 bytes),
@@ -480,6 +490,7 @@ error: layout_of(NicheFirst) = Layout {
480490
variants: Single {
481491
index: 1,
482492
},
493+
has_repr_align: false,
483494
},
484495
Layout {
485496
size: Size(0 bytes),
@@ -498,9 +509,11 @@ error: layout_of(NicheFirst) = Layout {
498509
variants: Single {
499510
index: 2,
500511
},
512+
has_repr_align: false,
501513
},
502514
],
503515
},
516+
has_repr_align: false,
504517
}
505518
--> $DIR/issue-96158-scalarpair-payload-might-be-uninit.rs:41:1
506519
|
@@ -606,6 +619,7 @@ error: layout_of(NicheSecond) = Layout {
606619
variants: Single {
607620
index: 0,
608621
},
622+
has_repr_align: false,
609623
},
610624
Layout {
611625
size: Size(0 bytes),
@@ -624,6 +638,7 @@ error: layout_of(NicheSecond) = Layout {
624638
variants: Single {
625639
index: 1,
626640
},
641+
has_repr_align: false,
627642
},
628643
Layout {
629644
size: Size(0 bytes),
@@ -642,9 +657,11 @@ error: layout_of(NicheSecond) = Layout {
642657
variants: Single {
643658
index: 2,
644659
},
660+
has_repr_align: false,
645661
},
646662
],
647663
},
664+
has_repr_align: false,
648665
}
649666
--> $DIR/issue-96158-scalarpair-payload-might-be-uninit.rs:50:1
650667
|

‎tests/ui/layout/issue-96185-overaligned-enum.stderr

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ error: layout_of(Aligned1) = Layout {
5353
variants: Single {
5454
index: 0,
5555
},
56+
has_repr_align: true,
5657
},
5758
Layout {
5859
size: Size(8 bytes),
@@ -71,9 +72,11 @@ error: layout_of(Aligned1) = Layout {
7172
variants: Single {
7273
index: 1,
7374
},
75+
has_repr_align: true,
7476
},
7577
],
7678
},
79+
has_repr_align: true,
7780
}
7881
--> $DIR/issue-96185-overaligned-enum.rs:8:1
7982
|
@@ -141,6 +144,7 @@ error: layout_of(Aligned2) = Layout {
141144
variants: Single {
142145
index: 0,
143146
},
147+
has_repr_align: true,
144148
},
145149
Layout {
146150
size: Size(1 bytes),
@@ -159,9 +163,11 @@ error: layout_of(Aligned2) = Layout {
159163
variants: Single {
160164
index: 1,
161165
},
166+
has_repr_align: true,
162167
},
163168
],
164169
},
170+
has_repr_align: true,
165171
}
166172
--> $DIR/issue-96185-overaligned-enum.rs:16:1
167173
|

0 commit comments

Comments
 (0)