aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_syntax/tests/data/parser/inline/ok/0065_dyn_trait_type.txt
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2019-03-31 10:11:48 +0100
committerbors[bot] <bors[bot]@users.noreply.github.com>2019-03-31 10:11:48 +0100
commitc5ca49678f129045e59438df279829902034ec71 (patch)
tree3fd54185e0c064fbd6f718ac345064ce9c559efb /crates/ra_syntax/tests/data/parser/inline/ok/0065_dyn_trait_type.txt
parent23dd53eb35ff50508d0c0fc5878a55754b12d381 (diff)
parent55dcdb7d094f473c73f87ecf997b24f8e35f2a5e (diff)
Merge #1077
1077: Improve parsing of type bounds r=matklad a=vipentti This adds new TYPE_BOUND_LIST and TYPE_BOUND syntax kinds. These are now used when parsing type bounds. In addition parsing paths inside a bound now does not recursively parse paths, rather they are treated as separate bounds, separated by +. Basically now the generic params `struct S<T: 'a + ?Sized + (Copy)>;` in will be parsed as ``` TYPE_PARAM_LIST@[8; 33) L_ANGLE@[8; 9) TYPE_PARAM@[9; 32) NAME@[9; 10) IDENT@[9; 10) "T" COLON@[10; 11) WHITESPACE@[11; 12) TYPE_BOUND_LIST@[12; 32) TYPE_BOUND@[12; 14) LIFETIME@[12; 14) "'a" WHITESPACE@[14; 15) PLUS@[15; 16) WHITESPACE@[16; 17) TYPE_BOUND@[17; 23) QUESTION@[17; 18) PATH_TYPE@[18; 23) PATH@[18; 23) PATH_SEGMENT@[18; 23) NAME_REF@[18; 23) IDENT@[18; 23) "Sized" WHITESPACE@[23; 24) PLUS@[24; 25) WHITESPACE@[25; 26) TYPE_BOUND@[26; 32) L_PAREN@[26; 27) PATH_TYPE@[27; 31) PATH@[27; 31) PATH_SEGMENT@[27; 31) NAME_REF@[27; 31) IDENT@[27; 31) "Copy" R_PAREN@[31; 32) R_ANGLE@[32; 33) ``` Previously it was parsed, with the paths nested: ``` TYPE_PARAM_LIST@[8; 33) L_ANGLE@[8; 9) TYPE_PARAM@[9; 32) NAME@[9; 10) IDENT@[9; 10) "T" COLON@[10; 11) WHITESPACE@[11; 12) LIFETIME@[12; 14) "'a" WHITESPACE@[14; 15) PLUS@[15; 16) WHITESPACE@[16; 17) QUESTION@[17; 18) PATH_TYPE@[18; 32) PATH@[18; 23) PATH_SEGMENT@[18; 23) NAME_REF@[18; 23) IDENT@[18; 23) "Sized" WHITESPACE@[23; 24) PLUS@[24; 25) WHITESPACE@[25; 26) L_PAREN@[26; 27) PATH_TYPE@[27; 31) PATH@[27; 31) PATH_SEGMENT@[27; 31) NAME_REF@[27; 31) IDENT@[27; 31) "Copy" R_PAREN@[31; 32) R_ANGLE@[32; 33) ``` Looking for feedback. Co-authored-by: Ville Penttinen <[email protected]>
Diffstat (limited to 'crates/ra_syntax/tests/data/parser/inline/ok/0065_dyn_trait_type.txt')
-rw-r--r--crates/ra_syntax/tests/data/parser/inline/ok/0065_dyn_trait_type.txt49
1 files changed, 26 insertions, 23 deletions
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0065_dyn_trait_type.txt b/crates/ra_syntax/tests/data/parser/inline/ok/0065_dyn_trait_type.txt
index f6a0967f2..e33d8ada1 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0065_dyn_trait_type.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/ok/0065_dyn_trait_type.txt
@@ -10,31 +10,34 @@ SOURCE_FILE@[0; 42)
10 DYN_TRAIT_TYPE@[9; 40) 10 DYN_TRAIT_TYPE@[9; 40)
11 DYN_KW@[9; 12) 11 DYN_KW@[9; 12)
12 WHITESPACE@[12; 13) 12 WHITESPACE@[12; 13)
13 PATH_TYPE@[13; 40) 13 TYPE_BOUND_LIST@[13; 40)
14 PATH@[13; 35) 14 TYPE_BOUND@[13; 35)
15 PATH_SEGMENT@[13; 35) 15 PATH_TYPE@[13; 35)
16 NAME_REF@[13; 21) 16 PATH@[13; 35)
17 IDENT@[13; 21) "Iterator" 17 PATH_SEGMENT@[13; 35)
18 TYPE_ARG_LIST@[21; 35) 18 NAME_REF@[13; 21)
19 L_ANGLE@[21; 22) 19 IDENT@[13; 21) "Iterator"
20 ASSOC_TYPE_ARG@[22; 34) 20 TYPE_ARG_LIST@[21; 35)
21 NAME_REF@[22; 26) 21 L_ANGLE@[21; 22)
22 IDENT@[22; 26) "Item" 22 ASSOC_TYPE_ARG@[22; 34)
23 EQ@[26; 27) 23 NAME_REF@[22; 26)
24 PATH_TYPE@[27; 34) 24 IDENT@[22; 26) "Item"
25 PATH@[27; 34) 25 EQ@[26; 27)
26 PATH_SEGMENT@[27; 34) 26 PATH_TYPE@[27; 34)
27 NAME_REF@[27; 30) 27 PATH@[27; 34)
28 IDENT@[27; 30) "Foo" 28 PATH_SEGMENT@[27; 34)
29 TYPE_ARG_LIST@[30; 34) 29 NAME_REF@[27; 30)
30 L_ANGLE@[30; 31) 30 IDENT@[27; 30) "Foo"
31 LIFETIME_ARG@[31; 33) 31 TYPE_ARG_LIST@[30; 34)
32 LIFETIME@[31; 33) "'a" 32 L_ANGLE@[30; 31)
33 R_ANGLE@[33; 34) 33 LIFETIME_ARG@[31; 33)
34 R_ANGLE@[34; 35) 34 LIFETIME@[31; 33) "'a"
35 R_ANGLE@[33; 34)
36 R_ANGLE@[34; 35)
35 WHITESPACE@[35; 36) 37 WHITESPACE@[35; 36)
36 PLUS@[36; 37) 38 PLUS@[36; 37)
37 WHITESPACE@[37; 38) 39 WHITESPACE@[37; 38)
38 LIFETIME@[38; 40) "'a" 40 TYPE_BOUND@[38; 40)
41 LIFETIME@[38; 40) "'a"
39 SEMI@[40; 41) 42 SEMI@[40; 41)
40 WHITESPACE@[41; 42) 43 WHITESPACE@[41; 42)