Skip to content

Commit 71044e6

Browse files
reitermarkusreitermarkus
committed
Update tests.
1 parent 126dc17 commit 71044e6

11 files changed

+34
-32
lines changed

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

+2-2
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);

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

+1-1
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),

Diff for: ‎tests/ui/lint/clashing-extern-fn.rs

+1-1
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
}

Diff for: ‎tests/ui/lint/clashing-extern-fn.stderr

+3-3
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

Diff for: ‎tests/ui/lint/invalid_value.stderr

+8-8
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

Diff for: ‎tests/ui/lint/lint-ctypes-enum.stderr

+3-3
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>);

Diff for: ‎tests/ui/mismatched_types/non_zero_assigned_something.stderr

+5-3
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
|

Diff for: ‎tests/ui/numbers-arithmetic/not-suggest-float-literal.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ LL | x / 100.0
124124
= help: the trait `Div<{float}>` is not implemented for `u8`
125125
= help: the following other types implement trait `Div<Rhs>`:
126126
<u8 as Div>
127-
<u8 as Div<NonZeroU8>>
127+
<u8 as Div<NonZero<u8>>>
128128
<u8 as Div<&u8>>
129129
<&'a u8 as Div<u8>>
130130
<&u8 as Div<&u8>>

Diff for: ‎tests/ui/print_type_sizes/niche-filling.stdout

+8-8
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ print-type-size field `.pre`: 1 bytes
1414
print-type-size field `.post`: 2 bytes
1515
print-type-size field `.val`: 4 bytes
1616
print-type-size variant `None`: 0 bytes
17-
print-type-size type: `MyOption<Union1<std::num::NonZeroU32>>`: 8 bytes, alignment: 4 bytes
17+
print-type-size type: `MyOption<Union1<std::num::NonZero<u32>>>`: 8 bytes, alignment: 4 bytes
1818
print-type-size discriminant: 4 bytes
1919
print-type-size variant `Some`: 4 bytes
2020
print-type-size field `.0`: 4 bytes
2121
print-type-size variant `None`: 0 bytes
22-
print-type-size type: `MyOption<Union2<std::num::NonZeroU32, std::num::NonZeroU32>>`: 8 bytes, alignment: 4 bytes
22+
print-type-size type: `MyOption<Union2<std::num::NonZero<u32>, std::num::NonZero<u32>>>`: 8 bytes, alignment: 4 bytes
2323
print-type-size discriminant: 4 bytes
2424
print-type-size variant `Some`: 4 bytes
2525
print-type-size field `.0`: 4 bytes
2626
print-type-size variant `None`: 0 bytes
27-
print-type-size type: `MyOption<Union2<std::num::NonZeroU32, u32>>`: 8 bytes, alignment: 4 bytes
27+
print-type-size type: `MyOption<Union2<std::num::NonZero<u32>, u32>>`: 8 bytes, alignment: 4 bytes
2828
print-type-size discriminant: 4 bytes
2929
print-type-size variant `Some`: 4 bytes
3030
print-type-size field `.0`: 4 bytes
@@ -53,22 +53,22 @@ print-type-size type: `MyOption<char>`: 4 bytes, alignment: 4 bytes
5353
print-type-size variant `Some`: 4 bytes
5454
print-type-size field `.0`: 4 bytes
5555
print-type-size variant `None`: 0 bytes
56-
print-type-size type: `MyOption<std::num::NonZeroU32>`: 4 bytes, alignment: 4 bytes
56+
print-type-size type: `MyOption<std::num::NonZero<u32>>`: 4 bytes, alignment: 4 bytes
5757
print-type-size variant `Some`: 4 bytes
5858
print-type-size field `.0`: 4 bytes
5959
print-type-size variant `None`: 0 bytes
60-
print-type-size type: `Union1<std::num::NonZeroU32>`: 4 bytes, alignment: 4 bytes
60+
print-type-size type: `Union1<std::num::NonZero<u32>>`: 4 bytes, alignment: 4 bytes
6161
print-type-size variant `Union1`: 4 bytes
6262
print-type-size field `.a`: 4 bytes
63-
print-type-size type: `Union2<std::num::NonZeroU32, std::num::NonZeroU32>`: 4 bytes, alignment: 4 bytes
63+
print-type-size type: `Union2<std::num::NonZero<u32>, std::num::NonZero<u32>>`: 4 bytes, alignment: 4 bytes
6464
print-type-size variant `Union2`: 4 bytes
6565
print-type-size field `.a`: 4 bytes
6666
print-type-size field `.b`: 4 bytes, offset: 0 bytes, alignment: 4 bytes
67-
print-type-size type: `Union2<std::num::NonZeroU32, u32>`: 4 bytes, alignment: 4 bytes
67+
print-type-size type: `Union2<std::num::NonZero<u32>, u32>`: 4 bytes, alignment: 4 bytes
6868
print-type-size variant `Union2`: 4 bytes
6969
print-type-size field `.a`: 4 bytes
7070
print-type-size field `.b`: 4 bytes, offset: 0 bytes, alignment: 4 bytes
71-
print-type-size type: `std::num::NonZeroU32`: 4 bytes, alignment: 4 bytes
71+
print-type-size type: `std::num::NonZero<u32>`: 4 bytes, alignment: 4 bytes
7272
print-type-size field `.0`: 4 bytes
7373
print-type-size type: `Enum4<(), (), (), MyOption<u8>>`: 2 bytes, alignment: 1 bytes
7474
print-type-size variant `Four`: 2 bytes

Diff for: ‎tests/ui/traits/issue-77982.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ LL | let ips: Vec<_> = (0..100_000).map(|_| u32::from(0u32.into())).collect(
4545
|
4646
= note: multiple `impl`s satisfying `u32: From<_>` found in the `core` crate:
4747
- impl From<Ipv4Addr> for u32;
48-
- impl From<NonZeroU32> for u32;
48+
- impl From<NonZero<u32>> for u32;
4949
- impl From<bool> for u32;
5050
- impl From<char> for u32;
5151
- impl From<u16> for u32;

Diff for: ‎tests/ui/try-trait/bad-interconversion.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ LL | Ok(Err(123_i32)?)
1111
= note: the question mark operation (`?`) implicitly performs a conversion on the error value using the `From` trait
1212
= help: the following other types implement trait `From<T>`:
1313
<u8 as From<bool>>
14-
<u8 as From<NonZeroU8>>
14+
<u8 as From<NonZero<u8>>>
1515
= note: required for `Result<u64, u8>` to implement `FromResidual<Result<Infallible, i32>>`
1616

1717
error[E0277]: the `?` operator can only be used on `Result`s, not `Option`s, in a function that returns `Result`

0 commit comments

Comments
 (0)