From bff8dd094958f1abe2fcfe8fe9f15dc7a7e6b53e Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sat, 1 Aug 2020 13:47:19 +0200 Subject: Update grammar --- .../ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast | 2 +- .../parser/inline/ok/0004_value_parameters_no_patterns.rast | 4 ++-- .../test_data/parser/inline/ok/0013_pointer_type_mut.rast | 4 ++-- .../ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast | 2 +- .../test_data/parser/inline/ok/0032_fn_pointer_type.rast | 8 ++++---- .../test_data/parser/inline/ok/0033_reference_type;.rast | 6 +++--- .../test_data/parser/inline/ok/0045_param_list_opt_patterns.rast | 2 +- crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast | 8 ++++---- .../test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rast | 2 +- .../parser/inline/ok/0122_generic_lifetime_type_attribute.rast | 2 +- .../test_data/parser/inline/ok/0123_param_list_vararg.rast | 2 +- .../ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast | 2 +- crates/ra_syntax/test_data/parser/inline/ok/0150_array_attrs.rast | 2 +- .../parser/inline/ok/0154_fn_pointer_param_ident_path.rast | 4 ++-- .../test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rast | 2 +- 15 files changed, 26 insertions(+), 26 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/inline/ok') diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast b/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast index b0f2b5888..62da7b887 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast @@ -42,7 +42,7 @@ SOURCE_FILE@0..54 PARAM_LIST@40..49 L_PAREN@40..41 "(" PARAM@41..48 - REFERENCE_TYPE@41..48 + REF_TYPE@41..48 AMP@41..42 "&" LIFETIME@42..44 "\'a" WHITESPACE@44..45 " " diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast b/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast index 44d92aedb..b650735ba 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast @@ -31,7 +31,7 @@ SOURCE_FILE@0..39 COMMA@19..20 "," WHITESPACE@20..21 " " PARAM@21..25 - REFERENCE_TYPE@21..25 + REF_TYPE@21..25 AMP@21..22 "&" PATH_TYPE@22..25 PATH@22..25 @@ -41,7 +41,7 @@ SOURCE_FILE@0..39 COMMA@25..26 "," WHITESPACE@26..27 " " PARAM@27..31 - REFERENCE_TYPE@27..31 + REF_TYPE@27..31 AMP@27..28 "&" PATH_TYPE@28..31 PATH@28..31 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rast b/crates/ra_syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rast index 845b32e6d..d33215b50 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rast @@ -7,7 +7,7 @@ SOURCE_FILE@0..36 WHITESPACE@6..7 " " EQ@7..8 "=" WHITESPACE@8..9 " " - POINTER_TYPE@9..16 + PTR_TYPE@9..16 STAR@9..10 "*" MUT_KW@10..13 "mut" WHITESPACE@13..14 " " @@ -24,7 +24,7 @@ SOURCE_FILE@0..36 WHITESPACE@24..25 " " EQ@25..26 "=" WHITESPACE@26..27 " " - POINTER_TYPE@27..34 + PTR_TYPE@27..34 STAR@27..28 "*" MUT_KW@28..31 "mut" WHITESPACE@31..32 " " diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast b/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast index 1b31aa95a..ddbd66588 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast @@ -22,7 +22,7 @@ SOURCE_FILE@0..69 SELF_KW@18..22 "self" COLON@22..23 ":" WHITESPACE@23..24 " " - REFERENCE_TYPE@24..29 + REF_TYPE@24..29 AMP@24..25 "&" PATH_TYPE@25..29 PATH@25..29 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rast index 79a5ee339..dda6577ed 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rast @@ -7,7 +7,7 @@ SOURCE_FILE@0..113 WHITESPACE@6..7 " " EQ@7..8 "=" WHITESPACE@8..9 " " - FN_POINTER_TYPE@9..13 + FN_PTR_TYPE@9..13 FN_KW@9..11 "fn" PARAM_LIST@11..13 L_PAREN@11..12 "(" @@ -22,7 +22,7 @@ SOURCE_FILE@0..113 WHITESPACE@21..22 " " EQ@22..23 "=" WHITESPACE@23..24 " " - FN_POINTER_TYPE@24..35 + FN_PTR_TYPE@24..35 UNSAFE_KW@24..30 "unsafe" WHITESPACE@30..31 " " FN_KW@31..33 "fn" @@ -39,7 +39,7 @@ SOURCE_FILE@0..113 WHITESPACE@43..44 " " EQ@44..45 "=" WHITESPACE@45..46 " " - FN_POINTER_TYPE@46..68 + FN_PTR_TYPE@46..68 UNSAFE_KW@46..52 "unsafe" WHITESPACE@52..53 " " ABI@53..63 @@ -61,7 +61,7 @@ SOURCE_FILE@0..113 WHITESPACE@76..77 " " EQ@77..78 "=" WHITESPACE@78..79 " " - FN_POINTER_TYPE@79..111 + FN_PTR_TYPE@79..111 ABI@79..89 EXTERN_KW@79..85 "extern" WHITESPACE@85..86 " " diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0033_reference_type;.rast b/crates/ra_syntax/test_data/parser/inline/ok/0033_reference_type;.rast index c522f76cf..974df9f9a 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0033_reference_type;.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0033_reference_type;.rast @@ -7,7 +7,7 @@ SOURCE_FILE@0..54 WHITESPACE@6..7 " " EQ@7..8 "=" WHITESPACE@8..9 " " - REFERENCE_TYPE@9..12 + REF_TYPE@9..12 AMP@9..10 "&" TUPLE_TYPE@10..12 L_PAREN@10..11 "(" @@ -22,7 +22,7 @@ SOURCE_FILE@0..54 WHITESPACE@20..21 " " EQ@21..22 "=" WHITESPACE@22..23 " " - REFERENCE_TYPE@23..34 + REF_TYPE@23..34 AMP@23..24 "&" LIFETIME@24..31 "\'static" WHITESPACE@31..32 " " @@ -39,7 +39,7 @@ SOURCE_FILE@0..54 WHITESPACE@42..43 " " EQ@43..44 "=" WHITESPACE@44..45 " " - REFERENCE_TYPE@45..52 + REF_TYPE@45..52 AMP@45..46 "&" MUT_KW@46..49 "mut" WHITESPACE@49..50 " " diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast b/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast index c100d1c71..6baea6e3c 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast @@ -21,7 +21,7 @@ SOURCE_FILE@0..35 PARAM_LIST@15..29 L_PAREN@15..16 "(" PARAM@16..28 - REFERENCE_TYPE@16..28 + REF_TYPE@16..28 AMP@16..17 "&" MUT_KW@17..20 "mut" WHITESPACE@20..21 " " diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast index 5f4807522..f319d5141 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast @@ -15,7 +15,7 @@ SOURCE_FILE@0..121 LIFETIME@13..15 "\'a" R_ANGLE@15..16 ">" WHITESPACE@16..17 " " - FN_POINTER_TYPE@17..27 + FN_PTR_TYPE@17..27 FN_KW@17..19 "fn" PARAM_LIST@19..21 L_PAREN@19..20 "(" @@ -45,7 +45,7 @@ SOURCE_FILE@0..121 LIFETIME@42..44 "\'a" R_ANGLE@44..45 ">" WHITESPACE@45..46 " " - FN_POINTER_TYPE@46..80 + FN_PTR_TYPE@46..80 UNSAFE_KW@46..52 "unsafe" WHITESPACE@52..53 " " ABI@53..63 @@ -57,7 +57,7 @@ SOURCE_FILE@0..121 PARAM_LIST@66..74 L_PAREN@66..67 "(" PARAM@67..73 - REFERENCE_TYPE@67..73 + REF_TYPE@67..73 AMP@67..68 "&" LIFETIME@68..70 "\'a" WHITESPACE@70..71 " " @@ -98,7 +98,7 @@ SOURCE_FILE@0..121 GENERIC_ARG_LIST@110..119 L_ANGLE@110..111 "<" TYPE_ARG@111..118 - REFERENCE_TYPE@111..118 + REF_TYPE@111..118 AMP@111..112 "&" LIFETIME@112..114 "\'a" WHITESPACE@114..115 " " diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rast b/crates/ra_syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rast index 95686977f..f80326465 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rast @@ -7,7 +7,7 @@ SOURCE_FILE@0..21 WHITESPACE@6..7 " " EQ@7..8 "=" WHITESPACE@8..9 " " - FN_POINTER_TYPE@9..19 + FN_PTR_TYPE@9..19 FN_KW@9..11 "fn" PARAM_LIST@11..13 L_PAREN@11..12 "(" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast b/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast index 8d029b592..570b95205 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast @@ -47,7 +47,7 @@ SOURCE_FILE@0..64 UNDERSCORE@50..51 "_" COLON@51..52 ":" WHITESPACE@52..53 " " - REFERENCE_TYPE@53..58 + REF_TYPE@53..58 AMP@53..54 "&" LIFETIME@54..56 "\'a" WHITESPACE@56..57 " " diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.rast b/crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.rast index 27c4f141f..7cdec6634 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.rast @@ -21,7 +21,7 @@ SOURCE_FILE@0..57 IDENT@23..29 "format" COLON@29..30 ":" WHITESPACE@30..31 " " - POINTER_TYPE@31..40 + PTR_TYPE@31..40 STAR@31..32 "*" CONST_KW@32..37 "const" WHITESPACE@37..38 " " diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast b/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast index ca739825a..a36cc8dab 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast @@ -27,7 +27,7 @@ SOURCE_FILE@0..43 WHITESPACE@25..26 " " AS_KW@26..28 "as" WHITESPACE@28..29 " " - POINTER_TYPE@29..39 + PTR_TYPE@29..39 STAR@29..30 "*" CONST_KW@30..35 "const" WHITESPACE@35..36 " " diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0150_array_attrs.rast b/crates/ra_syntax/test_data/parser/inline/ok/0150_array_attrs.rast index 0c35bf2b7..f284aafcd 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0150_array_attrs.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0150_array_attrs.rast @@ -6,7 +6,7 @@ SOURCE_FILE@0..40 IDENT@6..7 "A" COLON@7..8 ":" WHITESPACE@8..9 " " - REFERENCE_TYPE@9..15 + REF_TYPE@9..15 AMP@9..10 "&" SLICE_TYPE@10..15 L_BRACK@10..11 "[" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rast b/crates/ra_syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rast index c48fed03e..e6aff7b37 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rast @@ -7,7 +7,7 @@ SOURCE_FILE@0..55 WHITESPACE@8..9 " " EQ@9..10 "=" WHITESPACE@10..11 " " - FN_POINTER_TYPE@11..23 + FN_PTR_TYPE@11..23 FN_KW@11..13 "fn" PARAM_LIST@13..23 L_PAREN@13..14 "(" @@ -33,7 +33,7 @@ SOURCE_FILE@0..55 WHITESPACE@33..34 " " EQ@34..35 "=" WHITESPACE@35..36 " " - FN_POINTER_TYPE@36..53 + FN_PTR_TYPE@36..53 FN_KW@36..38 "fn" PARAM_LIST@38..53 L_PAREN@38..39 "(" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rast b/crates/ra_syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rast index 3079e5bf8..6abb4fe5a 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rast @@ -7,7 +7,7 @@ SOURCE_FILE@0..23 WHITESPACE@8..9 " " EQ@9..10 "=" WHITESPACE@10..11 " " - FN_POINTER_TYPE@11..21 + FN_PTR_TYPE@11..21 FN_KW@11..13 "fn" PARAM_LIST@13..21 L_PAREN@13..14 "(" -- cgit v1.2.3