Skip to content

Commit 9eab4ec

Browse files
authored
Rollup merge of rust-lang#45122 - jean-lourenco:master, r=nikomatsakis
Better compile error output when using arguments instead of types Following @estebank sugestion on issue rust-lang#18945 (comment)
2 parents 82f2c28 + db91b00 commit 9eab4ec

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

src/libsyntax/parse/parser.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2960,6 +2960,7 @@ impl<'a> Parser<'a> {
29602960
{ // Foo<Bar<Baz<Qux, ()>>>
29612961
err.help(
29622962
"use `::<...>` instead of `<...>` if you meant to specify type arguments");
2963+
err.help("or use `(...)` if you meant to specify fn arguments");
29632964
}
29642965
err.emit();
29652966
}

src/test/parse-fail/require-parens-for-chained-comparison.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,6 @@ fn main() {
2121

2222
f<X>();
2323
//~^ ERROR: chained comparison operators require parentheses
24-
//~^^ HELP: use `::<...>` instead of `<...>`
24+
//~| HELP: use `::<...>` instead of `<...>`
25+
//~| HELP: or use `(...)`
2526
}

src/test/ui/did_you_mean/issue-40396.stderr

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ error: chained comparison operators require parentheses
55
| ^^^^^^^^
66
|
77
= help: use `::<...>` instead of `<...>` if you meant to specify type arguments
8+
= help: or use `(...)` if you meant to specify fn arguments
89

910
error: chained comparison operators require parentheses
1011
--> $DIR/issue-40396.rs:16:25
@@ -13,6 +14,7 @@ error: chained comparison operators require parentheses
1314
| ^^^^^^^
1415
|
1516
= help: use `::<...>` instead of `<...>` if you meant to specify type arguments
17+
= help: or use `(...)` if you meant to specify fn arguments
1618

1719
error: chained comparison operators require parentheses
1820
--> $DIR/issue-40396.rs:20:37
@@ -21,6 +23,7 @@ error: chained comparison operators require parentheses
2123
| ^^^^^^^^
2224
|
2325
= help: use `::<...>` instead of `<...>` if you meant to specify type arguments
26+
= help: or use `(...)` if you meant to specify fn arguments
2427

2528
error: chained comparison operators require parentheses
2629
--> $DIR/issue-40396.rs:20:41
@@ -29,6 +32,7 @@ error: chained comparison operators require parentheses
2932
| ^^^^^^
3033
|
3134
= help: use `::<...>` instead of `<...>` if you meant to specify type arguments
35+
= help: or use `(...)` if you meant to specify fn arguments
3236

3337
error: aborting due to 4 previous errors
3438

0 commit comments

Comments
 (0)