Skip to content

Commit 8385c1d

Browse files
committed
Make tidy happy
1 parent b72acd7 commit 8385c1d

11 files changed

+25
-24
lines changed

Diff for: src/test/ui/feature-gates/feature-gate-unsized_fn_params.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ impl Foo for A {
1515
}
1616

1717
fn foo(x: dyn Foo) {
18-
//~^ ERROR: the size for values of type `(dyn Foo + 'static)` cannot be known at compilation time [E0277]
18+
//~^ ERROR [E0277]
1919
x.foo()
2020
}
2121

2222
fn main() {
2323
let x: Box<dyn Foo> = Box::new(A { v: 22 });
2424
foo(*x);
25-
//~^ ERROR: the size for values of type `(dyn Foo + 'static)` cannot be known at compilation time [E0277]
25+
//~^ ERROR [E0277]
2626
}

Diff for: src/test/ui/methods/method-deref-to-same-trait-object-with-separate-params.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
#![feature(arbitrary_self_types, coerce_unsized, dispatch_from_dyn, unsize, unsized_locals, unsized_fn_params)]
2-
//~^ WARN the feature `unsized_locals` is incomplete and may not be safe to use and/or cause compiler crashes [incomplete_features]
1+
#![feature(arbitrary_self_types, coerce_unsized, dispatch_from_dyn, unsize)]
2+
#![feature(unsized_locals, unsized_fn_params)]
3+
//~^ WARN the feature `unsized_locals` is incomplete
34

45
// This tests a few edge-cases around `arbitrary_self_types`. Most specifically,
56
// it checks that the `ObjectCandidate` you get from method matching can't

Diff for: src/test/ui/methods/method-deref-to-same-trait-object-with-separate-params.stderr

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
11
warning: the feature `unsized_locals` is incomplete and may not be safe to use and/or cause compiler crashes
2-
--> $DIR/method-deref-to-same-trait-object-with-separate-params.rs:1:77
2+
--> $DIR/method-deref-to-same-trait-object-with-separate-params.rs:2:12
33
|
4-
LL | #![feature(arbitrary_self_types, coerce_unsized, dispatch_from_dyn, unsize, unsized_locals, unsized_fn_params)]
5-
| ^^^^^^^^^^^^^^
4+
LL | #![feature(unsized_locals, unsized_fn_params)]
5+
| ^^^^^^^^^^^^^^
66
|
77
= note: `#[warn(incomplete_features)]` on by default
88
= note: see issue #48055 <https://github.com/rust-lang/rust/issues/48055> for more information
99

1010
error[E0308]: mismatched types
11-
--> $DIR/method-deref-to-same-trait-object-with-separate-params.rs:86:24
11+
--> $DIR/method-deref-to-same-trait-object-with-separate-params.rs:87:24
1212
|
1313
LL | let _seetype: () = z;
1414
| -- ^ expected `()`, found `u32`
1515
| |
1616
| expected due to this
1717

1818
error[E0308]: mismatched types
19-
--> $DIR/method-deref-to-same-trait-object-with-separate-params.rs:103:24
19+
--> $DIR/method-deref-to-same-trait-object-with-separate-params.rs:104:24
2020
|
2121
LL | let _seetype: () = z;
2222
| -- ^ expected `()`, found `u64`
2323
| |
2424
| expected due to this
2525

2626
error[E0034]: multiple applicable items in scope
27-
--> $DIR/method-deref-to-same-trait-object-with-separate-params.rs:121:15
27+
--> $DIR/method-deref-to-same-trait-object-with-separate-params.rs:122:15
2828
|
2929
LL | let z = x.foo();
3030
| ^^^ multiple `foo` found
3131
|
3232
note: candidate #1 is defined in an impl of the trait `internal::X` for the type `T`
33-
--> $DIR/method-deref-to-same-trait-object-with-separate-params.rs:44:9
33+
--> $DIR/method-deref-to-same-trait-object-with-separate-params.rs:45:9
3434
|
3535
LL | fn foo(self: Smaht<Self, u64>) -> u64 {
3636
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
3737
note: candidate #2 is defined in an impl of the trait `nuisance_foo::NuisanceFoo` for the type `T`
38-
--> $DIR/method-deref-to-same-trait-object-with-separate-params.rs:71:9
38+
--> $DIR/method-deref-to-same-trait-object-with-separate-params.rs:72:9
3939
|
4040
LL | fn foo(self) {}
4141
| ^^^^^^^^^^^^
4242
note: candidate #3 is defined in the trait `FinalFoo`
43-
--> $DIR/method-deref-to-same-trait-object-with-separate-params.rs:58:5
43+
--> $DIR/method-deref-to-same-trait-object-with-separate-params.rs:59:5
4444
|
4545
LL | fn foo(&self) -> u8;
4646
| ^^^^^^^^^^^^^^^^^^^^
@@ -58,23 +58,23 @@ LL | let z = FinalFoo::foo(x);
5858
| ^^^^^^^^^^^^^^^^
5959

6060
error[E0308]: mismatched types
61-
--> $DIR/method-deref-to-same-trait-object-with-separate-params.rs:138:24
61+
--> $DIR/method-deref-to-same-trait-object-with-separate-params.rs:139:24
6262
|
6363
LL | let _seetype: () = z;
6464
| -- ^ expected `()`, found `u8`
6565
| |
6666
| expected due to this
6767

6868
error[E0308]: mismatched types
69-
--> $DIR/method-deref-to-same-trait-object-with-separate-params.rs:156:24
69+
--> $DIR/method-deref-to-same-trait-object-with-separate-params.rs:157:24
7070
|
7171
LL | let _seetype: () = z;
7272
| -- ^ expected `()`, found `u32`
7373
| |
7474
| expected due to this
7575

7676
error[E0308]: mismatched types
77-
--> $DIR/method-deref-to-same-trait-object-with-separate-params.rs:173:24
77+
--> $DIR/method-deref-to-same-trait-object-with-separate-params.rs:174:24
7878
|
7979
LL | let _seetype: () = z;
8080
| -- ^ expected `()`, found `u32`

Diff for: src/test/ui/moves/move-out-of-slice-2.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#![feature(unsized_locals)]
2-
//~^ WARN the feature `unsized_locals` is incomplete and may not be safe to use and/or cause compiler crashes [incomplete_features]
2+
//~^ WARN the feature `unsized_locals` is incomplete
33

44
struct A;
55
#[derive(Clone, Copy)]

Diff for: src/test/ui/unsized-locals/borrow-after-move.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#![feature(unsized_locals, unsized_fn_params)]
2-
//~^ WARN the feature `unsized_locals` is incomplete and may not be safe to use and/or cause compiler crashes [incomplete_features]
2+
//~^ WARN the feature `unsized_locals` is incomplete
33

44
pub trait Foo {
55
fn foo(self) -> String;

Diff for: src/test/ui/unsized-locals/by-value-trait-object-safety.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#![feature(unsized_locals)]
2-
//~^ WARN the feature `unsized_locals` is incomplete and may not be safe to use and/or cause compiler crashes [incomplete_features]
2+
//~^ WARN the feature `unsized_locals` is incomplete
33

44
pub trait Foo {
55
fn foo(self) -> String

Diff for: src/test/ui/unsized-locals/double-move.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#![feature(unsized_locals, unsized_fn_params)]
2-
//~^ WARN the feature `unsized_locals` is incomplete and may not be safe to use and/or cause compiler crashes [incomplete_features]
2+
//~^ WARN the feature `unsized_locals` is incomplete
33

44
pub trait Foo {
55
fn foo(self) -> String;

Diff for: src/test/ui/unsized-locals/issue-30276-feature-flagged.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#![feature(unsized_locals)]
2-
//~^ WARN the feature `unsized_locals` is incomplete and may not be safe to use and/or cause compiler crashes [incomplete_features]
2+
//~^ WARN the feature `unsized_locals` is incomplete
33

44
struct Test([i32]);
55

Diff for: src/test/ui/unsized-locals/issue-50940-with-feature.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#![feature(unsized_locals, unsized_fn_params)]
2-
//~^ WARN the feature `unsized_locals` is incomplete and may not be safe to use and/or cause compiler crashes [incomplete_features]
2+
//~^ WARN the feature `unsized_locals` is incomplete
33

44
fn main() {
55
struct A<X: ?Sized>(X);

Diff for: src/test/ui/unsized-locals/unsized-exprs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#![feature(unsized_tuple_coercion, unsized_locals, unsized_fn_params)]
2-
//~^ WARN the feature `unsized_locals` is incomplete and may not be safe to use and/or cause compiler crashes [incomplete_features]
2+
//~^ WARN the feature `unsized_locals` is incomplete
33

44
struct A<X: ?Sized>(X);
55

Diff for: src/test/ui/unsized-locals/unsized-exprs2.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#![feature(unsized_tuple_coercion, unsized_locals, unsized_fn_params)]
2-
//~^ WARN the feature `unsized_locals` is incomplete and may not be safe to use and/or cause compiler crashes [incomplete_features]
2+
//~^ WARN the feature `unsized_locals` is incomplete
33

44
struct A<X: ?Sized>(X);
55

0 commit comments

Comments
 (0)