Skip to content

Commit 021739c

Browse files
reitermarkusreitermarkus
committed
Update tests.
1 parent 117eb9f commit 021739c

14 files changed

+62
-93
lines changed

‎src/etc/natvis/libcore.natvis

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -41,40 +41,7 @@
4141
</Expand>
4242
</Type>
4343

44-
<Type Name="core::num::nonzero::NonZeroI8">
45-
<DisplayString>{__0}</DisplayString>
46-
</Type>
47-
<Type Name="core::num::nonzero::NonZeroI16">
48-
<DisplayString>{__0}</DisplayString>
49-
</Type>
50-
<Type Name="core::num::nonzero::NonZeroI32">
51-
<DisplayString>{__0}</DisplayString>
52-
</Type>
53-
<Type Name="core::num::nonzero::NonZeroI64">
54-
<DisplayString>{__0}</DisplayString>
55-
</Type>
56-
<Type Name="core::num::nonzero::NonZeroI128">
57-
<DisplayString>{__0}</DisplayString>
58-
</Type>
59-
<Type Name="core::num::nonzero::NonZeroIsize">
60-
<DisplayString>{__0}</DisplayString>
61-
</Type>
62-
<Type Name="core::num::nonzero::NonZeroU8">
63-
<DisplayString>{__0}</DisplayString>
64-
</Type>
65-
<Type Name="core::num::nonzero::NonZeroU16">
66-
<DisplayString>{__0}</DisplayString>
67-
</Type>
68-
<Type Name="core::num::nonzero::NonZeroU32">
69-
<DisplayString>{__0}</DisplayString>
70-
</Type>
71-
<Type Name="core::num::nonzero::NonZeroU64">
72-
<DisplayString>{__0}</DisplayString>
73-
</Type>
74-
<Type Name="core::num::nonzero::NonZeroU128">
75-
<DisplayString>{__0}</DisplayString>
76-
</Type>
77-
<Type Name="core::num::nonzero::NonZeroUsize">
44+
<Type Name="core::num::nonzero::NonZero&lt;*&gt;">
7845
<DisplayString>{__0}</DisplayString>
7946
</Type>
8047

‎tests/debuginfo/msvc-pretty-enums.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@
4646
// cdb-check: [+0x000] __0 : 0x2a [Type: unsigned int]
4747

4848
// cdb-command: dx niche128_some
49-
// cdb-check: niche128_some : Some [Type: enum2$<core::option::Option<core::num::nonzero::NonZeroI128> >]
49+
// cdb-check: niche128_some : Some [Type: enum2$<core::option::Option<core::num::nonzero::NonZero<i128> > >]
5050
// Note: we can't actually read the value of the field because CDB cannot handle 128 bit integers.
51-
// cdb-check: [+0x000] __0 [...] [Type: core::num::nonzero::NonZeroI128]
51+
// cdb-check: [+0x000] __0 [...] [Type: core::num::nonzero::NonZero<i128>]
5252

5353
// cdb-command: dx niche128_none
54-
// cdb-check: niche128_none : None [Type: enum2$<core::option::Option<core::num::nonzero::NonZeroI128> >]
54+
// cdb-check: niche128_none : None [Type: enum2$<core::option::Option<core::num::nonzero::NonZero<i128> > >]
5555

5656
// cdb-command: dx wrapping_niche128_untagged
5757
// cdb-check: wrapping_niche128_untagged : X [Type: enum2$<msvc_pretty_enums::Wrapping128Niche>]
@@ -84,7 +84,7 @@
8484

8585
// cdb-command: dx niche_w_fields_2_some,d
8686
// cdb-check: niche_w_fields_2_some,d : A [Type: enum2$<msvc_pretty_enums::NicheLayoutWithFields2>]
87-
// cdb-check: [+0x[...]] __0 : 800 [Type: core::num::nonzero::NonZeroU32]
87+
// cdb-check: [+0x[...]] __0 : 800 [Type: core::num::nonzero::NonZero<u32>]
8888
// cdb-check: [+0x[...]] __1 : 900 [Type: unsigned __int64]
8989

9090
// cdb-command: dx niche_w_fields_2_none,d

‎tests/debuginfo/numeric-types.rs

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,59 +3,59 @@
33
// min-gdb-version: 8.1
44
// ignore-windows-gnu // emit_debug_gdb_scripts is disabled on Windows
55

6-
// Tests the visualizations for `NonZero{I,U}{8,16,32,64,128,size}`, `Wrapping<T>` and
6+
// Tests the visualizations for `NonZero<T>`, `Wrapping<T>` and
77
// `Atomic{Bool,I8,I16,I32,I64,Isize,U8,U16,U32,U64,Usize}` located in `libcore.natvis`.
88

99
// === CDB TESTS ==================================================================================
1010
// cdb-command: g
1111

1212
// cdb-command: dx nz_i8
13-
// cdb-check:nz_i8 : 11 [Type: core::num::nonzero::NonZeroI8]
14-
// cdb-check: [<Raw View>] [Type: core::num::nonzero::NonZeroI8]
13+
// cdb-check:nz_i8 : 11 [Type: core::num::nonzero::NonZero<i8>]
14+
// cdb-check: [<Raw View>] [Type: core::num::nonzero::NonZero<i8>]
1515

1616
// cdb-command: dx nz_i16
17-
// cdb-check:nz_i16 : 22 [Type: core::num::nonzero::NonZeroI16]
18-
// cdb-check: [<Raw View>] [Type: core::num::nonzero::NonZeroI16]
17+
// cdb-check:nz_i16 : 22 [Type: core::num::nonzero::NonZero<i16>]
18+
// cdb-check: [<Raw View>] [Type: core::num::nonzero::NonZero<i16>]
1919

2020
// cdb-command: dx nz_i32
21-
// cdb-check:nz_i32 : 33 [Type: core::num::nonzero::NonZeroI32]
22-
// cdb-check: [<Raw View>] [Type: core::num::nonzero::NonZeroI32]
21+
// cdb-check:nz_i32 : 33 [Type: core::num::nonzero::NonZero<i32>]
22+
// cdb-check: [<Raw View>] [Type: core::num::nonzero::NonZero<i32>]
2323

2424
// cdb-command: dx nz_i64
25-
// cdb-check:nz_i64 : 44 [Type: core::num::nonzero::NonZeroI64]
26-
// cdb-check: [<Raw View>] [Type: core::num::nonzero::NonZeroI64]
25+
// cdb-check:nz_i64 : 44 [Type: core::num::nonzero::NonZero<i64>]
26+
// cdb-check: [<Raw View>] [Type: core::num::nonzero::NonZero<i64>]
2727

2828
// 128-bit integers don't seem to work in CDB
2929
// cdb-command: dx nz_i128
30-
// cdb-check: [<Raw View>] [Type: core::num::nonzero::NonZeroI128]
30+
// cdb-check: [<Raw View>] [Type: core::num::nonzero::NonZero<i128>]
3131

3232
// cdb-command: dx nz_isize
33-
// cdb-check:nz_isize : 66 [Type: core::num::nonzero::NonZeroIsize]
34-
// cdb-check: [<Raw View>] [Type: core::num::nonzero::NonZeroIsize]
33+
// cdb-check:nz_isize : 66 [Type: core::num::nonzero::NonZero<isize>]
34+
// cdb-check: [<Raw View>] [Type: core::num::nonzero::NonZero<isize>]
3535

3636
// cdb-command: dx nz_u8
37-
// cdb-check:nz_u8 : 0x4d [Type: core::num::nonzero::NonZeroU8]
38-
// cdb-check: [<Raw View>] [Type: core::num::nonzero::NonZeroU8]
37+
// cdb-check:nz_u8 : 0x4d [Type: core::num::nonzero::NonZero<u8>]
38+
// cdb-check: [<Raw View>] [Type: core::num::nonzero::NonZero<u8>]
3939

4040
// cdb-command: dx nz_u16
41-
// cdb-check:nz_u16 : 0x58 [Type: core::num::nonzero::NonZeroU16]
42-
// cdb-check: [<Raw View>] [Type: core::num::nonzero::NonZeroU16]
41+
// cdb-check:nz_u16 : 0x58 [Type: core::num::nonzero::NonZero<u16>]
42+
// cdb-check: [<Raw View>] [Type: core::num::nonzero::NonZero<u16>]
4343

4444
// cdb-command: dx nz_u32
45-
// cdb-check:nz_u32 : 0x63 [Type: core::num::nonzero::NonZeroU32]
46-
// cdb-check: [<Raw View>] [Type: core::num::nonzero::NonZeroU32]
45+
// cdb-check:nz_u32 : 0x63 [Type: core::num::nonzero::NonZero<u32>]
46+
// cdb-check: [<Raw View>] [Type: core::num::nonzero::NonZero<u32>]
4747

4848
// cdb-command: dx nz_u64
49-
// cdb-check:nz_u64 : 0x64 [Type: core::num::nonzero::NonZeroU64]
50-
// cdb-check: [<Raw View>] [Type: core::num::nonzero::NonZeroU64]
49+
// cdb-check:nz_u64 : 0x64 [Type: core::num::nonzero::NonZero<u64>]
50+
// cdb-check: [<Raw View>] [Type: core::num::nonzero::NonZero<u64>]
5151

5252
// 128-bit integers don't seem to work in CDB
5353
// cdb-command: dx nz_u128
54-
// cdb-check: [<Raw View>] [Type: core::num::nonzero::NonZeroU128]
54+
// cdb-check: [<Raw View>] [Type: core::num::nonzero::NonZero<u128>]
5555

5656
// cdb-command: dx nz_usize
57-
// cdb-check:nz_usize : 0x7a [Type: core::num::nonzero::NonZeroUsize]
58-
// cdb-check: [<Raw View>] [Type: core::num::nonzero::NonZeroUsize]
57+
// cdb-check:nz_usize : 0x7a [Type: core::num::nonzero::NonZero<usize>]
58+
// cdb-check: [<Raw View>] [Type: core::num::nonzero::NonZero<usize>]
5959

6060
// cdb-command: dx w_i8
6161
// cdb-check:w_i8 : 10 [Type: core::num::wrapping::Wrapping<i8>]

‎tests/mir-opt/instsimplify/combine_transmutes.adt_transmutes.InstSimplify.diff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
fn adt_transmutes() -> () {
55
let mut _0: ();
66
let _1: u8;
7-
let mut _2: std::option::Option<std::num::NonZeroU8>;
7+
let mut _2: std::option::Option<std::num::NonZero<u8>>;
88
let mut _4: std::num::Wrapping<i16>;
99
let mut _6: std::num::Wrapping<i16>;
1010
let mut _8: Union32;
@@ -37,7 +37,7 @@
3737
bb0: {
3838
StorageLive(_1);
3939
StorageLive(_2);
40-
_2 = Option::<NonZeroU8>::Some(const _);
40+
_2 = Option::<NonZero<u8>>::Some(const _);
4141
_1 = move _2 as u8 (Transmute);
4242
StorageDead(_2);
4343
StorageLive(_3);

‎tests/ui/layout/zero-sized-array-enum-niche.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ error: layout_of(MultipleAlignments) = Layout {
232232
LL | enum MultipleAlignments {
233233
| ^^^^^^^^^^^^^^^^^^^^^^^
234234

235-
error: layout_of(Result<[u32; 0], Packed<NonZeroU16>>) = Layout {
235+
error: layout_of(Result<[u32; 0], Packed<NonZero<u16>>>) = Layout {
236236
size: Size(4 bytes),
237237
align: AbiAndPrefAlign {
238238
abi: Align(4 bytes),

‎tests/ui/lint/clashing-extern-fn.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ mod hidden_niche {
436436

437437
fn hidden_niche_unsafe_cell() -> Option<UnsafeCell<NonZeroUsize>>;
438438
//~^ WARN redeclared with a different signature
439-
//~| WARN block uses type `Option<UnsafeCell<NonZeroUsize>>`, which is not FFI-safe
439+
//~| WARN block uses type `Option<UnsafeCell<NonZero<usize>>>`, which is not FFI-safe
440440
}
441441
}
442442
}

‎tests/ui/lint/clashing-extern-fn.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LL | fn hidden_niche_transparent_no_niche() -> Option<TransparentNoN
88
= note: enum has no representation hint
99
= note: `#[warn(improper_ctypes)]` on by default
1010

11-
warning: `extern` block uses type `Option<UnsafeCell<NonZeroUsize>>`, which is not FFI-safe
11+
warning: `extern` block uses type `Option<UnsafeCell<NonZero<usize>>>`, which is not FFI-safe
1212
--> $DIR/clashing-extern-fn.rs:437:46
1313
|
1414
LL | fn hidden_niche_unsafe_cell() -> Option<UnsafeCell<NonZeroUsize>>;
@@ -163,7 +163,7 @@ LL | fn non_zero_usize() -> core::num::NonZeroUsize;
163163
LL | fn non_zero_usize() -> usize;
164164
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ this signature doesn't match the previous declaration
165165
|
166-
= note: expected `unsafe extern "C" fn() -> NonZeroUsize`
166+
= note: expected `unsafe extern "C" fn() -> NonZero<usize>`
167167
found `unsafe extern "C" fn() -> usize`
168168

169169
warning: `non_null_ptr` redeclared with a different signature
@@ -224,7 +224,7 @@ LL | fn hidden_niche_unsafe_cell() -> Option<UnsafeCell<NonZeroUsize
224224
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ this signature doesn't match the previous declaration
225225
|
226226
= note: expected `unsafe extern "C" fn() -> usize`
227-
found `unsafe extern "C" fn() -> Option<UnsafeCell<NonZeroUsize>>`
227+
found `unsafe extern "C" fn() -> Option<UnsafeCell<NonZero<usize>>>`
228228

229229
warning: 19 warnings emitted
230230

‎tests/ui/lint/invalid_value.stderr

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ LL | let _val: NonNull<i32> = mem::uninitialized();
316316
= note: `std::ptr::NonNull<i32>` must be non-null
317317
= note: raw pointers must be initialized
318318

319-
error: the type `(NonZeroU32, i32)` does not permit zero-initialization
319+
error: the type `(NonZero<u32>, i32)` does not permit zero-initialization
320320
--> $DIR/invalid_value.rs:95:39
321321
|
322322
LL | let _val: (NonZeroU32, i32) = mem::zeroed();
@@ -325,9 +325,9 @@ LL | let _val: (NonZeroU32, i32) = mem::zeroed();
325325
| this code causes undefined behavior when executed
326326
| help: use `MaybeUninit<T>` instead, and only call `assume_init` after initialization is done
327327
|
328-
= note: `std::num::NonZeroU32` must be non-null
328+
= note: `std::num::NonZero<u32>` must be non-null
329329

330-
error: the type `(NonZeroU32, i32)` does not permit being left uninitialized
330+
error: the type `(NonZero<u32>, i32)` does not permit being left uninitialized
331331
--> $DIR/invalid_value.rs:96:39
332332
|
333333
LL | let _val: (NonZeroU32, i32) = mem::uninitialized();
@@ -336,7 +336,7 @@ LL | let _val: (NonZeroU32, i32) = mem::uninitialized();
336336
| this code causes undefined behavior when executed
337337
| help: use `MaybeUninit<T>` instead, and only call `assume_init` after initialization is done
338338
|
339-
= note: `std::num::NonZeroU32` must be non-null
339+
= note: `std::num::NonZero<u32>` must be non-null
340340
= note: integers must be initialized
341341

342342
error: the type `*const dyn Send` does not permit zero-initialization
@@ -417,7 +417,7 @@ LL | let _val: OneFruitNonZero = mem::zeroed();
417417
| help: use `MaybeUninit<T>` instead, and only call `assume_init` after initialization is done
418418
|
419419
= note: `OneFruitNonZero` must be non-null
420-
note: because `std::num::NonZeroU32` must be non-null (in this field of the only potentially inhabited enum variant)
420+
note: because `std::num::NonZero<u32>` must be non-null (in this field of the only potentially inhabited enum variant)
421421
--> $DIR/invalid_value.rs:39:12
422422
|
423423
LL | Banana(NonZeroU32),
@@ -433,7 +433,7 @@ LL | let _val: OneFruitNonZero = mem::uninitialized();
433433
| help: use `MaybeUninit<T>` instead, and only call `assume_init` after initialization is done
434434
|
435435
= note: `OneFruitNonZero` must be non-null
436-
note: because `std::num::NonZeroU32` must be non-null (in this field of the only potentially inhabited enum variant)
436+
note: because `std::num::NonZero<u32>` must be non-null (in this field of the only potentially inhabited enum variant)
437437
--> $DIR/invalid_value.rs:39:12
438438
|
439439
LL | Banana(NonZeroU32),
@@ -603,7 +603,7 @@ LL | let _val: &'static [i32] = mem::transmute((0usize, 0usize));
603603
|
604604
= note: references must be non-null
605605

606-
error: the type `NonZeroU32` does not permit zero-initialization
606+
error: the type `NonZero<u32>` does not permit zero-initialization
607607
--> $DIR/invalid_value.rs:154:32
608608
|
609609
LL | let _val: NonZeroU32 = mem::transmute(0);
@@ -612,7 +612,7 @@ LL | let _val: NonZeroU32 = mem::transmute(0);
612612
| this code causes undefined behavior when executed
613613
| help: use `MaybeUninit<T>` instead, and only call `assume_init` after initialization is done
614614
|
615-
= note: `std::num::NonZeroU32` must be non-null
615+
= note: `std::num::NonZero<u32>` must be non-null
616616

617617
error: the type `NonNull<i32>` does not permit zero-initialization
618618
--> $DIR/invalid_value.rs:157:34

‎tests/ui/lint/lint-ctypes-enum.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ LL | fn nonzero_i128(x: Option<num::NonZeroI128>);
6161
|
6262
= note: 128-bit integers don't currently have a known stable ABI
6363

64-
error: `extern` block uses type `Option<TransparentUnion<NonZeroU8>>`, which is not FFI-safe
64+
error: `extern` block uses type `Option<TransparentUnion<NonZero<u8>>>`, which is not FFI-safe
6565
--> $DIR/lint-ctypes-enum.rs:86:28
6666
|
6767
LL | fn transparent_union(x: Option<TransparentUnion<num::NonZeroU8>>);
@@ -70,7 +70,7 @@ LL | fn transparent_union(x: Option<TransparentUnion<num::NonZeroU8>>);
7070
= help: consider adding a `#[repr(C)]`, `#[repr(transparent)]`, or integer `#[repr(...)]` attribute to this enum
7171
= note: enum has no representation hint
7272

73-
error: `extern` block uses type `Option<Rust<NonZeroU8>>`, which is not FFI-safe
73+
error: `extern` block uses type `Option<Rust<NonZero<u8>>>`, which is not FFI-safe
7474
--> $DIR/lint-ctypes-enum.rs:88:20
7575
|
7676
LL | fn repr_rust(x: Option<Rust<num::NonZeroU8>>);
@@ -79,7 +79,7 @@ LL | fn repr_rust(x: Option<Rust<num::NonZeroU8>>);
7979
= help: consider adding a `#[repr(C)]`, `#[repr(transparent)]`, or integer `#[repr(...)]` attribute to this enum
8080
= note: enum has no representation hint
8181

82-
error: `extern` block uses type `Result<(), NonZeroI32>`, which is not FFI-safe
82+
error: `extern` block uses type `Result<(), NonZero<i32>>`, which is not FFI-safe
8383
--> $DIR/lint-ctypes-enum.rs:89:20
8484
|
8585
LL | fn no_result(x: Result<(), num::NonZeroI32>);

‎tests/ui/mismatched_types/non_zero_assigned_something.stderr

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@ error[E0308]: mismatched types
22
--> $DIR/non_zero_assigned_something.rs:2:35
33
|
44
LL | let _: std::num::NonZeroU64 = 1;
5-
| -------------------- ^ expected `NonZeroU64`, found integer
5+
| -------------------- ^ expected `NonZero<u64>`, found integer
66
| |
77
| expected due to this
88
|
9+
= note: expected struct `NonZero<u64>`
10+
found type `{integer}`
911
help: consider calling `NonZeroU64::new`
1012
|
1113
LL | let _: std::num::NonZeroU64 = NonZeroU64::new(1).unwrap();
@@ -15,11 +17,11 @@ error[E0308]: mismatched types
1517
--> $DIR/non_zero_assigned_something.rs:6:43
1618
|
1719
LL | let _: Option<std::num::NonZeroU64> = 1;
18-
| ---------------------------- ^ expected `Option<NonZeroU64>`, found integer
20+
| ---------------------------- ^ expected `Option<NonZero<u64>>`, found integer
1921
| |
2022
| expected due to this
2123
|
22-
= note: expected enum `Option<NonZeroU64>`
24+
= note: expected enum `Option<NonZero<u64>>`
2325
found type `{integer}`
2426
help: consider calling `NonZeroU64::new`
2527
|

0 commit comments

Comments
 (0)