Skip to content

Commit 6676902

Browse files
committed
update ui test expectations
1 parent 5864487 commit 6676902

17 files changed

+64
-54
lines changed

src/test/ui/derives/derives-span-Hash-enum-struct-variant.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | x: Error
77
::: $SRC_DIR/core/src/hash/mod.rs:LL:COL
88
|
99
LL | fn hash<H: Hasher>(&self, state: &mut H);
10-
| - required by this bound in `std::hash::Hash::hash`
10+
| ------ required by this bound in `std::hash::Hash::hash`
1111
|
1212
= note: this error originates in the derive macro `Hash` (in Nightly builds, run with -Z macro-backtrace for more info)
1313

src/test/ui/derives/derives-span-Hash-enum.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | Error
77
::: $SRC_DIR/core/src/hash/mod.rs:LL:COL
88
|
99
LL | fn hash<H: Hasher>(&self, state: &mut H);
10-
| - required by this bound in `std::hash::Hash::hash`
10+
| ------ required by this bound in `std::hash::Hash::hash`
1111
|
1212
= note: this error originates in the derive macro `Hash` (in Nightly builds, run with -Z macro-backtrace for more info)
1313

src/test/ui/derives/derives-span-Hash-struct.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | x: Error
77
::: $SRC_DIR/core/src/hash/mod.rs:LL:COL
88
|
99
LL | fn hash<H: Hasher>(&self, state: &mut H);
10-
| - required by this bound in `std::hash::Hash::hash`
10+
| ------ required by this bound in `std::hash::Hash::hash`
1111
|
1212
= note: this error originates in the derive macro `Hash` (in Nightly builds, run with -Z macro-backtrace for more info)
1313

src/test/ui/derives/derives-span-Hash-tuple-struct.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | Error
77
::: $SRC_DIR/core/src/hash/mod.rs:LL:COL
88
|
99
LL | fn hash<H: Hasher>(&self, state: &mut H);
10-
| - required by this bound in `std::hash::Hash::hash`
10+
| ------ required by this bound in `std::hash::Hash::hash`
1111
|
1212
= note: this error originates in the derive macro `Hash` (in Nightly builds, run with -Z macro-backtrace for more info)
1313

Original file line numberDiff line numberDiff line change
@@ -1,17 +1,3 @@
1-
error[E0277]: the trait bound `Self: Trait1` is not satisfied
2-
--> $DIR/issue-74816.rs:10:5
3-
|
4-
LL | type Associated: Trait1 = Self;
5-
| ^^^^^^^^^^^^^^^^^------^^^^^^^^
6-
| | |
7-
| | required by this bound in `Trait2::Associated`
8-
| the trait `Trait1` is not implemented for `Self`
9-
|
10-
help: consider further restricting `Self`
11-
|
12-
LL | trait Trait2: Trait1 {
13-
| ^^^^^^^^
14-
151
error[E0277]: the size for values of type `Self` cannot be known at compilation time
162
--> $DIR/issue-74816.rs:10:5
173
|
@@ -26,6 +12,20 @@ help: consider further restricting `Self`
2612
LL | trait Trait2: Sized {
2713
| ^^^^^^^
2814

15+
error[E0277]: the trait bound `Self: Trait1` is not satisfied
16+
--> $DIR/issue-74816.rs:10:5
17+
|
18+
LL | type Associated: Trait1 = Self;
19+
| ^^^^^^^^^^^^^^^^^------^^^^^^^^
20+
| | |
21+
| | required by this bound in `Trait2::Associated`
22+
| the trait `Trait1` is not implemented for `Self`
23+
|
24+
help: consider further restricting `Self`
25+
|
26+
LL | trait Trait2: Trait1 {
27+
| ^^^^^^^^
28+
2929
error: aborting due to 2 previous errors
3030

3131
For more information about this error, try `rustc --explain E0277`.

src/test/ui/generics/issue-61631-default-type-param-can-reference-self-in-trait.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0277]: the size for values of type `[()]` cannot be known at compilation
22
--> $DIR/issue-61631-default-type-param-can-reference-self-in-trait.rs:19:6
33
|
44
LL | trait Tsized<P: Sized = [Self]> {}
5-
| - required by this bound in `Tsized`
5+
| ----- required by this bound in `Tsized`
66
LL |
77
LL | impl Tsized for () {}
88
| ^^^^^^ doesn't have a size known at compile-time

src/test/ui/issues/issue-16966.stderr

+12-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,21 @@
1-
error[E0282]: type annotations needed
1+
error[E0283]: type annotations needed
22
--> $DIR/issue-16966.rs:2:5
33
|
44
LL | panic!(std::default::Default::default());
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot infer type for type parameter `M` declared on the function `begin_panic`
6+
|
7+
::: $SRC_DIR/std/src/panicking.rs:LL:COL
68
|
9+
LL | pub fn begin_panic<M: Any + Send>(msg: M) -> ! {
10+
| --- required by this bound in `begin_panic`
11+
|
12+
= note: cannot satisfy `_: Any`
713
= note: this error originates in the macro `$crate::panic::panic_2015` (in Nightly builds, run with -Z macro-backtrace for more info)
14+
help: consider specifying the type argument in the function call
15+
|
16+
LL | $crate::rt::begin_panic::<M>($msg)
17+
| ^^^^^
818

919
error: aborting due to previous error
1020

11-
For more information about this error, try `rustc --explain E0282`.
21+
For more information about this error, try `rustc --explain E0283`.

src/test/ui/issues/issue-21160.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | struct Foo(Bar);
77
::: $SRC_DIR/core/src/hash/mod.rs:LL:COL
88
|
99
LL | fn hash<H: Hasher>(&self, state: &mut H);
10-
| - required by this bound in `std::hash::Hash::hash`
10+
| ------ required by this bound in `std::hash::Hash::hash`
1111
|
1212
= note: this error originates in the derive macro `Hash` (in Nightly builds, run with -Z macro-backtrace for more info)
1313

src/test/ui/issues/issue-23122-2.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error[E0275]: overflow evaluating the requirement `<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<T as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next: Sized`
1+
error[E0275]: overflow evaluating the requirement `<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<T as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next: Next`
22
--> $DIR/issue-23122-2.rs:9:5
33
|
44
LL | type Next = <GetNext<T::Next> as Next>::Next;

src/test/ui/issues/issue-54954.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ LL | const ARR_LEN: usize = Tt::const_val::<[i8; 123]>();
1111
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot infer type
1212
...
1313
LL | const fn const_val<T: Sized>() -> usize {
14-
| - required by this bound in `Tt::const_val`
14+
| ----- required by this bound in `Tt::const_val`
1515
|
1616
= note: cannot satisfy `_: Tt`
1717

src/test/ui/suggestions/issue-84973-blacklist.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ error[E0277]: the size for values of type `dyn Fn()` cannot be known at compilat
3131
--> $DIR/issue-84973-blacklist.rs:22:13
3232
|
3333
LL | fn f_sized<T: Sized>(t: T) {}
34-
| - required by this bound in `f_sized`
34+
| ----- required by this bound in `f_sized`
3535
...
3636
LL | f_sized(*ref_cl);
3737
| ^^^^^^^ doesn't have a size known at compile-time

src/test/ui/type-alias-impl-trait/generic_duplicate_param_use9.full_tait.stderr

+12-12
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,6 @@ note: previous use here
1919
LL | fn two<T: Debug + Foo, U: Debug>(t: T, u: U) -> Two<T, U> {
2020
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2121

22-
error[E0277]: the trait bound `A: Foo` is not satisfied in `(A, B, <A as Foo>::Bar)`
23-
--> $DIR/generic_duplicate_param_use9.rs:10:18
24-
|
25-
LL | type Two<A, B> = impl Debug;
26-
| ^^^^^^^^^^ within `(A, B, <A as Foo>::Bar)`, the trait `Foo` is not implemented for `A`
27-
|
28-
= note: required because it appears within the type `(A, B, <A as Foo>::Bar)`
29-
help: consider restricting type parameter `A`
30-
|
31-
LL | type Two<A: Foo, B> = impl Debug;
32-
| ^^^^^
33-
3422
error[E0277]: `A` doesn't implement `Debug`
3523
--> $DIR/generic_duplicate_param_use9.rs:10:18
3624
|
@@ -55,6 +43,18 @@ help: consider restricting type parameter `B`
5543
LL | type Two<A, B: std::fmt::Debug> = impl Debug;
5644
| ^^^^^^^^^^^^^^^^^
5745

46+
error[E0277]: the trait bound `A: Foo` is not satisfied
47+
--> $DIR/generic_duplicate_param_use9.rs:10:18
48+
|
49+
LL | type Two<A, B> = impl Debug;
50+
| ^^^^^^^^^^ the trait `Foo` is not implemented for `A`
51+
|
52+
= note: required because of the requirements on the impl of `Debug` for `(A, B, <A as Foo>::Bar)`
53+
help: consider restricting type parameter `A`
54+
|
55+
LL | type Two<A: Foo, B> = impl Debug;
56+
| ^^^^^
57+
5858
error: aborting due to 4 previous errors; 1 warning emitted
5959

6060
For more information about this error, try `rustc --explain E0277`.

src/test/ui/type-alias-impl-trait/generic_duplicate_param_use9.min_tait.stderr

+12-12
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,6 @@ note: previous use here
1010
LL | fn two<T: Debug + Foo, U: Debug>(t: T, u: U) -> Two<T, U> {
1111
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1212

13-
error[E0277]: the trait bound `A: Foo` is not satisfied in `(A, B, <A as Foo>::Bar)`
14-
--> $DIR/generic_duplicate_param_use9.rs:10:18
15-
|
16-
LL | type Two<A, B> = impl Debug;
17-
| ^^^^^^^^^^ within `(A, B, <A as Foo>::Bar)`, the trait `Foo` is not implemented for `A`
18-
|
19-
= note: required because it appears within the type `(A, B, <A as Foo>::Bar)`
20-
help: consider restricting type parameter `A`
21-
|
22-
LL | type Two<A: Foo, B> = impl Debug;
23-
| ^^^^^
24-
2513
error[E0277]: `A` doesn't implement `Debug`
2614
--> $DIR/generic_duplicate_param_use9.rs:10:18
2715
|
@@ -46,6 +34,18 @@ help: consider restricting type parameter `B`
4634
LL | type Two<A, B: std::fmt::Debug> = impl Debug;
4735
| ^^^^^^^^^^^^^^^^^
4836

37+
error[E0277]: the trait bound `A: Foo` is not satisfied
38+
--> $DIR/generic_duplicate_param_use9.rs:10:18
39+
|
40+
LL | type Two<A, B> = impl Debug;
41+
| ^^^^^^^^^^ the trait `Foo` is not implemented for `A`
42+
|
43+
= note: required because of the requirements on the impl of `Debug` for `(A, B, <A as Foo>::Bar)`
44+
help: consider restricting type parameter `A`
45+
|
46+
LL | type Two<A: Foo, B> = impl Debug;
47+
| ^^^^^
48+
4949
error: aborting due to 4 previous errors
5050

5151
For more information about this error, try `rustc --explain E0277`.

src/test/ui/type-alias-impl-trait/generic_duplicate_param_use9.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use std::fmt::Debug;
88
fn main() {}
99

1010
type Two<A, B> = impl Debug;
11-
//~^ ERROR the trait bound `A: Foo` is not satisfied in `(A, B, <A as Foo>::Bar)`
11+
//~^ ERROR the trait bound `A: Foo` is not satisfied
1212
//~| ERROR `A` doesn't implement `Debug`
1313
//~| ERROR `B` doesn't implement `Debug`
1414

src/test/ui/unique-object-noncopyable.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ LL | | >(Unique<T>, A);
1919
| |________________- doesn't satisfy `Box<dyn Foo>: Clone`
2020
|
2121
= note: the following trait bounds were not satisfied:
22-
`dyn Foo: Sized`
23-
which is required by `Box<dyn Foo>: Clone`
2422
`dyn Foo: Clone`
2523
which is required by `Box<dyn Foo>: Clone`
24+
`dyn Foo: Sized`
25+
which is required by `Box<dyn Foo>: Clone`
2626

2727
error: aborting due to previous error
2828

src/test/ui/unsized/unsized-bare-typaram.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0277]: the size for values of type `T` cannot be known at compilation tim
22
--> $DIR/unsized-bare-typaram.rs:2:29
33
|
44
LL | fn bar<T: Sized>() { }
5-
| - required by this bound in `bar`
5+
| ----- required by this bound in `bar`
66
LL | fn foo<T: ?Sized>() { bar::<T>() }
77
| - ^ doesn't have a size known at compile-time
88
| |

src/test/ui/unsized/unsized-struct.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ error[E0277]: the size for values of type `T` cannot be known at compilation tim
2121
--> $DIR/unsized-struct.rs:13:24
2222
|
2323
LL | fn is_sized<T:Sized>() { }
24-
| - required by this bound in `is_sized`
24+
| ----- required by this bound in `is_sized`
2525
...
2626
LL | fn bar2<T: ?Sized>() { is_sized::<Bar<T>>() }
2727
| - ^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time

0 commit comments

Comments
 (0)