user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix suggesting turbofish with lifetime arguments

Browse source
This commit is contained in:
Michael Goulet 2022-01-13 15:44:17 -08:00
parent 256721ee51
commit 867554ad7c
8 changed files with 115 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/test/ui/const-generics/min_const_generics/const-expression-suggest-missing-braces-without-turbofish.stderr
View file

@ -4,7 +4,7 @@ error: comparison operators cannot be chained
LL | foo<BAR + 3>();
| ^ ^
|
help: use `::<...>` instead of `<...>` to specify type or const arguments
help: use `::<...>` instead of `<...>` to specify lifetime, type, or const arguments
|
LL | foo::<BAR + 3>();
| ++
@ -15,7 +15,7 @@ error: comparison operators cannot be chained
LL | foo<BAR + BAR>();
| ^ ^
|
help: use `::<...>` instead of `<...>` to specify type or const arguments
help: use `::<...>` instead of `<...>` to specify lifetime, type, or const arguments
|
LL | foo::<BAR + BAR>();
| ++
@ -26,7 +26,7 @@ error: comparison operators cannot be chained
LL | foo<3 + 3>();
| ^ ^
|
help: use `::<...>` instead of `<...>` to specify type or const arguments
help: use `::<...>` instead of `<...>` to specify lifetime, type, or const arguments
|
LL | foo::<3 + 3>();
| ++
@ -37,7 +37,7 @@ error: comparison operators cannot be chained
LL | foo<BAR - 3>();
| ^ ^
|
help: use `::<...>` instead of `<...>` to specify type or const arguments
help: use `::<...>` instead of `<...>` to specify lifetime, type, or const arguments
|
LL | foo::<BAR - 3>();
| ++
@ -48,7 +48,7 @@ error: comparison operators cannot be chained
LL | foo<BAR - BAR>();
| ^ ^
|
help: use `::<...>` instead of `<...>` to specify type or const arguments
help: use `::<...>` instead of `<...>` to specify lifetime, type, or const arguments
|
LL | foo::<BAR - BAR>();
| ++
@ -59,7 +59,7 @@ error: comparison operators cannot be chained
LL | foo<100 - BAR>();
| ^ ^
|
help: use `::<...>` instead of `<...>` to specify type or const arguments
help: use `::<...>` instead of `<...>` to specify lifetime, type, or const arguments
|
LL | foo::<100 - BAR>();
| ++
@ -70,7 +70,7 @@ error: comparison operators cannot be chained
LL | foo<bar<i32>()>();
| ^ ^
|
help: use `::<...>` instead of `<...>` to specify type or const arguments
help: use `::<...>` instead of `<...>` to specify lifetime, type, or const arguments
|
LL | foo::<bar<i32>()>();
| ++
@ -87,7 +87,7 @@ error: comparison operators cannot be chained
LL | foo<bar::<i32>()>();
| ^ ^
|
help: use `::<...>` instead of `<...>` to specify type or const arguments
help: use `::<...>` instead of `<...>` to specify lifetime, type, or const arguments
|
LL | foo::<bar::<i32>()>();
| ++
@ -98,7 +98,7 @@ error: comparison operators cannot be chained
LL | foo<bar::<i32>() + BAR>();
| ^ ^
|
help: use `::<...>` instead of `<...>` to specify type or const arguments
help: use `::<...>` instead of `<...>` to specify lifetime, type, or const arguments
|
LL | foo::<bar::<i32>() + BAR>();
| ++
@ -109,7 +109,7 @@ error: comparison operators cannot be chained
LL | foo<bar::<i32>() - BAR>();
| ^ ^
|
help: use `::<...>` instead of `<...>` to specify type or const arguments
help: use `::<...>` instead of `<...>` to specify lifetime, type, or const arguments
|
LL | foo::<bar::<i32>() - BAR>();
| ++
@ -120,7 +120,7 @@ error: comparison operators cannot be chained
LL | foo<BAR - bar::<i32>()>();
| ^ ^
|
help: use `::<...>` instead of `<...>` to specify type or const arguments
help: use `::<...>` instead of `<...>` to specify lifetime, type, or const arguments
|
LL | foo::<BAR - bar::<i32>()>();
| ++
@ -131,7 +131,7 @@ error: comparison operators cannot be chained
LL | foo<BAR - bar::<i32>()>();
| ^ ^
|
help: use `::<...>` instead of `<...>` to specify type or const arguments
help: use `::<...>` instead of `<...>` to specify lifetime, type, or const arguments
|
LL | foo::<BAR - bar::<i32>()>();
| ++

14
src/test/ui/did_you_mean/issue-40396.stderr
View file

@ -4,7 +4,7 @@ error: comparison operators cannot be chained
LL | (0..13).collect<Vec<i32>>();
| ^ ^
|
help: use `::<...>` instead of `<...>` to specify type or const arguments
help: use `::<...>` instead of `<...>` to specify lifetime, type, or const arguments
|
LL | (0..13).collect::<Vec<i32>>();
| ++
@ -15,7 +15,7 @@ error: comparison operators cannot be chained
LL | Vec<i32>::new();
| ^ ^
|
help: use `::<...>` instead of `<...>` to specify type or const arguments
help: use `::<...>` instead of `<...>` to specify lifetime, type, or const arguments
|
LL | Vec::<i32>::new();
| ++
@ -26,7 +26,7 @@ error: comparison operators cannot be chained
LL | (0..13).collect<Vec<i32>();
| ^ ^
|
help: use `::<...>` instead of `<...>` to specify type or const arguments
help: use `::<...>` instead of `<...>` to specify lifetime, type, or const arguments
|
LL | (0..13).collect::<Vec<i32>();
| ++
@ -37,7 +37,7 @@ error: expected one of `!`, `.`, `::`, `;`, `?`, `else`, `{`, or an operator, fo
LL | let x = std::collections::HashMap<i128, i128>::new();
| ^ expected one of 8 possible tokens
|
help: use `::<...>` instead of `<...>` to specify type or const arguments
help: use `::<...>` instead of `<...>` to specify lifetime, type, or const arguments
|
LL | let x = std::collections::HashMap::<i128, i128>::new();
| ++
@ -48,7 +48,7 @@ error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found
LL | std::collections::HashMap<i128, i128>::new()
| ^ expected one of 8 possible tokens
|
help: use `::<...>` instead of `<...>` to specify type or const arguments
help: use `::<...>` instead of `<...>` to specify lifetime, type, or const arguments
|
LL | std::collections::HashMap::<i128, i128>::new()
| ++
@ -59,7 +59,7 @@ error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found
LL | std::collections::HashMap<i128, i128>::new();
| ^ expected one of 8 possible tokens
|
help: use `::<...>` instead of `<...>` to specify type or const arguments
help: use `::<...>` instead of `<...>` to specify lifetime, type, or const arguments
|
LL | std::collections::HashMap::<i128, i128>::new();
| ++
@ -70,7 +70,7 @@ error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found
LL | std::collections::HashMap<i128, i128>::new(1, 2);
| ^ expected one of 8 possible tokens
|
help: use `::<...>` instead of `<...>` to specify type or const arguments
help: use `::<...>` instead of `<...>` to specify lifetime, type, or const arguments
|
LL | std::collections::HashMap::<i128, i128>::new(1, 2);
| ++

24
src/test/ui/parser/require-parens-for-chained-comparison.rs
View file

@ -1,6 +1,3 @@
fn f<T>() {}
struct X;
fn main() {
false == false == false;
//~^ ERROR comparison operators cannot be chained
@ -12,15 +9,26 @@ fn main() {
f<X>();
//~^ ERROR comparison operators cannot be chained
//~| HELP use `::<...>` instead of `<...>` to specify type or const arguments
//~| HELP use `::<...>` instead of `<...>` to specify lifetime, type, or const arguments
f<Result<Option<X>, Option<Option<X>>>(1, 2);
//~^ ERROR comparison operators cannot be chained
//~| HELP use `::<...>` instead of `<...>` to specify type or const arguments
//~| HELP use `::<...>` instead of `<...>` to specify lifetime, type, or const arguments
use std::convert::identity;
let _ = identity<u8>;
let _ = f<u8, i8>();
//~^ ERROR expected one of
//~| HELP use `::<...>` instead of `<...>` to specify lifetime, type, or const arguments
let _ = f<'_, i8>();
//~^ ERROR expected one of
//~| HELP use `::<...>` instead of `<...>` to specify lifetime, type, or const arguments
f<'_>();
//~^ comparison operators cannot be chained
//~| HELP use `::<...>` instead of `<...>` to specify lifetime, type, or const arguments
let _ = f<u8>;
//~^ ERROR comparison operators cannot be chained
//~| HELP use `::<...>` instead of `<...>` to specify type or const arguments
//~| HELP use `::<...>` instead of `<...>` to specify lifetime, type, or const arguments
//~| HELP or use `(...)` if you meant to specify fn arguments
}

55
src/test/ui/parser/require-parens-for-chained-comparison.stderr
View file

@ -1,5 +1,5 @@
error: comparison operators cannot be chained
--> $DIR/require-parens-for-chained-comparison.rs:5:11
--> $DIR/require-parens-for-chained-comparison.rs:2:11
|
LL | false == false == false;
| ^^ ^^
@ -10,7 +10,7 @@ LL | false == false && false == false;
| ++++++++
error: comparison operators cannot be chained
--> $DIR/require-parens-for-chained-comparison.rs:9:11
--> $DIR/require-parens-for-chained-comparison.rs:6:11
|
LL | false == 0 < 2;
| ^^ ^
@ -21,35 +21,68 @@ LL | false == (0 < 2);
| + +
error: comparison operators cannot be chained
--> $DIR/require-parens-for-chained-comparison.rs:13:6
--> $DIR/require-parens-for-chained-comparison.rs:10:6
|
LL | f<X>();
| ^ ^
|
help: use `::<...>` instead of `<...>` to specify type or const arguments
help: use `::<...>` instead of `<...>` to specify lifetime, type, or const arguments
|
LL | f::<X>();
| ++
error: comparison operators cannot be chained
--> $DIR/require-parens-for-chained-comparison.rs:17:6
--> $DIR/require-parens-for-chained-comparison.rs:14:6
|
LL | f<Result<Option<X>, Option<Option<X>>>(1, 2);
| ^ ^
|
help: use `::<...>` instead of `<...>` to specify type or const arguments
help: use `::<...>` instead of `<...>` to specify lifetime, type, or const arguments
|
LL | f::<Result<Option<X>, Option<Option<X>>>(1, 2);
| ++
error: expected one of `!`, `.`, `::`, `;`, `?`, `else`, `{`, or an operator, found `,`
--> $DIR/require-parens-for-chained-comparison.rs:18:17
|
LL | let _ = f<u8, i8>();
| ^ expected one of 8 possible tokens
|
help: use `::<...>` instead of `<...>` to specify lifetime, type, or const arguments
|
LL | let _ = f::<u8, i8>();
| ++
error: expected one of `.`, `:`, `;`, `?`, `else`, `for`, `loop`, `while`, `{`, or an operator, found `,`
--> $DIR/require-parens-for-chained-comparison.rs:22:17
|
LL | let _ = f<'_, i8>();
| ^ expected one of 10 possible tokens
|
help: use `::<...>` instead of `<...>` to specify lifetime, type, or const arguments
|
LL | let _ = f::<'_, i8>();
| ++
error: comparison operators cannot be chained
--> $DIR/require-parens-for-chained-comparison.rs:22:21
--> $DIR/require-parens-for-chained-comparison.rs:26:6
|
LL | let _ = identity<u8>;
| ^ ^
LL | f<'_>();
| ^ ^
|
= help: use `::<...>` instead of `<...>` to specify type or const arguments
help: use `::<...>` instead of `<...>` to specify lifetime, type, or const arguments
|
LL | f::<'_>();
| ++
error: comparison operators cannot be chained
--> $DIR/require-parens-for-chained-comparison.rs:30:14
|
LL | let _ = f<u8>;
| ^ ^
|
= help: use `::<...>` instead of `<...>` to specify lifetime, type, or const arguments
= help: or use `(...)` if you meant to specify fn arguments
error: aborting due to 5 previous errors
error: aborting due to 8 previous errors

6
src/test/ui/suggestions/issue-82566-1.stderr
View file

@ -4,7 +4,7 @@ error: comparison operators cannot be chained
LL | T1<1>::C;
| ^ ^
|
help: use `::<...>` instead of `<...>` to specify type or const arguments
help: use `::<...>` instead of `<...>` to specify lifetime, type, or const arguments
|
LL | T1::<1>::C;
| ++
@ -15,7 +15,7 @@ error: expected one of `.`, `;`, `?`, `}`, or an operator, found `,`
LL | T2<1, 2>::C;
| ^ expected one of `.`, `;`, `?`, `}`, or an operator
|
help: use `::<...>` instead of `<...>` to specify type or const arguments
help: use `::<...>` instead of `<...>` to specify lifetime, type, or const arguments
|
LL | T2::<1, 2>::C;
| ++
@ -26,7 +26,7 @@ error: expected one of `.`, `;`, `?`, `}`, or an operator, found `,`
LL | T3<1, 2, 3>::C;
| ^ expected one of `.`, `;`, `?`, `}`, or an operator
|
help: use `::<...>` instead of `<...>` to specify type or const arguments
help: use `::<...>` instead of `<...>` to specify lifetime, type, or const arguments
|
LL | T3::<1, 2, 3>::C;
| ++

6
src/test/ui/suggestions/issue-82566-2.stderr
View file

@ -4,7 +4,7 @@ error: comparison operators cannot be chained
LL | fn foo1() -> [(); Foo1<10>::SUM] {
| ^ ^
|
help: use `::<...>` instead of `<...>` to specify type or const arguments
help: use `::<...>` instead of `<...>` to specify lifetime, type, or const arguments
|
LL | fn foo1() -> [(); Foo1::<10>::SUM] {
| ++
@ -15,7 +15,7 @@ error: expected one of `.`, `?`, `]`, or an operator, found `,`
LL | fn foo2() -> [(); Foo2<10, 20>::SUM] {
| ^ expected one of `.`, `?`, `]`, or an operator
|
help: use `::<...>` instead of `<...>` to specify type or const arguments
help: use `::<...>` instead of `<...>` to specify lifetime, type, or const arguments
|
LL | fn foo2() -> [(); Foo2::<10, 20>::SUM] {
| ++
@ -26,7 +26,7 @@ error: expected one of `.`, `?`, `]`, or an operator, found `,`
LL | fn foo3() -> [(); Foo3<10, 20, 30>::SUM] {
| ^ expected one of `.`, `?`, `]`, or an operator
|
help: use `::<...>` instead of `<...>` to specify type or const arguments
help: use `::<...>` instead of `<...>` to specify lifetime, type, or const arguments
|
LL | fn foo3() -> [(); Foo3::<10, 20, 30>::SUM] {
| ++