itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 11:31:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #12013 - XFFXFF:associated_const_equality, r=Veykril

Browse Source 
fix: support `associated_const_equality` in parser

This pr fixes #11965.  The parser now allows eq constraints on associated constants.

I've added tests for `HasCount<Count = {N}>` and `HasCount<Count = 0>`
This commit is contained in:
bors 2022-04-17 13:05:47 +00:00
commit a45a63e577
5 changed files with 121 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crates/parser/src/grammar/generic_args.rs
View File

@ -40,11 +40,19 @@ fn generic_arg(p: &mut Parser) {
name_ref(p); name_ref(p);
opt_generic_arg_list(p, false); opt_generic_arg_list(p, false);
match p.current() { match p.current() {
// test assoc_type_eq
// type T = StreamingIterator<Item<'a> = &'a T>;
T![=] => { T![=] => {
p.bump_any(); p.bump_any();
types::type_(p); if types::TYPE_FIRST.contains(p.current()) {
// test assoc_type_eq
// type T = StreamingIterator<Item<'a> = &'a T>;
types::type_(p);
} else {
// test assoc_const_eq
// fn foo<F: Foo<N=3>>() {}
// const TEST: usize = 3;
// fn bar<F: Foo<N={TEST}>>() {}
const_arg(p);
}
m.complete(p, ASSOC_TYPE_ARG); m.complete(p, ASSOC_TYPE_ARG);
} }
// test assoc_type_bound // test assoc_type_bound

105
crates/parser/test_data/parser/inline/ok/0200_assoc_const_eq.rast Normal file
View File

@ -0,0 +1,105 @@
SOURCE_FILE
FN
FN_KW "fn"
WHITESPACE " "
NAME
IDENT "foo"
GENERIC_PARAM_LIST
L_ANGLE "<"
TYPE_PARAM
NAME
IDENT "F"
COLON ":"
WHITESPACE " "
TYPE_BOUND_LIST
TYPE_BOUND
PATH_TYPE
PATH
PATH_SEGMENT
NAME_REF
IDENT "Foo"
GENERIC_ARG_LIST
L_ANGLE "<"
ASSOC_TYPE_ARG
NAME_REF
IDENT "N"
EQ "="
CONST_ARG
LITERAL
INT_NUMBER "3"
R_ANGLE ">"
R_ANGLE ">"
PARAM_LIST
L_PAREN "("
R_PAREN ")"
WHITESPACE " "
BLOCK_EXPR
STMT_LIST
L_CURLY "{"
R_CURLY "}"
WHITESPACE "\n"
CONST
CONST_KW "const"
WHITESPACE " "
NAME
IDENT "TEST"
COLON ":"
WHITESPACE " "
PATH_TYPE
PATH
PATH_SEGMENT
NAME_REF
IDENT "usize"
WHITESPACE " "
EQ "="
WHITESPACE " "
LITERAL
INT_NUMBER "3"
SEMICOLON ";"
WHITESPACE "\n"
FN
FN_KW "fn"
WHITESPACE " "
NAME
IDENT "bar"
GENERIC_PARAM_LIST
L_ANGLE "<"
TYPE_PARAM
NAME
IDENT "F"
COLON ":"
WHITESPACE " "
TYPE_BOUND_LIST
TYPE_BOUND
PATH_TYPE
PATH
PATH_SEGMENT
NAME_REF
IDENT "Foo"
GENERIC_ARG_LIST
L_ANGLE "<"
ASSOC_TYPE_ARG
NAME_REF
IDENT "N"
EQ "="
CONST_ARG
BLOCK_EXPR
STMT_LIST
L_CURLY "{"
PATH_EXPR
PATH
PATH_SEGMENT
NAME_REF
IDENT "TEST"
R_CURLY "}"
R_ANGLE ">"
R_ANGLE ">"
PARAM_LIST
L_PAREN "("
R_PAREN ")"
WHITESPACE " "
BLOCK_EXPR
STMT_LIST
L_CURLY "{"
R_CURLY "}"
WHITESPACE "\n"

3
crates/parser/test_data/parser/inline/ok/0200_assoc_const_eq.rs Normal file
View File

@ -0,0 +1,3 @@
fn foo<F: Foo<N=3>>() {}
const TEST: usize = 3;
fn bar<F: Foo<N={TEST}>>() {}

2
crates/syntax/rust.ungram
View File

@ -51,7 +51,7 @@ TypeArg =
Type Type
AssocTypeArg = AssocTypeArg =
NameRef GenericParamList? (':' TypeBoundList | '=' Type) NameRef GenericParamList? (':' TypeBoundList | ('=' Type | ConstArg))
LifetimeArg = LifetimeArg =
Lifetime Lifetime

1
crates/syntax/src/ast/generated/nodes.rs
View File

@ -123,6 +123,7 @@ impl AssocTypeArg {
pub fn generic_param_list(&self) -> Option<GenericParamList> { support::child(&self.syntax) } pub fn generic_param_list(&self) -> Option<GenericParamList> { support::child(&self.syntax) }
pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) } pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) }
pub fn ty(&self) -> Option<Type> { support::child(&self.syntax) } pub fn ty(&self) -> Option<Type> { support::child(&self.syntax) }
pub fn const_arg(&self) -> Option<ConstArg> { support::child(&self.syntax) }
} }
#[derive(Debug, Clone, PartialEq, Eq, Hash)] #[derive(Debug, Clone, PartialEq, Eq, Hash)]