squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Merge #11672

Browse source 
11672: Add support for new `where` clause location in associated types. r=Veykril a=Dirbaio

A recent Rust nightly changed it: https://github.com/rust-lang/rust/issues/89122

This allows both the old and new location.

Fixes #11651

Co-authored-by: Dario Nieuwenhuis <dirbaio@dirbaio.net>
This commit is contained in:
bors[bot] 2022-03-10 17:24:36 +00:00 committed by GitHub
parent 356c507357 49d1207775
commit e963443a0d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 47 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
crates/parser/src/grammar/items.rs
View file

@ -290,12 +290,17 @@ fn type_alias(p: &mut Parser, m: Marker) {
generic_params::bounds(p);
}
// test type_item_where_clause
// test type_item_where_clause_deprecated
// type Foo where Foo: Copy = ();
generic_params::opt_where_clause(p);
if p.eat(T![=]) {
types::type_(p);
}
// test type_item_where_clause
// type Foo = () where Foo: Copy;
generic_params::opt_where_clause(p);
p.expect(T![;]);
m.complete(p, TYPE_ALIAS);
}

12
crates/parser/test_data/parser/inline/ok/0012_type_item_where_clause.rast
View file

@ -5,6 +5,12 @@ SOURCE_FILE
NAME
IDENT "Foo"
WHITESPACE " "
EQ "="
WHITESPACE " "
TUPLE_TYPE
L_PAREN "("
R_PAREN ")"
WHITESPACE " "
WHERE_CLAUSE
WHERE_KW "where"
WHITESPACE " "
@ -23,11 +29,5 @@ SOURCE_FILE
PATH_SEGMENT
NAME_REF
IDENT "Copy"
WHITESPACE " "
EQ "="
WHITESPACE " "
TUPLE_TYPE
L_PAREN "("
R_PAREN ")"
SEMICOLON ";"
WHITESPACE "\n"

2
crates/parser/test_data/parser/inline/ok/0012_type_item_where_clause.rs
View file

@ -1 +1 @@
type Foo where Foo: Copy = ();
type Foo = () where Foo: Copy;

33
crates/parser/test_data/parser/inline/ok/0199_type_item_where_clause_deprecated.rast Normal file
View file

@ -0,0 +1,33 @@
SOURCE_FILE
TYPE_ALIAS
TYPE_KW "type"
WHITESPACE " "
NAME
IDENT "Foo"
WHITESPACE " "
WHERE_CLAUSE
WHERE_KW "where"
WHITESPACE " "
WHERE_PRED
PATH_TYPE
PATH
PATH_SEGMENT
NAME_REF
IDENT "Foo"
COLON ":"
WHITESPACE " "
TYPE_BOUND_LIST
TYPE_BOUND
PATH_TYPE
PATH
PATH_SEGMENT
NAME_REF
IDENT "Copy"
WHITESPACE " "
EQ "="
WHITESPACE " "
TUPLE_TYPE
L_PAREN "("
R_PAREN ")"
SEMICOLON ";"
WHITESPACE "\n"

1
crates/parser/test_data/parser/inline/ok/0199_type_item_where_clause_deprecated.rs Normal file
View file

@ -0,0 +1 @@
type Foo where Foo: Copy = ();