Skip to content

Commit a8f17e3

Browse files
committed
bless tests
1 parent e1f735a commit a8f17e3

7 files changed

+27
-7
lines changed

src/test/ui/async-await/issue-70935-complex-spans.drop_tracking.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ LL | async fn baz<T>(_c: impl FnMut() -> T) where T: Future<Output=()> {
1818
| ___________________________________________________________________^
1919
LL | | }
2020
| |_^
21-
= note: required because it captures the following types: `ResumeTy`, `impl for<'a, 'b, 'c> Future<Output = ()>`, `()`
21+
= note: required because it captures the following types: `ResumeTy`, `impl Future<Output = ()>`, `()`
2222
note: required because it's used within this `async` block
2323
--> $DIR/issue-70935-complex-spans.rs:16:16
2424
|

src/test/ui/coherence/coherence-fn-covariant-bound-vs-static.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
error[E0119]: conflicting implementations of trait `Trait` for type `for<'r> fn(for<'r> fn(&'r ()))`
1+
error[E0119]: conflicting implementations of trait `Trait` for type `for<'r> fn(fn(&'r ()))`
22
--> $DIR/coherence-fn-covariant-bound-vs-static.rs:17:1
33
|
44
LL | impl Trait for for<'r> fn(fn(&'r ())) {}
55
| ------------------------------------- first implementation here
66
LL | impl<'a> Trait for fn(fn(&'a ())) {}
7-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `for<'r> fn(for<'r> fn(&'r ()))`
7+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `for<'r> fn(fn(&'r ()))`
88
|
99
= note: this behavior recently changed as a result of a bug fix; see rust-lang/rust#56105 for details
1010

src/test/ui/lifetimes/re-empty-in-error.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: higher-ranked lifetime error
44
LL | foo(&10);
55
| ^^^^^^^^
66
|
7-
= note: could not prove `for<'b, 'a> &'b (): 'a`
7+
= note: could not prove `for<'b> &'b (): 'a`
88

99
error: aborting due to previous error
1010

src/test/ui/regions/issue-102392.rs

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
fn g(f: for<'a> fn(fn(&str, &'a str))) -> bool {
2+
f
3+
//~^ ERROR mismatched types
4+
}
5+
6+
fn main() {}
+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
error[E0308]: mismatched types
2+
--> $DIR/issue-102392.rs:2:5
3+
|
4+
LL | fn g(f: for<'a> fn(fn(&str, &'a str))) -> bool {
5+
| ---- expected `bool` because of return type
6+
LL | f
7+
| ^ expected `bool`, found fn pointer
8+
|
9+
= note: expected type `bool`
10+
found fn pointer `for<'a> fn(for<'b> fn(&'b str, &'a str))`
11+
12+
error: aborting due to previous error
13+
14+
For more information about this error, try `rustc --explain E0308`.

src/test/ui/where-clauses/higher-ranked-fn-type.quiet.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
error[E0277]: the trait bound `for<'b> for<'b> fn(&'b ()): Foo` is not satisfied
1+
error[E0277]: the trait bound `for<'b> fn(&'b ()): Foo` is not satisfied
22
--> $DIR/higher-ranked-fn-type.rs:20:5
33
|
44
LL | called()
5-
| ^^^^^^ the trait `for<'b> Foo` is not implemented for `for<'b> fn(&'b ())`
5+
| ^^^^^^ the trait `for<'b> Foo` is not implemented for `fn(&'b ())`
66
|
77
note: required by a bound in `called`
88
--> $DIR/higher-ranked-fn-type.rs:12:25

src/test/ui/where-clauses/higher-ranked-fn-type.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ where
1818
(for<'a> fn(&'a ())): Foo,
1919
{
2020
called()
21-
//[quiet]~^ ERROR the trait bound `for<'b> for<'b> fn(&'b ()): Foo` is not satisfied
21+
//[quiet]~^ ERROR the trait bound `for<'b> fn(&'b ()): Foo` is not satisfied
2222
//[verbose]~^^ ERROR the trait bound `for<'b> fn(&ReLateBound(
2323
}
2424

0 commit comments

Comments
 (0)