Skip to content

Commit 4dcc1aa

Browse files
erikdesjardinserikdesjardins
committed
normalize out pref_align (copied from another test)
1 parent 1bbae50 commit 4dcc1aa

File tree

2 files changed

+23
-56
lines changed

2 files changed

+23
-56
lines changed

‎src/test/ui/layout/issue-96158-scalarpair-payload-might-be-uninit.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// normalize-stderr-test "pref: Align \{\n *pow2: [1-3],\n *\}" -> "pref: $$PREF_ALIGN"
12
#![crate_type = "lib"]
23
#![feature(rustc_attrs)]
34

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

+22-56
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,7 @@ error: layout_of(MissingPayloadField) = Layout {
4242
abi: Align {
4343
pow2: 0,
4444
},
45-
pref: Align {
46-
pow2: 3,
47-
},
45+
pref: $PREF_ALIGN,
4846
},
4947
size: Size {
5048
raw: 2,
@@ -66,9 +64,7 @@ error: layout_of(MissingPayloadField) = Layout {
6664
abi: Align {
6765
pow2: 0,
6866
},
69-
pref: Align {
70-
pow2: 3,
71-
},
67+
pref: $PREF_ALIGN,
7268
},
7369
size: Size {
7470
raw: 1,
@@ -107,15 +103,13 @@ error: layout_of(MissingPayloadField) = Layout {
107103
abi: Align {
108104
pow2: 0,
109105
},
110-
pref: Align {
111-
pow2: 3,
112-
},
106+
pref: $PREF_ALIGN,
113107
},
114108
size: Size {
115109
raw: 2,
116110
},
117111
}
118-
--> $DIR/issue-96158-scalarpair-payload-might-be-uninit.rs:15:1
112+
--> $DIR/issue-96158-scalarpair-payload-might-be-uninit.rs:16:1
119113
|
120114
LL | / pub enum MissingPayloadField {
121115
LL | | Some(u8),
@@ -167,9 +161,7 @@ error: layout_of(CommonPayloadField) = Layout {
167161
abi: Align {
168162
pow2: 0,
169163
},
170-
pref: Align {
171-
pow2: 3,
172-
},
164+
pref: $PREF_ALIGN,
173165
},
174166
size: Size {
175167
raw: 2,
@@ -197,9 +189,7 @@ error: layout_of(CommonPayloadField) = Layout {
197189
abi: Align {
198190
pow2: 0,
199191
},
200-
pref: Align {
201-
pow2: 3,
202-
},
192+
pref: $PREF_ALIGN,
203193
},
204194
size: Size {
205195
raw: 2,
@@ -239,15 +229,13 @@ error: layout_of(CommonPayloadField) = Layout {
239229
abi: Align {
240230
pow2: 0,
241231
},
242-
pref: Align {
243-
pow2: 3,
244-
},
232+
pref: $PREF_ALIGN,
245233
},
246234
size: Size {
247235
raw: 2,
248236
},
249237
}
250-
--> $DIR/issue-96158-scalarpair-payload-might-be-uninit.rs:24:1
238+
--> $DIR/issue-96158-scalarpair-payload-might-be-uninit.rs:25:1
251239
|
252240
LL | / pub enum CommonPayloadField {
253241
LL | | A(u8),
@@ -299,9 +287,7 @@ error: layout_of(CommonPayloadFieldIsMaybeUninit) = Layout {
299287
abi: Align {
300288
pow2: 0,
301289
},
302-
pref: Align {
303-
pow2: 3,
304-
},
290+
pref: $PREF_ALIGN,
305291
},
306292
size: Size {
307293
raw: 2,
@@ -329,9 +315,7 @@ error: layout_of(CommonPayloadFieldIsMaybeUninit) = Layout {
329315
abi: Align {
330316
pow2: 0,
331317
},
332-
pref: Align {
333-
pow2: 3,
334-
},
318+
pref: $PREF_ALIGN,
335319
},
336320
size: Size {
337321
raw: 2,
@@ -370,15 +354,13 @@ error: layout_of(CommonPayloadFieldIsMaybeUninit) = Layout {
370354
abi: Align {
371355
pow2: 0,
372356
},
373-
pref: Align {
374-
pow2: 3,
375-
},
357+
pref: $PREF_ALIGN,
376358
},
377359
size: Size {
378360
raw: 2,
379361
},
380362
}
381-
--> $DIR/issue-96158-scalarpair-payload-might-be-uninit.rs:32:1
363+
--> $DIR/issue-96158-scalarpair-payload-might-be-uninit.rs:33:1
382364
|
383365
LL | / pub enum CommonPayloadFieldIsMaybeUninit {
384366
LL | | A(u8),
@@ -462,9 +444,7 @@ error: layout_of(NicheFirst) = Layout {
462444
abi: Align {
463445
pow2: 0,
464446
},
465-
pref: Align {
466-
pow2: 3,
467-
},
447+
pref: $PREF_ALIGN,
468448
},
469449
size: Size {
470450
raw: 2,
@@ -486,9 +466,7 @@ error: layout_of(NicheFirst) = Layout {
486466
abi: Align {
487467
pow2: 0,
488468
},
489-
pref: Align {
490-
pow2: 3,
491-
},
469+
pref: $PREF_ALIGN,
492470
},
493471
size: Size {
494472
raw: 0,
@@ -510,9 +488,7 @@ error: layout_of(NicheFirst) = Layout {
510488
abi: Align {
511489
pow2: 0,
512490
},
513-
pref: Align {
514-
pow2: 3,
515-
},
491+
pref: $PREF_ALIGN,
516492
},
517493
size: Size {
518494
raw: 0,
@@ -551,15 +527,13 @@ error: layout_of(NicheFirst) = Layout {
551527
abi: Align {
552528
pow2: 0,
553529
},
554-
pref: Align {
555-
pow2: 3,
556-
},
530+
pref: $PREF_ALIGN,
557531
},
558532
size: Size {
559533
raw: 2,
560534
},
561535
}
562-
--> $DIR/issue-96158-scalarpair-payload-might-be-uninit.rs:40:1
536+
--> $DIR/issue-96158-scalarpair-payload-might-be-uninit.rs:41:1
563537
|
564538
LL | / pub enum NicheFirst {
565539
LL | | A(HasNiche, u8),
@@ -644,9 +618,7 @@ error: layout_of(NicheSecond) = Layout {
644618
abi: Align {
645619
pow2: 0,
646620
},
647-
pref: Align {
648-
pow2: 3,
649-
},
621+
pref: $PREF_ALIGN,
650622
},
651623
size: Size {
652624
raw: 2,
@@ -668,9 +640,7 @@ error: layout_of(NicheSecond) = Layout {
668640
abi: Align {
669641
pow2: 0,
670642
},
671-
pref: Align {
672-
pow2: 3,
673-
},
643+
pref: $PREF_ALIGN,
674644
},
675645
size: Size {
676646
raw: 0,
@@ -692,9 +662,7 @@ error: layout_of(NicheSecond) = Layout {
692662
abi: Align {
693663
pow2: 0,
694664
},
695-
pref: Align {
696-
pow2: 3,
697-
},
665+
pref: $PREF_ALIGN,
698666
},
699667
size: Size {
700668
raw: 0,
@@ -733,15 +701,13 @@ error: layout_of(NicheSecond) = Layout {
733701
abi: Align {
734702
pow2: 0,
735703
},
736-
pref: Align {
737-
pow2: 3,
738-
},
704+
pref: $PREF_ALIGN,
739705
},
740706
size: Size {
741707
raw: 2,
742708
},
743709
}
744-
--> $DIR/issue-96158-scalarpair-payload-might-be-uninit.rs:49:1
710+
--> $DIR/issue-96158-scalarpair-payload-might-be-uninit.rs:50:1
745711
|
746712
LL | / pub enum NicheSecond {
747713
LL | | A(u8, HasNiche),

0 commit comments

Comments
 (0)