Skip to content

Commit 89bb0ba

Browse files
reitermarkusreitermarkus
committed
Fix test output.
1 parent fca5bab commit 89bb0ba

File tree

6 files changed

+42
-42
lines changed

6 files changed

+42
-42
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ error: layout_of(Result<[u32; 0], bool>) = Layout {
9898
max_repr_align: None,
9999
unadjusted_abi_align: Align(4 bytes),
100100
}
101-
--> $DIR/zero-sized-array-enum-niche.rs:14:1
101+
--> $DIR/zero-sized-array-enum-niche.rs:13:1
102102
|
103103
LL | type AlignedResult = Result<[u32; 0], bool>;
104104
| ^^^^^^^^^^^^^^^^^^
@@ -227,7 +227,7 @@ error: layout_of(MultipleAlignments) = Layout {
227227
max_repr_align: None,
228228
unadjusted_abi_align: Align(4 bytes),
229229
}
230-
--> $DIR/zero-sized-array-enum-niche.rs:22:1
230+
--> $DIR/zero-sized-array-enum-niche.rs:21:1
231231
|
232232
LL | enum MultipleAlignments {
233233
| ^^^^^^^^^^^^^^^^^^^^^^^
@@ -332,7 +332,7 @@ error: layout_of(Result<[u32; 0], Packed<NonZero<u16>>>) = Layout {
332332
max_repr_align: None,
333333
unadjusted_abi_align: Align(4 bytes),
334334
}
335-
--> $DIR/zero-sized-array-enum-niche.rs:38:1
335+
--> $DIR/zero-sized-array-enum-niche.rs:37:1
336336
|
337337
LL | type NicheLosesToTagged = Result<[u32; 0], Packed<std::num::NonZero<u16>>>;
338338
| ^^^^^^^^^^^^^^^^^^^^^^^
@@ -441,7 +441,7 @@ error: layout_of(Result<[u32; 0], Packed<U16IsZero>>) = Layout {
441441
max_repr_align: None,
442442
unadjusted_abi_align: Align(4 bytes),
443443
}
444-
--> $DIR/zero-sized-array-enum-niche.rs:45:1
444+
--> $DIR/zero-sized-array-enum-niche.rs:44:1
445445
|
446446
LL | type NicheWinsOverTagged = Result<[u32; 0], Packed<U16IsZero>>;
447447
| ^^^^^^^^^^^^^^^^^^^^^^^^

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
warning: `extern` block uses type `Option<TransparentNoNiche>`, which is not FFI-safe
2-
--> $DIR/clashing-extern-fn.rs:430:55
2+
--> $DIR/clashing-extern-fn.rs:429:55
33
|
44
LL | fn hidden_niche_transparent_no_niche() -> Option<TransparentNoNiche>;
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ not FFI-safe
@@ -9,7 +9,7 @@ LL | fn hidden_niche_transparent_no_niche() -> Option<TransparentNoN
99
= note: `#[warn(improper_ctypes)]` on by default
1010

1111
warning: `extern` block uses type `Option<UnsafeCell<NonZero<usize>>>`, which is not FFI-safe
12-
--> $DIR/clashing-extern-fn.rs:434:46
12+
--> $DIR/clashing-extern-fn.rs:433:46
1313
|
1414
LL | fn hidden_niche_unsafe_cell() -> Option<UnsafeCell<NonZero<usize>>>;
1515
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not FFI-safe
@@ -18,7 +18,7 @@ LL | fn hidden_niche_unsafe_cell() -> Option<UnsafeCell<NonZero<usiz
1818
= note: enum has no representation hint
1919

2020
warning: `clash` redeclared with a different signature
21-
--> $DIR/clashing-extern-fn.rs:15:13
21+
--> $DIR/clashing-extern-fn.rs:14:13
2222
|
2323
LL | fn clash(x: u8);
2424
| --------------- `clash` previously declared here
@@ -35,7 +35,7 @@ LL | #![warn(clashing_extern_declarations)]
3535
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
3636

3737
warning: `extern_link_name` redeclared with a different signature
38-
--> $DIR/clashing-extern-fn.rs:53:9
38+
--> $DIR/clashing-extern-fn.rs:52:9
3939
|
4040
LL | #[link_name = "extern_link_name"]
4141
| --------------------------------- `extern_link_name` previously declared here
@@ -47,7 +47,7 @@ LL | fn extern_link_name(x: u32);
4747
found `unsafe extern "C" fn(u32)`
4848

4949
warning: `some_other_extern_link_name` redeclares `some_other_new_name` with a different signature
50-
--> $DIR/clashing-extern-fn.rs:56:9
50+
--> $DIR/clashing-extern-fn.rs:55:9
5151
|
5252
LL | fn some_other_new_name(x: i16);
5353
| ------------------------------ `some_other_new_name` previously declared here
@@ -59,7 +59,7 @@ LL | #[link_name = "some_other_new_name"]
5959
found `unsafe extern "C" fn(u32)`
6060

6161
warning: `other_both_names_different` redeclares `link_name_same` with a different signature
62-
--> $DIR/clashing-extern-fn.rs:60:9
62+
--> $DIR/clashing-extern-fn.rs:59:9
6363
|
6464
LL | #[link_name = "link_name_same"]
6565
| ------------------------------- `link_name_same` previously declared here
@@ -71,7 +71,7 @@ LL | #[link_name = "link_name_same"]
7171
found `unsafe extern "C" fn(u32)`
7272

7373
warning: `different_mod` redeclared with a different signature
74-
--> $DIR/clashing-extern-fn.rs:73:9
74+
--> $DIR/clashing-extern-fn.rs:72:9
7575
|
7676
LL | fn different_mod(x: u8);
7777
| ----------------------- `different_mod` previously declared here
@@ -83,7 +83,7 @@ LL | fn different_mod(x: u64);
8383
found `unsafe extern "C" fn(u64)`
8484

8585
warning: `variadic_decl` redeclared with a different signature
86-
--> $DIR/clashing-extern-fn.rs:83:9
86+
--> $DIR/clashing-extern-fn.rs:82:9
8787
|
8888
LL | fn variadic_decl(x: u8, ...);
8989
| ---------------------------- `variadic_decl` previously declared here
@@ -95,7 +95,7 @@ LL | fn variadic_decl(x: u8);
9595
found `unsafe extern "C" fn(u8)`
9696

9797
warning: `weigh_banana` redeclared with a different signature
98-
--> $DIR/clashing-extern-fn.rs:143:13
98+
--> $DIR/clashing-extern-fn.rs:142:13
9999
|
100100
LL | fn weigh_banana(count: *const Banana) -> u64;
101101
| -------------------------------------------- `weigh_banana` previously declared here
@@ -107,7 +107,7 @@ LL | fn weigh_banana(count: *const Banana) -> u64;
107107
found `unsafe extern "C" fn(*const three::Banana) -> u64`
108108

109109
warning: `draw_point` redeclared with a different signature
110-
--> $DIR/clashing-extern-fn.rs:172:13
110+
--> $DIR/clashing-extern-fn.rs:171:13
111111
|
112112
LL | fn draw_point(p: Point);
113113
| ----------------------- `draw_point` previously declared here
@@ -119,7 +119,7 @@ LL | fn draw_point(p: Point);
119119
found `unsafe extern "C" fn(sameish_members::b::Point)`
120120

121121
warning: `origin` redeclared with a different signature
122-
--> $DIR/clashing-extern-fn.rs:198:13
122+
--> $DIR/clashing-extern-fn.rs:197:13
123123
|
124124
LL | fn origin() -> Point3;
125125
| --------------------- `origin` previously declared here
@@ -131,7 +131,7 @@ LL | fn origin() -> Point3;
131131
found `unsafe extern "C" fn() -> same_sized_members_clash::b::Point3`
132132

133133
warning: `transparent_incorrect` redeclared with a different signature
134-
--> $DIR/clashing-extern-fn.rs:221:13
134+
--> $DIR/clashing-extern-fn.rs:220:13
135135
|
136136
LL | fn transparent_incorrect() -> T;
137137
| ------------------------------- `transparent_incorrect` previously declared here
@@ -143,7 +143,7 @@ LL | fn transparent_incorrect() -> isize;
143143
found `unsafe extern "C" fn() -> isize`
144144

145145
warning: `missing_return_type` redeclared with a different signature
146-
--> $DIR/clashing-extern-fn.rs:260:13
146+
--> $DIR/clashing-extern-fn.rs:259:13
147147
|
148148
LL | fn missing_return_type() -> usize;
149149
| --------------------------------- `missing_return_type` previously declared here
@@ -155,7 +155,7 @@ LL | fn missing_return_type();
155155
found `unsafe extern "C" fn()`
156156

157157
warning: `non_zero_usize` redeclared with a different signature
158-
--> $DIR/clashing-extern-fn.rs:278:13
158+
--> $DIR/clashing-extern-fn.rs:277:13
159159
|
160160
LL | fn non_zero_usize() -> core::num::NonZero<usize>;
161161
| ------------------------------------------------ `non_zero_usize` previously declared here
@@ -167,7 +167,7 @@ LL | fn non_zero_usize() -> usize;
167167
found `unsafe extern "C" fn() -> usize`
168168

169169
warning: `non_null_ptr` redeclared with a different signature
170-
--> $DIR/clashing-extern-fn.rs:280:13
170+
--> $DIR/clashing-extern-fn.rs:279:13
171171
|
172172
LL | fn non_null_ptr() -> core::ptr::NonNull<usize>;
173173
| ---------------------------------------------- `non_null_ptr` previously declared here
@@ -179,7 +179,7 @@ LL | fn non_null_ptr() -> *const usize;
179179
found `unsafe extern "C" fn() -> *const usize`
180180

181181
warning: `option_non_zero_usize_incorrect` redeclared with a different signature
182-
--> $DIR/clashing-extern-fn.rs:374:13
182+
--> $DIR/clashing-extern-fn.rs:373:13
183183
|
184184
LL | fn option_non_zero_usize_incorrect() -> usize;
185185
| --------------------------------------------- `option_non_zero_usize_incorrect` previously declared here
@@ -191,7 +191,7 @@ LL | fn option_non_zero_usize_incorrect() -> isize;
191191
found `unsafe extern "C" fn() -> isize`
192192

193193
warning: `option_non_null_ptr_incorrect` redeclared with a different signature
194-
--> $DIR/clashing-extern-fn.rs:376:13
194+
--> $DIR/clashing-extern-fn.rs:375:13
195195
|
196196
LL | fn option_non_null_ptr_incorrect() -> *const usize;
197197
| -------------------------------------------------- `option_non_null_ptr_incorrect` previously declared here
@@ -203,7 +203,7 @@ LL | fn option_non_null_ptr_incorrect() -> *const isize;
203203
found `unsafe extern "C" fn() -> *const isize`
204204

205205
warning: `hidden_niche_transparent_no_niche` redeclared with a different signature
206-
--> $DIR/clashing-extern-fn.rs:430:13
206+
--> $DIR/clashing-extern-fn.rs:429:13
207207
|
208208
LL | fn hidden_niche_transparent_no_niche() -> usize;
209209
| ----------------------------------------------- `hidden_niche_transparent_no_niche` previously declared here
@@ -215,7 +215,7 @@ LL | fn hidden_niche_transparent_no_niche() -> Option<TransparentNoN
215215
found `unsafe extern "C" fn() -> Option<TransparentNoNiche>`
216216

217217
warning: `hidden_niche_unsafe_cell` redeclared with a different signature
218-
--> $DIR/clashing-extern-fn.rs:434:13
218+
--> $DIR/clashing-extern-fn.rs:433:13
219219
|
220220
LL | fn hidden_niche_unsafe_cell() -> usize;
221221
| -------------------------------------- `hidden_niche_unsafe_cell` previously declared here

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
error: `extern` block uses type `U`, which is not FFI-safe
2-
--> $DIR/lint-ctypes-enum.rs:61:13
2+
--> $DIR/lint-ctypes-enum.rs:60:13
33
|
44
LL | fn uf(x: U);
55
| ^ not FFI-safe
66
|
77
= help: consider adding a `#[repr(C)]`, `#[repr(transparent)]`, or integer `#[repr(...)]` attribute to this enum
88
= note: enum has no representation hint
99
note: the type is defined here
10-
--> $DIR/lint-ctypes-enum.rs:10:1
10+
--> $DIR/lint-ctypes-enum.rs:9:1
1111
|
1212
LL | enum U {
1313
| ^^^^^^
@@ -18,51 +18,51 @@ LL | #![deny(improper_ctypes)]
1818
| ^^^^^^^^^^^^^^^
1919

2020
error: `extern` block uses type `B`, which is not FFI-safe
21-
--> $DIR/lint-ctypes-enum.rs:62:13
21+
--> $DIR/lint-ctypes-enum.rs:61:13
2222
|
2323
LL | fn bf(x: B);
2424
| ^ not FFI-safe
2525
|
2626
= help: consider adding a `#[repr(C)]`, `#[repr(transparent)]`, or integer `#[repr(...)]` attribute to this enum
2727
= note: enum has no representation hint
2828
note: the type is defined here
29-
--> $DIR/lint-ctypes-enum.rs:13:1
29+
--> $DIR/lint-ctypes-enum.rs:12:1
3030
|
3131
LL | enum B {
3232
| ^^^^^^
3333

3434
error: `extern` block uses type `T`, which is not FFI-safe
35-
--> $DIR/lint-ctypes-enum.rs:63:13
35+
--> $DIR/lint-ctypes-enum.rs:62:13
3636
|
3737
LL | fn tf(x: T);
3838
| ^ not FFI-safe
3939
|
4040
= help: consider adding a `#[repr(C)]`, `#[repr(transparent)]`, or integer `#[repr(...)]` attribute to this enum
4141
= note: enum has no representation hint
4242
note: the type is defined here
43-
--> $DIR/lint-ctypes-enum.rs:17:1
43+
--> $DIR/lint-ctypes-enum.rs:16:1
4444
|
4545
LL | enum T {
4646
| ^^^^^^
4747

4848
error: `extern` block uses type `u128`, which is not FFI-safe
49-
--> $DIR/lint-ctypes-enum.rs:75:23
49+
--> $DIR/lint-ctypes-enum.rs:74:23
5050
|
5151
LL | fn nonzero_u128(x: Option<num::NonZero<u128>>);
5252
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ not FFI-safe
5353
|
5454
= note: 128-bit integers don't currently have a known stable ABI
5555

5656
error: `extern` block uses type `i128`, which is not FFI-safe
57-
--> $DIR/lint-ctypes-enum.rs:82:23
57+
--> $DIR/lint-ctypes-enum.rs:81:23
5858
|
5959
LL | fn nonzero_i128(x: Option<num::NonZero<i128>>);
6060
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ not FFI-safe
6161
|
6262
= note: 128-bit integers don't currently have a known stable ABI
6363

6464
error: `extern` block uses type `Option<TransparentUnion<NonZero<u8>>>`, which is not FFI-safe
65-
--> $DIR/lint-ctypes-enum.rs:87:28
65+
--> $DIR/lint-ctypes-enum.rs:86:28
6666
|
6767
LL | fn transparent_union(x: Option<TransparentUnion<num::NonZero<u8>>>);
6868
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not FFI-safe
@@ -71,7 +71,7 @@ LL | fn transparent_union(x: Option<TransparentUnion<num::NonZero<u8>>>);
7171
= note: enum has no representation hint
7272

7373
error: `extern` block uses type `Option<Rust<NonZero<u8>>>`, which is not FFI-safe
74-
--> $DIR/lint-ctypes-enum.rs:89:20
74+
--> $DIR/lint-ctypes-enum.rs:88:20
7575
|
7676
LL | fn repr_rust(x: Option<Rust<num::NonZero<u8>>>);
7777
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not FFI-safe
@@ -80,7 +80,7 @@ LL | fn repr_rust(x: Option<Rust<num::NonZero<u8>>>);
8080
= note: enum has no representation hint
8181

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

‎tests/ui/structs-enums/enum-null-pointer-opt.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
warning: method `dummy` is never used
2-
--> $DIR/enum-null-pointer-opt.rs:11:18
2+
--> $DIR/enum-null-pointer-opt.rs:10:18
33
|
44
LL | trait Trait { fn dummy(&self) { } }
55
| ----- ^^^^^

‎tests/ui/suggestions/core-std-import-order-issue-83564.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0433]: failed to resolve: use of undeclared type `NonZero`
2-
--> $DIR/core-std-import-order-issue-83564.rs:9:14
2+
--> $DIR/core-std-import-order-issue-83564.rs:8:14
33
|
44
LL | let _x = NonZero::new(5u32).unwrap();
55
| ^^^^^^^ use of undeclared type `NonZero`

‎tests/ui/traits/next-solver/specialization-transmute.stderr

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
warning: the feature `specialization` is incomplete and may not be safe to use and/or cause compiler crashes
2-
--> $DIR/specialization-transmute.rs:4:12
2+
--> $DIR/specialization-transmute.rs:3:12
33
|
44
LL | #![feature(specialization)]
55
| ^^^^^^^^^^^^^^
@@ -11,31 +11,31 @@ LL | #![feature(specialization)]
1111
error: cannot normalize `<T as Default>::Id: '_`
1212

1313
error[E0284]: type annotations needed: cannot satisfy `<T as Default>::Id == _`
14-
--> $DIR/specialization-transmute.rs:16:23
14+
--> $DIR/specialization-transmute.rs:15:23
1515
|
1616
LL | fn intu(&self) -> &Self::Id {
1717
| ^^^^^^^^^ cannot satisfy `<T as Default>::Id == _`
1818

1919
error[E0284]: type annotations needed: cannot satisfy `T <: <T as Default>::Id`
20-
--> $DIR/specialization-transmute.rs:18:9
20+
--> $DIR/specialization-transmute.rs:17:9
2121
|
2222
LL | self
2323
| ^^^^ cannot satisfy `T <: <T as Default>::Id`
2424

2525
error[E0284]: type annotations needed: cannot satisfy `<u8 as Default>::Id == Option<NonZero<u8>>`
26-
--> $DIR/specialization-transmute.rs:29:13
26+
--> $DIR/specialization-transmute.rs:28:13
2727
|
2828
LL | let s = transmute::<u8, Option<NonZero<u8>>>(0);
2929
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot satisfy `<u8 as Default>::Id == Option<NonZero<u8>>`
3030
|
3131
note: required by a bound in `transmute`
32-
--> $DIR/specialization-transmute.rs:22:25
32+
--> $DIR/specialization-transmute.rs:21:25
3333
|
3434
LL | fn transmute<T: Default<Id = U>, U: Copy>(t: T) -> U {
3535
| ^^^^^^ required by this bound in `transmute`
3636

3737
error[E0282]: type annotations needed
38-
--> $DIR/specialization-transmute.rs:14:23
38+
--> $DIR/specialization-transmute.rs:13:23
3939
|
4040
LL | default type Id = T;
4141
| ^ cannot infer type for associated type `<T as Default>::Id`

0 commit comments

Comments
 (0)