Skip to content

fix: don't allow two turbo-fishes in generic arguments #10282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 19, 2021
Merged

fix: don't allow two turbo-fishes in generic arguments #10282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion crates/parser/src/grammar/generic_args.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ fn generic_arg(p: &mut Parser) {
// NameRef::, this is a path type
path_seg.complete(p, PATH_SEGMENT);
let qual = path.complete(p, PATH);
opt_generic_arg_list(p, false);
Copy link
Contributor Author

@matklad matklad Sep 19, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Veykril could you take a look here as well? I think this is not needed, as we parse opt generics before match alraedy.

Copy link
Member

@Veykril Veykril Sep 19, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ye I think you are right

paths::type_path_for_qualifier(p, qual);
path_ty.complete(p, PATH_TYPE);
m.complete(p, TYPE_ARG);
Expand Down
70 changes: 38 additions & 32 deletions crates/syntax/test_data/parser/err/0049_double_fish.rast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,43 +11,44 @@ SOURCE_FILE@0..90
BLOCK_EXPR@7..40
L_CURLY@7..8 "{"
WHITESPACE@8..13 "\n "
EXPR_STMT@13..38
PATH_EXPR@13..37
PATH@13..37
PATH_SEGMENT@13..37
EXPR_STMT@13..31
PATH_EXPR@13..31
PATH@13..31
PATH_SEGMENT@13..31
NAME_REF@13..14
IDENT@13..14 "S"
GENERIC_ARG_LIST@14..37
GENERIC_ARG_LIST@14..31
COLON2@14..16 "::"
L_ANGLE@16..17 "<"
TYPE_ARG@17..36
PATH_TYPE@17..36
PATH@17..28
PATH_SEGMENT@17..28
NAME_REF@17..21
IDENT@17..21 "Item"
GENERIC_ARG_LIST@21..28
COLON2@21..23 "::"
L_ANGLE@23..24 "<"
TYPE_ARG@24..27
PATH_TYPE@24..27
PATH@24..27
PATH_SEGMENT@24..27
NAME_REF@24..27
IDENT@24..27 "lol"
R_ANGLE@27..28 ">"
GENERIC_ARG_LIST@28..36
TYPE_ARG@17..31
PATH_TYPE@17..31
PATH@17..31
PATH@17..28
PATH_SEGMENT@17..28
NAME_REF@17..21
IDENT@17..21 "Item"
GENERIC_ARG_LIST@21..28
COLON2@21..23 "::"
L_ANGLE@23..24 "<"
TYPE_ARG@24..27
PATH_TYPE@24..27
PATH@24..27
PATH_SEGMENT@24..27
NAME_REF@24..27
IDENT@24..27 "lol"
R_ANGLE@27..28 ">"
COLON2@28..30 "::"
L_ANGLE@30..31 "<"
TYPE_ARG@31..35
PATH_TYPE@31..35
PATH@31..35
PATH_SEGMENT@31..35
NAME_REF@31..35
IDENT@31..35 "nope"
R_ANGLE@35..36 ">"
R_ANGLE@36..37 ">"
SEMICOLON@37..38 ";"
ERROR@30..31
L_ANGLE@30..31 "<"
BIN_EXPR@31..38
PATH_EXPR@31..35
PATH@31..35
PATH_SEGMENT@31..35
NAME_REF@31..35
IDENT@31..35 "nope"
SHR@35..37 ">>"
ERROR@37..38
SEMICOLON@37..38 ";"
WHITESPACE@38..39 "\n"
R_CURLY@39..40 "}"
WHITESPACE@40..42 "\n\n"
Expand Down Expand Up @@ -109,6 +110,11 @@ SOURCE_FILE@0..90
WHITESPACE@87..88 "\n"
R_CURLY@88..89 "}"
WHITESPACE@89..90 "\n"
error 30..30: expected identifier
error 31..31: expected COMMA
error 31..31: expected R_ANGLE
error 31..31: expected SEMICOLON
error 37..37: expected expression
error 75..75: expected identifier
error 76..76: expected SEMICOLON
error 82..82: expected expression
Expand Down