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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 14 additions & 14 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 12 additions & 2 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

0 commit comments

Comments
 (0)