Skip to content

Commit 17fa840

Browse files
zachs18zachs18
committed
Normalize for pointer size
1 parent fb682a3 commit 17fa840

File tree

2 files changed

+50
-49
lines changed

2 files changed

+50
-49
lines changed

‎tests/ui/layout/enum.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
//@ normalize-stderr: "pref: Align\([1-8] bytes\)" -> "pref: $$PREF_ALIGN"
2+
//@ normalize-stderr: "(valid_range): 1\.\.=(4294967295|18446744073709551615)" -> "$1: 1..=$$USIZEMAX"
23
//! Various enum layout tests.
34
45
#![feature(rustc_attrs)]

‎tests/ui/layout/enum.stderr‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,65 @@
11
error: align: AbiAlign { abi: Align(2 bytes) }
2-
--> $DIR/enum.rs:9:1
2+
--> $DIR/enum.rs:10:1
33
|
44
LL | enum UninhabitedVariantAlign {
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
66

77
error: size: Size(15 bytes)
8-
--> $DIR/enum.rs:15:1
8+
--> $DIR/enum.rs:16:1
99
|
1010
LL | enum UninhabitedVariantSpace {
1111
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1212

1313
error: abi: ScalarPair(Initialized { value: Int(I8, false), valid_range: 0..=1 }, Initialized { value: Int(I8, false), valid_range: 0..=255 })
14-
--> $DIR/enum.rs:21:1
14+
--> $DIR/enum.rs:22:1
1515
|
1616
LL | enum ScalarPairDifferingSign {
1717
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1818

1919
error: size: Size(4 bytes)
20-
--> $DIR/enum.rs:29:1
20+
--> $DIR/enum.rs:30:1
2121
|
2222
LL | enum AbsentVariantUntagged {
2323
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
2424

2525
error: abi: Scalar(Initialized { value: Int(I32, true), valid_range: 0..=4294967295 })
26-
--> $DIR/enum.rs:29:1
26+
--> $DIR/enum.rs:30:1
2727
|
2828
LL | enum AbsentVariantUntagged {
2929
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
3030

3131
error: size: Size(4 bytes)
32-
--> $DIR/enum.rs:38:1
32+
--> $DIR/enum.rs:39:1
3333
|
3434
LL | enum UninhabitedVariantUntagged {
3535
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
3636

3737
error: abi: Scalar(Initialized { value: Int(I32, true), valid_range: 0..=4294967295 })
38-
--> $DIR/enum.rs:38:1
38+
--> $DIR/enum.rs:39:1
3939
|
4040
LL | enum UninhabitedVariantUntagged {
4141
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4242

4343
error: size: Size(8 bytes)
44-
--> $DIR/enum.rs:49:1
44+
--> $DIR/enum.rs:50:1
4545
|
4646
LL | enum UninhabitedVariantUntaggedBigger {
4747
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4848

4949
error: abi: ScalarPair(Initialized { value: Int(I8, false), valid_range: 0..=0 }, Initialized { value: Int(I32, true), valid_range: 0..=4294967295 })
50-
--> $DIR/enum.rs:49:1
50+
--> $DIR/enum.rs:50:1
5151
|
5252
LL | enum UninhabitedVariantUntaggedBigger {
5353
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
5454

5555
error: size: Size(2 bytes)
56-
--> $DIR/enum.rs:56:1
56+
--> $DIR/enum.rs:57:1
5757
|
5858
LL | enum UninhabitedVariantWithNiche {
5959
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
6060

6161
error: abi: ScalarPair(Initialized { value: Int(I8, false), valid_range: 0..=1 }, Initialized { value: Int(I8, true), valid_range: 0..=255 })
62-
--> $DIR/enum.rs:56:1
62+
--> $DIR/enum.rs:57:1
6363
|
6464
LL | enum UninhabitedVariantWithNiche {
6565
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -177,181 +177,181 @@ error: layout_of(UninhabitedVariantLargeWithNiche) = Layout {
177177
unadjusted_abi_align: Align(1 bytes),
178178
randomization_seed: 15362464571658798427,
179179
}
180-
--> $DIR/enum.rs:63:1
180+
--> $DIR/enum.rs:64:1
181181
|
182182
LL | enum UninhabitedVariantLargeWithNiche {
183183
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
184184

185185
error: size: Size(2 bytes)
186-
--> $DIR/enum.rs:77:1
186+
--> $DIR/enum.rs:78:1
187187
|
188188
LL | enum AllUninhabitedVariants {
189189
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
190190

191191
error: abi: Memory { sized: true }
192-
--> $DIR/enum.rs:77:1
192+
--> $DIR/enum.rs:78:1
193193
|
194194
LL | enum AllUninhabitedVariants {
195195
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
196196

197197
error: size: Size(2 bytes)
198-
--> $DIR/enum.rs:88:1
198+
--> $DIR/enum.rs:89:1
199199
|
200200
LL | enum AlignedI8 {
201201
| ^^^^^^^^^^^^^^
202202

203203
error: abi: Memory { sized: true }
204-
--> $DIR/enum.rs:88:1
204+
--> $DIR/enum.rs:89:1
205205
|
206206
LL | enum AlignedI8 {
207207
| ^^^^^^^^^^^^^^
208208

209209
error: size: Size(4 bytes)
210-
--> $DIR/enum.rs:96:1
210+
--> $DIR/enum.rs:97:1
211211
|
212212
LL | enum TaggedI8 {
213213
| ^^^^^^^^^^^^^
214214

215215
error: abi: Memory { sized: true }
216-
--> $DIR/enum.rs:96:1
216+
--> $DIR/enum.rs:97:1
217217
|
218218
LL | enum TaggedI8 {
219219
| ^^^^^^^^^^^^^
220220

221221
error: size: Size(4 bytes)
222-
--> $DIR/enum.rs:105:1
222+
--> $DIR/enum.rs:106:1
223223
|
224224
LL | enum TaggedI16 {
225225
| ^^^^^^^^^^^^^^
226226

227227
error: abi: ScalarPair(Initialized { value: Int(I16, false), valid_range: 0..=0 }, Initialized { value: Int(I16, true), valid_range: 0..=65535 })
228-
--> $DIR/enum.rs:105:1
228+
--> $DIR/enum.rs:106:1
229229
|
230230
LL | enum TaggedI16 {
231231
| ^^^^^^^^^^^^^^
232232

233233
error: size: Size(0 bytes)
234-
--> $DIR/enum.rs:113:1
234+
--> $DIR/enum.rs:114:1
235235
|
236236
LL | enum AllUninhabitedVariantsAlignedZst {
237237
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
238238

239239
error: abi: Memory { sized: true }
240-
--> $DIR/enum.rs:113:1
240+
--> $DIR/enum.rs:114:1
241241
|
242242
LL | enum AllUninhabitedVariantsAlignedZst {
243243
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
244244

245245
error: abi: Scalar(Initialized { value: Pointer(AddressSpace(0)), valid_range: (..=0) | (1..) })
246-
--> $DIR/enum.rs:128:1
246+
--> $DIR/enum.rs:129:1
247247
|
248248
LL | type NPONever1 = Result<NPONever, ()>;
249249
| ^^^^^^^^^^^^^^
250250

251251
error: abi: Scalar(Initialized { value: Pointer(AddressSpace(0)), valid_range: (..=0) | (1..) })
252-
--> $DIR/enum.rs:132:1
252+
--> $DIR/enum.rs:133:1
253253
|
254254
LL | type NPONever2 = Result<(), NPONever>;
255255
| ^^^^^^^^^^^^^^
256256

257-
error: abi: Scalar(Initialized { value: Pointer(AddressSpace(0)), valid_range: 1..=18446744073709551615 })
258-
--> $DIR/enum.rs:136:1
257+
error: abi: Scalar(Initialized { value: Pointer(AddressSpace(0)), valid_range: 1..=$USIZEMAX })
258+
--> $DIR/enum.rs:137:1
259259
|
260260
LL | type NPONever3 = Result<NPONever, !>;
261261
| ^^^^^^^^^^^^^^
262262

263-
error: abi: Scalar(Initialized { value: Pointer(AddressSpace(0)), valid_range: 1..=18446744073709551615 })
264-
--> $DIR/enum.rs:140:1
263+
error: abi: Scalar(Initialized { value: Pointer(AddressSpace(0)), valid_range: 1..=$USIZEMAX })
264+
--> $DIR/enum.rs:141:1
265265
|
266266
LL | type NPONever4 = Result<!, NPONever>;
267267
| ^^^^^^^^^^^^^^
268268

269-
error: abi: Scalar(Initialized { value: Pointer(AddressSpace(0)), valid_range: 1..=18446744073709551615 })
270-
--> $DIR/enum.rs:144:1
269+
error: abi: Scalar(Initialized { value: Pointer(AddressSpace(0)), valid_range: 1..=$USIZEMAX })
270+
--> $DIR/enum.rs:145:1
271271
|
272272
LL | type NPONever5 = Result<&'static (), !>;
273273
| ^^^^^^^^^^^^^^
274274

275-
error: abi: Scalar(Initialized { value: Pointer(AddressSpace(0)), valid_range: 1..=18446744073709551615 })
276-
--> $DIR/enum.rs:148:1
275+
error: abi: Scalar(Initialized { value: Pointer(AddressSpace(0)), valid_range: 1..=$USIZEMAX })
276+
--> $DIR/enum.rs:149:1
277277
|
278278
LL | type NPONever6 = Result<!, &'static ()>;
279279
| ^^^^^^^^^^^^^^
280280

281281
error: abi: Scalar(Initialized { value: Int(I16, true), valid_range: 1..=65535 })
282-
--> $DIR/enum.rs:152:1
282+
--> $DIR/enum.rs:153:1
283283
|
284284
LL | type NPONever7 = Result<std::num::NonZero<i16>, !>;
285285
| ^^^^^^^^^^^^^^
286286

287287
error: abi: Scalar(Initialized { value: Int(I16, true), valid_range: 1..=65535 })
288-
--> $DIR/enum.rs:156:1
288+
--> $DIR/enum.rs:157:1
289289
|
290290
LL | type NPONever8 = Result<!, std::num::NonZero<i16>>;
291291
| ^^^^^^^^^^^^^^
292292

293293
error: abi: Scalar(Initialized { value: Int(I16, true), valid_range: 1..=65535 })
294-
--> $DIR/enum.rs:160:1
294+
--> $DIR/enum.rs:161:1
295295
|
296296
LL | type NPONever9 = Result<NPONeverI16, !>;
297297
| ^^^^^^^^^^^^^^
298298

299299
error: abi: Scalar(Initialized { value: Int(I16, true), valid_range: 1..=65535 })
300-
--> $DIR/enum.rs:164:1
300+
--> $DIR/enum.rs:165:1
301301
|
302302
LL | type NPONever10 = Result<!, NPONeverI16>;
303303
| ^^^^^^^^^^^^^^^
304304

305305
error: abi: Scalar(Initialized { value: Int(I16, true), valid_range: (..=0) | (1..) })
306-
--> $DIR/enum.rs:168:1
306+
--> $DIR/enum.rs:169:1
307307
|
308308
LL | type NPONever11 = Result<NPONeverI16, ()>;
309309
| ^^^^^^^^^^^^^^^
310310

311311
error: abi: Scalar(Initialized { value: Int(I16, true), valid_range: (..=0) | (1..) })
312-
--> $DIR/enum.rs:172:1
312+
--> $DIR/enum.rs:173:1
313313
|
314314
LL | type NPONever12 = Result<(), NPONeverI16>;
315315
| ^^^^^^^^^^^^^^^
316316

317-
error: abi: Scalar(Initialized { value: Pointer(AddressSpace(0)), valid_range: 1..=18446744073709551615 })
318-
--> $DIR/enum.rs:176:1
317+
error: abi: Scalar(Initialized { value: Pointer(AddressSpace(0)), valid_range: 1..=$USIZEMAX })
318+
--> $DIR/enum.rs:177:1
319319
|
320320
LL | enum NPONever13 {
321321
| ^^^^^^^^^^^^^^^
322322

323323
error: abi: Scalar(Initialized { value: Pointer(AddressSpace(0)), valid_range: (..=0) | (1..) })
324-
--> $DIR/enum.rs:182:1
324+
--> $DIR/enum.rs:183:1
325325
|
326326
LL | enum NPONever14 {
327327
| ^^^^^^^^^^^^^^^
328328

329-
error: abi: Scalar(Initialized { value: Pointer(AddressSpace(0)), valid_range: 1..=18446744073709551615 })
330-
--> $DIR/enum.rs:188:1
329+
error: abi: Scalar(Initialized { value: Pointer(AddressSpace(0)), valid_range: 1..=$USIZEMAX })
330+
--> $DIR/enum.rs:189:1
331331
|
332332
LL | enum NPONever15 {
333333
| ^^^^^^^^^^^^^^^
334334

335335
error: abi: Scalar(Initialized { value: Int(I64, false), valid_range: 0..=0 })
336-
--> $DIR/enum.rs:196:1
336+
--> $DIR/enum.rs:197:1
337337
|
338338
LL | type NotNPONever1 = Result<NPONever, NPONever>;
339339
| ^^^^^^^^^^^^^^^^^
340340

341341
error: abi: Memory { sized: true }
342-
--> $DIR/enum.rs:200:1
342+
--> $DIR/enum.rs:201:1
343343
|
344344
LL | type NotNPONever2 = Result<NPONever, AlignedNever>;
345345
| ^^^^^^^^^^^^^^^^^
346346

347-
error: abi: Scalar(Initialized { value: Pointer(AddressSpace(0)), valid_range: 1..=18446744073709551615 })
348-
--> $DIR/enum.rs:204:1
347+
error: abi: Scalar(Initialized { value: Pointer(AddressSpace(0)), valid_range: 1..=$USIZEMAX })
348+
--> $DIR/enum.rs:205:1
349349
|
350350
LL | type NotNPONever3 = Result<NPONever, &'static ()>;
351351
| ^^^^^^^^^^^^^^^^^
352352

353-
error: abi: Scalar(Initialized { value: Pointer(AddressSpace(0)), valid_range: 1..=18446744073709551615 })
354-
--> $DIR/enum.rs:208:1
353+
error: abi: Scalar(Initialized { value: Pointer(AddressSpace(0)), valid_range: 1..=$USIZEMAX })
354+
--> $DIR/enum.rs:209:1
355355
|
356356
LL | type NotNPONever4 = Result<&'static (), AlignedNever>;
357357
| ^^^^^^^^^^^^^^^^^

0 commit comments

Comments
 (0)