From c1a7b72fb7c9b69779e490e1d692ddfccec8b57a Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Mon, 13 Aug 2018 18:27:26 +0300
Subject: renames
---
.../libsyntax2/tests/data/parser/inline/0001_const_unsafe_fn.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0002_const_fn.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0004_extern_fn.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0007_unsafe_trait.txt | 2 +-
.../tests/data/parser/inline/0009_unsafe_auto_trait.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0011_unsafe_fn.txt | 2 +-
.../libsyntax2/tests/data/parser/inline/0012_unsafe_extern_fn.txt | 2 +-
.../tests/data/parser/inline/0013_unsafe_block_in_mod.txt | 4 ++--
.../tests/data/parser/inline/0014_type_item_type_params.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0015_type_item.txt | 2 +-
.../tests/data/parser/inline/0016_type_item_where_clause.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0017_paren_type.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0018_unit_type.txt | 2 +-
.../tests/data/parser/inline/0019_singleton_tuple_type.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0020_never_type.txt | 2 +-
.../tests/data/parser/inline/0021_pointer_type_no_mutability.txt | 2 +-
.../libsyntax2/tests/data/parser/inline/0022_pointer_type_mut.txt | 4 ++--
.../tests/data/parser/inline/0023_array_type_missing_semi.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0024_array_type.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0025_slice_type.txt | 2 +-
.../libsyntax2/tests/data/parser/inline/0026_reference_type;.txt | 6 +++---
.../libsyntax2/tests/data/parser/inline/0027_placeholder_type.txt | 2 +-
.../libsyntax2/tests/data/parser/inline/0028_fn_pointer_type.txt | 6 +++---
.../tests/data/parser/inline/0029_fn_pointer_type_missing_fn.txt | 2 +-
.../tests/data/parser/inline/0030_fn_pointer_type_with_ret.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0031_for_type.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0032_path_type.txt | 8 ++++----
crates/libsyntax2/tests/data/parser/inline/0034_bind_pat.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0035_ref_pat.txt | 2 +-
.../libsyntax2/tests/data/parser/inline/0036_placeholder_pat.txt | 2 +-
.../libsyntax2/tests/data/parser/inline/0037_crate_visibility.txt | 8 ++++----
.../tests/data/parser/inline/0038_function_ret_type.txt | 4 ++--
crates/libsyntax2/tests/data/parser/inline/0039_path_expr.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0040_expr_literals.txt | 2 +-
.../tests/data/parser/inline/0041_type_param_bounds.txt | 2 +-
.../tests/data/parser/inline/0042_type_param_default.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0043_call_expr.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0044_ref_expr.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0045_block.txt | 8 ++++----
crates/libsyntax2/tests/data/parser/inline/0050_let_stmt;.txt | 2 +-
.../libsyntax2/tests/data/parser/inline/0051_method_call_expr.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0052_field_expr.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0053_block_items.txt | 4 ++--
.../libsyntax2/tests/data/parser/inline/0054_impl_item_items.txt | 8 ++++----
crates/libsyntax2/tests/data/parser/inline/0055_self_param.txt | 8 ++++----
crates/libsyntax2/tests/data/parser/inline/0056_trait_item.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0057_auto_trait.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0058_type_arg.txt | 2 +-
.../tests/data/parser/inline/0059_function_where_clause.txt | 2 +-
.../tests/data/parser/inline/0060_function_type_params.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0061_struct_lit.txt | 2 +-
.../libsyntax2/tests/data/parser/inline/0063_impl_trait_type.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0063_lambda_expr.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0064_param_list.txt | 8 ++++----
crates/libsyntax2/tests/data/parser/inline/0065_if_expr.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0066_lambda_expr.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0067_block_expr.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0068_pub_expr.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0068_return_expr.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0069_match_arm.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0070_match_expr.txt | 2 +-
.../libsyntax2/tests/data/parser/inline/0071_tuple_pat_fields.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0072_path_part.txt | 2 +-
.../tests/data/parser/inline/0073_struct_pat_fields.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0074_unary_expr.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0075_try_expr.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0076_cond.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0077_while_expr.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0078_mod_contents.txt | 4 ++--
crates/libsyntax2/tests/data/parser/inline/0079_cast_expr.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0080_tuple_expr.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0081_index_expr.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0082_tuple_pat.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0083_postfix_range.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0084_loop_expr.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0085_for_expr.txt | 2 +-
.../tests/data/parser/inline/0085_match_arms_commas.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0086_array_expr.txt | 2 +-
.../tests/data/parser/inline/0086_no_semi_after_block.txt | 2 +-
.../tests/data/parser/inline/0087_stmt_postfix_expr_ambiguity.txt | 2 +-
.../tests/data/parser/inline/0088_stmt_bin_expr_ambiguity.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0089_slice_pat.txt | 2 +-
.../libsyntax2/tests/data/parser/inline/0090_trait_item_items.txt | 8 ++++----
crates/libsyntax2/tests/data/parser/inline/0091_fn_decl.txt | 4 ++--
.../libsyntax2/tests/data/parser/inline/0092_literal_pattern.txt | 2 +-
.../tests/data/parser/inline/0093_path_fn_trait_args.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0094_range_pat.txt | 2 +-
.../tests/data/parser/inline/0095_path_type_with_bounds.txt | 2 +-
.../data/parser/inline/0096_value_parameters_no_patterns.txt | 2 +-
.../tests/data/parser/inline/0097_param_list_opt_patterns.txt | 2 +-
crates/libsyntax2/tests/data/parser/inline/0098_where_clause.txt | 2 +-
.../tests/data/parser/inline/0099_crate_keyword_vis.txt | 2 +-
92 files changed, 123 insertions(+), 123 deletions(-)
(limited to 'crates/libsyntax2/tests/data/parser/inline')
diff --git a/crates/libsyntax2/tests/data/parser/inline/0001_const_unsafe_fn.txt b/crates/libsyntax2/tests/data/parser/inline/0001_const_unsafe_fn.txt
index 3932d033c..234c3c748 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0001_const_unsafe_fn.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0001_const_unsafe_fn.txt
@@ -1,5 +1,5 @@
FILE@[0; 25)
- FUNCTION@[0; 24)
+ FN_DEF@[0; 24)
CONST_KW@[0; 5)
WHITESPACE@[5; 6)
UNSAFE_KW@[6; 12)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0002_const_fn.txt b/crates/libsyntax2/tests/data/parser/inline/0002_const_fn.txt
index bc72ab235..c7d66b2e1 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0002_const_fn.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0002_const_fn.txt
@@ -1,5 +1,5 @@
FILE@[0; 18)
- FUNCTION@[0; 17)
+ FN_DEF@[0; 17)
CONST_KW@[0; 5)
WHITESPACE@[5; 6)
FN_KW@[6; 8)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0004_extern_fn.txt b/crates/libsyntax2/tests/data/parser/inline/0004_extern_fn.txt
index e7787d4ab..161af9c7d 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0004_extern_fn.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0004_extern_fn.txt
@@ -1,5 +1,5 @@
FILE@[0; 19)
- FUNCTION@[0; 18)
+ FN_DEF@[0; 18)
ABI@[0; 6)
EXTERN_KW@[0; 6)
WHITESPACE@[6; 7)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0007_unsafe_trait.txt b/crates/libsyntax2/tests/data/parser/inline/0007_unsafe_trait.txt
index a98c05c77..e75f18802 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0007_unsafe_trait.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0007_unsafe_trait.txt
@@ -1,5 +1,5 @@
FILE@[0; 18)
- TRAIT@[0; 17)
+ TRAIT_DEF@[0; 17)
UNSAFE_KW@[0; 6)
WHITESPACE@[6; 7)
TRAIT_KW@[7; 12)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0009_unsafe_auto_trait.txt b/crates/libsyntax2/tests/data/parser/inline/0009_unsafe_auto_trait.txt
index dac09a654..78d0331d0 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0009_unsafe_auto_trait.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0009_unsafe_auto_trait.txt
@@ -1,5 +1,5 @@
FILE@[0; 23)
- TRAIT@[0; 22)
+ TRAIT_DEF@[0; 22)
UNSAFE_KW@[0; 6)
WHITESPACE@[6; 7)
AUTO_KW@[7; 11)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0011_unsafe_fn.txt b/crates/libsyntax2/tests/data/parser/inline/0011_unsafe_fn.txt
index 9e5dcafa6..3f9672f54 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0011_unsafe_fn.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0011_unsafe_fn.txt
@@ -1,5 +1,5 @@
FILE@[0; 19)
- FUNCTION@[0; 18)
+ FN_DEF@[0; 18)
UNSAFE_KW@[0; 6)
WHITESPACE@[6; 7)
FN_KW@[7; 9)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0012_unsafe_extern_fn.txt b/crates/libsyntax2/tests/data/parser/inline/0012_unsafe_extern_fn.txt
index 7ed4d42c1..27c807aea 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0012_unsafe_extern_fn.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0012_unsafe_extern_fn.txt
@@ -1,5 +1,5 @@
FILE@[0; 30)
- FUNCTION@[0; 29)
+ FN_DEF@[0; 29)
UNSAFE_KW@[0; 6)
WHITESPACE@[6; 7)
ABI@[7; 17)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0013_unsafe_block_in_mod.txt b/crates/libsyntax2/tests/data/parser/inline/0013_unsafe_block_in_mod.txt
index d1bcffe77..4cd9b579c 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0013_unsafe_block_in_mod.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0013_unsafe_block_in_mod.txt
@@ -1,5 +1,5 @@
FILE@[0; 33)
- FUNCTION@[0; 10)
+ FN_DEF@[0; 10)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
@@ -21,7 +21,7 @@ FILE@[0; 33)
WHITESPACE@[19; 20)
R_CURLY@[20; 21)
WHITESPACE@[21; 22)
- FUNCTION@[22; 32)
+ FN_DEF@[22; 32)
FN_KW@[22; 24)
WHITESPACE@[24; 25)
NAME@[25; 28)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0014_type_item_type_params.txt b/crates/libsyntax2/tests/data/parser/inline/0014_type_item_type_params.txt
index e39e57889..be4f7d17d 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0014_type_item_type_params.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0014_type_item_type_params.txt
@@ -1,5 +1,5 @@
FILE@[0; 21)
- TYPE_ITEM@[0; 20)
+ TYPE_DEF@[0; 20)
TYPE_KW@[0; 4)
WHITESPACE@[4; 5)
NAME@[5; 11)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0015_type_item.txt b/crates/libsyntax2/tests/data/parser/inline/0015_type_item.txt
index 964071aa1..a6c63b030 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0015_type_item.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0015_type_item.txt
@@ -1,5 +1,5 @@
FILE@[0; 16)
- TYPE_ITEM@[0; 15)
+ TYPE_DEF@[0; 15)
TYPE_KW@[0; 4)
WHITESPACE@[4; 5)
NAME@[5; 8)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0016_type_item_where_clause.txt b/crates/libsyntax2/tests/data/parser/inline/0016_type_item_where_clause.txt
index 2f3c52960..6df40a6e4 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0016_type_item_where_clause.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0016_type_item_where_clause.txt
@@ -1,5 +1,5 @@
FILE@[0; 31)
- TYPE_ITEM@[0; 30)
+ TYPE_DEF@[0; 30)
TYPE_KW@[0; 4)
WHITESPACE@[4; 5)
NAME@[5; 8)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0017_paren_type.txt b/crates/libsyntax2/tests/data/parser/inline/0017_paren_type.txt
index 1194fb02c..9858ff955 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0017_paren_type.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0017_paren_type.txt
@@ -1,5 +1,5 @@
FILE@[0; 16)
- TYPE_ITEM@[0; 15)
+ TYPE_DEF@[0; 15)
TYPE_KW@[0; 4)
WHITESPACE@[4; 5)
NAME@[5; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0018_unit_type.txt b/crates/libsyntax2/tests/data/parser/inline/0018_unit_type.txt
index e52af7b1e..83e06de45 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0018_unit_type.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0018_unit_type.txt
@@ -1,5 +1,5 @@
FILE@[0; 13)
- TYPE_ITEM@[0; 12)
+ TYPE_DEF@[0; 12)
TYPE_KW@[0; 4)
WHITESPACE@[4; 5)
NAME@[5; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0019_singleton_tuple_type.txt b/crates/libsyntax2/tests/data/parser/inline/0019_singleton_tuple_type.txt
index 7b8e06c25..662fa4fd8 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0019_singleton_tuple_type.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0019_singleton_tuple_type.txt
@@ -1,5 +1,5 @@
FILE@[0; 17)
- TYPE_ITEM@[0; 16)
+ TYPE_DEF@[0; 16)
TYPE_KW@[0; 4)
WHITESPACE@[4; 5)
NAME@[5; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0020_never_type.txt b/crates/libsyntax2/tests/data/parser/inline/0020_never_type.txt
index 89f8a9eea..3ce4f08a9 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0020_never_type.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0020_never_type.txt
@@ -1,5 +1,5 @@
FILE@[0; 16)
- TYPE_ITEM@[0; 15)
+ TYPE_DEF@[0; 15)
TYPE_KW@[0; 4)
WHITESPACE@[4; 5)
NAME@[5; 10)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0021_pointer_type_no_mutability.txt b/crates/libsyntax2/tests/data/parser/inline/0021_pointer_type_no_mutability.txt
index d86fc6388..7bbb18a7f 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0021_pointer_type_no_mutability.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0021_pointer_type_no_mutability.txt
@@ -1,5 +1,5 @@
FILE@[0; 14)
- TYPE_ITEM@[0; 13)
+ TYPE_DEF@[0; 13)
TYPE_KW@[0; 4)
WHITESPACE@[4; 5)
NAME@[5; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0022_pointer_type_mut.txt b/crates/libsyntax2/tests/data/parser/inline/0022_pointer_type_mut.txt
index fbeba506e..169e2b922 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0022_pointer_type_mut.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0022_pointer_type_mut.txt
@@ -1,5 +1,5 @@
FILE@[0; 36)
- TYPE_ITEM@[0; 17)
+ TYPE_DEF@[0; 17)
TYPE_KW@[0; 4)
WHITESPACE@[4; 5)
NAME@[5; 6)
@@ -16,7 +16,7 @@ FILE@[0; 36)
R_PAREN@[15; 16)
SEMI@[16; 17)
WHITESPACE@[17; 18)
- TYPE_ITEM@[18; 35)
+ TYPE_DEF@[18; 35)
TYPE_KW@[18; 22)
WHITESPACE@[22; 23)
NAME@[23; 24)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0023_array_type_missing_semi.txt b/crates/libsyntax2/tests/data/parser/inline/0023_array_type_missing_semi.txt
index 4d90d52c7..140ff1320 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0023_array_type_missing_semi.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0023_array_type_missing_semi.txt
@@ -1,5 +1,5 @@
FILE@[0; 18)
- TYPE_ITEM@[0; 12)
+ TYPE_DEF@[0; 12)
TYPE_KW@[0; 4)
WHITESPACE@[4; 5)
NAME@[5; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0024_array_type.txt b/crates/libsyntax2/tests/data/parser/inline/0024_array_type.txt
index 5a6b76904..835a0dba8 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0024_array_type.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0024_array_type.txt
@@ -1,5 +1,5 @@
FILE@[0; 19)
- TYPE_ITEM@[0; 18)
+ TYPE_DEF@[0; 18)
TYPE_KW@[0; 4)
WHITESPACE@[4; 5)
NAME@[5; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0025_slice_type.txt b/crates/libsyntax2/tests/data/parser/inline/0025_slice_type.txt
index 52508cda4..83cf530c3 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0025_slice_type.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0025_slice_type.txt
@@ -1,5 +1,5 @@
FILE@[0; 15)
- TYPE_ITEM@[0; 14)
+ TYPE_DEF@[0; 14)
TYPE_KW@[0; 4)
WHITESPACE@[4; 5)
NAME@[5; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0026_reference_type;.txt b/crates/libsyntax2/tests/data/parser/inline/0026_reference_type;.txt
index b6bd6a48c..02c5aa26c 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0026_reference_type;.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0026_reference_type;.txt
@@ -1,5 +1,5 @@
FILE@[0; 54)
- TYPE_ITEM@[0; 13)
+ TYPE_DEF@[0; 13)
TYPE_KW@[0; 4)
WHITESPACE@[4; 5)
NAME@[5; 6)
@@ -14,7 +14,7 @@ FILE@[0; 54)
R_PAREN@[11; 12)
SEMI@[12; 13)
WHITESPACE@[13; 14)
- TYPE_ITEM@[14; 35)
+ TYPE_DEF@[14; 35)
TYPE_KW@[14; 18)
WHITESPACE@[18; 19)
NAME@[19; 20)
@@ -31,7 +31,7 @@ FILE@[0; 54)
R_PAREN@[33; 34)
SEMI@[34; 35)
WHITESPACE@[35; 36)
- TYPE_ITEM@[36; 53)
+ TYPE_DEF@[36; 53)
TYPE_KW@[36; 40)
WHITESPACE@[40; 41)
NAME@[41; 42)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0027_placeholder_type.txt b/crates/libsyntax2/tests/data/parser/inline/0027_placeholder_type.txt
index 5e6e6c397..9583c94b6 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0027_placeholder_type.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0027_placeholder_type.txt
@@ -1,5 +1,5 @@
FILE@[0; 22)
- TYPE_ITEM@[0; 21)
+ TYPE_DEF@[0; 21)
TYPE_KW@[0; 4)
WHITESPACE@[4; 5)
NAME@[5; 16)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0028_fn_pointer_type.txt b/crates/libsyntax2/tests/data/parser/inline/0028_fn_pointer_type.txt
index 31818365a..1e0526531 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0028_fn_pointer_type.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0028_fn_pointer_type.txt
@@ -1,5 +1,5 @@
FILE@[0; 70)
- TYPE_ITEM@[0; 14)
+ TYPE_DEF@[0; 14)
TYPE_KW@[0; 4)
WHITESPACE@[4; 5)
NAME@[5; 6)
@@ -14,7 +14,7 @@ FILE@[0; 70)
R_PAREN@[12; 13)
SEMI@[13; 14)
WHITESPACE@[14; 15)
- TYPE_ITEM@[15; 36)
+ TYPE_DEF@[15; 36)
TYPE_KW@[15; 19)
WHITESPACE@[19; 20)
NAME@[20; 21)
@@ -31,7 +31,7 @@ FILE@[0; 70)
R_PAREN@[34; 35)
SEMI@[35; 36)
WHITESPACE@[36; 37)
- TYPE_ITEM@[37; 69)
+ TYPE_DEF@[37; 69)
TYPE_KW@[37; 41)
WHITESPACE@[41; 42)
NAME@[42; 43)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0029_fn_pointer_type_missing_fn.txt b/crates/libsyntax2/tests/data/parser/inline/0029_fn_pointer_type_missing_fn.txt
index ddec1b866..5c83654cc 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0029_fn_pointer_type_missing_fn.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0029_fn_pointer_type_missing_fn.txt
@@ -1,5 +1,5 @@
FILE@[0; 20)
- TYPE_ITEM@[0; 15)
+ TYPE_DEF@[0; 15)
TYPE_KW@[0; 4)
WHITESPACE@[4; 5)
NAME@[5; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0030_fn_pointer_type_with_ret.txt b/crates/libsyntax2/tests/data/parser/inline/0030_fn_pointer_type_with_ret.txt
index 447b1ed3f..5ac307fd0 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0030_fn_pointer_type_with_ret.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0030_fn_pointer_type_with_ret.txt
@@ -1,5 +1,5 @@
FILE@[0; 21)
- TYPE_ITEM@[0; 20)
+ TYPE_DEF@[0; 20)
TYPE_KW@[0; 4)
WHITESPACE@[4; 5)
NAME@[5; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0031_for_type.txt b/crates/libsyntax2/tests/data/parser/inline/0031_for_type.txt
index 65753a702..a46356777 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0031_for_type.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0031_for_type.txt
@@ -1,5 +1,5 @@
FILE@[0; 29)
- TYPE_ITEM@[0; 28)
+ TYPE_DEF@[0; 28)
TYPE_KW@[0; 4)
WHITESPACE@[4; 5)
NAME@[5; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0032_path_type.txt b/crates/libsyntax2/tests/data/parser/inline/0032_path_type.txt
index d9085118a..b07bea075 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0032_path_type.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0032_path_type.txt
@@ -1,5 +1,5 @@
FILE@[0; 71)
- TYPE_ITEM@[0; 13)
+ TYPE_DEF@[0; 13)
TYPE_KW@[0; 4)
WHITESPACE@[4; 5)
NAME@[5; 6)
@@ -14,7 +14,7 @@ FILE@[0; 71)
IDENT@[9; 12) "Foo"
SEMI@[12; 13)
WHITESPACE@[13; 14)
- TYPE_ITEM@[14; 29)
+ TYPE_DEF@[14; 29)
TYPE_KW@[14; 18)
WHITESPACE@[18; 19)
NAME@[19; 20)
@@ -30,7 +30,7 @@ FILE@[0; 71)
IDENT@[25; 28) "Foo"
SEMI@[28; 29)
WHITESPACE@[29; 30)
- TYPE_ITEM@[30; 49)
+ TYPE_DEF@[30; 49)
TYPE_KW@[30; 34)
WHITESPACE@[34; 35)
NAME@[35; 36)
@@ -49,7 +49,7 @@ FILE@[0; 71)
IDENT@[45; 48) "Foo"
SEMI@[48; 49)
WHITESPACE@[49; 50)
- TYPE_ITEM@[50; 70)
+ TYPE_DEF@[50; 70)
TYPE_KW@[50; 54)
WHITESPACE@[54; 55)
NAME@[55; 56)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0034_bind_pat.txt b/crates/libsyntax2/tests/data/parser/inline/0034_bind_pat.txt
index e8e4e4c2b..54396c247 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0034_bind_pat.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0034_bind_pat.txt
@@ -1,5 +1,5 @@
FILE@[0; 146)
- FUNCTION@[0; 145)
+ FN_DEF@[0; 145)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 7)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0035_ref_pat.txt b/crates/libsyntax2/tests/data/parser/inline/0035_ref_pat.txt
index 6fbffd8b7..ef2e2e748 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0035_ref_pat.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0035_ref_pat.txt
@@ -1,5 +1,5 @@
FILE@[0; 52)
- FUNCTION@[0; 51)
+ FN_DEF@[0; 51)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 7)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0036_placeholder_pat.txt b/crates/libsyntax2/tests/data/parser/inline/0036_placeholder_pat.txt
index 8c63cdfae..7cf2b43a7 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0036_placeholder_pat.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0036_placeholder_pat.txt
@@ -1,5 +1,5 @@
FILE@[0; 26)
- FUNCTION@[0; 25)
+ FN_DEF@[0; 25)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 7)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0037_crate_visibility.txt b/crates/libsyntax2/tests/data/parser/inline/0037_crate_visibility.txt
index 835832620..fb6c2d7cf 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0037_crate_visibility.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0037_crate_visibility.txt
@@ -1,5 +1,5 @@
FILE@[0; 81)
- STRUCT@[0; 20)
+ STRUCT_DEF@[0; 20)
VISIBILITY@[0; 10)
PUB_KW@[0; 3)
L_PAREN@[3; 4)
@@ -12,7 +12,7 @@ FILE@[0; 81)
IDENT@[18; 19) "S"
SEMI@[19; 20)
WHITESPACE@[20; 21)
- STRUCT@[21; 40)
+ STRUCT_DEF@[21; 40)
VISIBILITY@[21; 30)
PUB_KW@[21; 24)
L_PAREN@[24; 25)
@@ -25,7 +25,7 @@ FILE@[0; 81)
IDENT@[38; 39) "S"
SEMI@[39; 40)
WHITESPACE@[40; 41)
- STRUCT@[41; 60)
+ STRUCT_DEF@[41; 60)
VISIBILITY@[41; 50)
PUB_KW@[41; 44)
L_PAREN@[44; 45)
@@ -38,7 +38,7 @@ FILE@[0; 81)
IDENT@[58; 59) "S"
SEMI@[59; 60)
WHITESPACE@[60; 61)
- STRUCT@[61; 80)
+ STRUCT_DEF@[61; 80)
VISIBILITY@[61; 70)
PUB_KW@[61; 64)
L_PAREN@[64; 65)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0038_function_ret_type.txt b/crates/libsyntax2/tests/data/parser/inline/0038_function_ret_type.txt
index 58583eefe..66e3e1bba 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0038_function_ret_type.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0038_function_ret_type.txt
@@ -1,5 +1,5 @@
FILE@[0; 30)
- FUNCTION@[0; 11)
+ FN_DEF@[0; 11)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
@@ -12,7 +12,7 @@ FILE@[0; 30)
L_CURLY@[9; 10)
R_CURLY@[10; 11)
WHITESPACE@[11; 12)
- FUNCTION@[12; 29)
+ FN_DEF@[12; 29)
FN_KW@[12; 14)
WHITESPACE@[14; 15)
NAME@[15; 18)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0039_path_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0039_path_expr.txt
index 8b505774f..876dd068c 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0039_path_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0039_path_expr.txt
@@ -1,5 +1,5 @@
FILE@[0; 91)
- FUNCTION@[0; 90)
+ FN_DEF@[0; 90)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0040_expr_literals.txt b/crates/libsyntax2/tests/data/parser/inline/0040_expr_literals.txt
index 192b62211..78cd614a7 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0040_expr_literals.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0040_expr_literals.txt
@@ -1,5 +1,5 @@
FILE@[0; 189)
- FUNCTION@[0; 188)
+ FN_DEF@[0; 188)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0041_type_param_bounds.txt b/crates/libsyntax2/tests/data/parser/inline/0041_type_param_bounds.txt
index a7ac4567c..ea05ad0a6 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0041_type_param_bounds.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0041_type_param_bounds.txt
@@ -1,5 +1,5 @@
FILE@[0; 35)
- STRUCT@[0; 34)
+ STRUCT_DEF@[0; 34)
STRUCT_KW@[0; 6)
WHITESPACE@[6; 7)
NAME@[7; 8)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0042_type_param_default.txt b/crates/libsyntax2/tests/data/parser/inline/0042_type_param_default.txt
index d6d9f8712..0792dbfc0 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0042_type_param_default.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0042_type_param_default.txt
@@ -1,5 +1,5 @@
FILE@[0; 19)
- STRUCT@[0; 18)
+ STRUCT_DEF@[0; 18)
STRUCT_KW@[0; 6)
WHITESPACE@[6; 7)
NAME@[7; 8)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0043_call_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0043_call_expr.txt
index f4789d2d9..59b920560 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0043_call_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0043_call_expr.txt
@@ -1,5 +1,5 @@
FILE@[0; 57)
- FUNCTION@[0; 56)
+ FN_DEF@[0; 56)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0044_ref_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0044_ref_expr.txt
index 05f6c015a..f9e0260d0 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0044_ref_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0044_ref_expr.txt
@@ -1,5 +1,5 @@
FILE@[0; 52)
- FUNCTION@[0; 51)
+ FN_DEF@[0; 51)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0045_block.txt b/crates/libsyntax2/tests/data/parser/inline/0045_block.txt
index 8519101c3..14e43f481 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0045_block.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0045_block.txt
@@ -1,5 +1,5 @@
FILE@[0; 65)
- FUNCTION@[0; 9)
+ FN_DEF@[0; 9)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 4)
@@ -12,7 +12,7 @@ FILE@[0; 65)
L_CURLY@[7; 8)
R_CURLY@[8; 9)
WHITESPACE@[9; 10)
- FUNCTION@[10; 31)
+ FN_DEF@[10; 31)
FN_KW@[10; 12)
WHITESPACE@[12; 13)
NAME@[13; 14)
@@ -38,7 +38,7 @@ FILE@[0; 65)
WHITESPACE@[29; 30)
R_CURLY@[30; 31)
WHITESPACE@[31; 32)
- FUNCTION@[32; 48)
+ FN_DEF@[32; 48)
FN_KW@[32; 34)
WHITESPACE@[34; 35)
NAME@[35; 36)
@@ -62,7 +62,7 @@ FILE@[0; 65)
WHITESPACE@[46; 47)
R_CURLY@[47; 48)
WHITESPACE@[48; 49)
- FUNCTION@[49; 64)
+ FN_DEF@[49; 64)
FN_KW@[49; 51)
WHITESPACE@[51; 52)
NAME@[52; 53)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0050_let_stmt;.txt b/crates/libsyntax2/tests/data/parser/inline/0050_let_stmt;.txt
index 44e357092..fa7709151 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0050_let_stmt;.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0050_let_stmt;.txt
@@ -1,5 +1,5 @@
FILE@[0; 77)
- FUNCTION@[0; 76)
+ FN_DEF@[0; 76)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0051_method_call_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0051_method_call_expr.txt
index aafb2d5f1..9edfabc64 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0051_method_call_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0051_method_call_expr.txt
@@ -1,5 +1,5 @@
FILE@[0; 49)
- FUNCTION@[0; 48)
+ FN_DEF@[0; 48)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0052_field_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0052_field_expr.txt
index 213884f90..465f7abba 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0052_field_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0052_field_expr.txt
@@ -1,5 +1,5 @@
FILE@[0; 37)
- FUNCTION@[0; 36)
+ FN_DEF@[0; 36)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0053_block_items.txt b/crates/libsyntax2/tests/data/parser/inline/0053_block_items.txt
index c5498532b..add5eab89 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0053_block_items.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0053_block_items.txt
@@ -1,5 +1,5 @@
FILE@[0; 21)
- FUNCTION@[0; 20)
+ FN_DEF@[0; 20)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 4)
@@ -11,7 +11,7 @@ FILE@[0; 21)
BLOCK_EXPR@[7; 20)
L_CURLY@[7; 8)
WHITESPACE@[8; 9)
- FUNCTION@[9; 18)
+ FN_DEF@[9; 18)
FN_KW@[9; 11)
WHITESPACE@[11; 12)
NAME@[12; 13)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0054_impl_item_items.txt b/crates/libsyntax2/tests/data/parser/inline/0054_impl_item_items.txt
index 739ecbbcd..0b75f6466 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0054_impl_item_items.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0054_impl_item_items.txt
@@ -10,7 +10,7 @@ FILE@[0; 89)
WHITESPACE@[6; 7)
L_CURLY@[7; 8)
WHITESPACE@[8; 13)
- TYPE_ITEM@[13; 26)
+ TYPE_DEF@[13; 26)
TYPE_KW@[13; 17)
WHITESPACE@[17; 18)
NAME@[18; 19)
@@ -25,7 +25,7 @@ FILE@[0; 89)
IDENT@[22; 25) "i32"
SEMI@[25; 26)
WHITESPACE@[26; 31)
- CONST_ITEM@[31; 49)
+ CONST_DEF@[31; 49)
CONST_KW@[31; 36)
WHITESPACE@[36; 37)
NAME@[37; 38)
@@ -44,7 +44,7 @@ FILE@[0; 89)
INT_NUMBER@[46; 48) "92"
SEMI@[48; 49)
WHITESPACE@[49; 54)
- FUNCTION@[54; 65)
+ FN_DEF@[54; 65)
FN_KW@[54; 56)
WHITESPACE@[56; 57)
NAME@[57; 60)
@@ -57,7 +57,7 @@ FILE@[0; 89)
L_CURLY@[63; 64)
R_CURLY@[64; 65)
WHITESPACE@[65; 70)
- FUNCTION@[70; 86)
+ FN_DEF@[70; 86)
FN_KW@[70; 72)
WHITESPACE@[72; 73)
NAME@[73; 76)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0055_self_param.txt b/crates/libsyntax2/tests/data/parser/inline/0055_self_param.txt
index 1275fb8b1..8b420909f 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0055_self_param.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0055_self_param.txt
@@ -10,7 +10,7 @@ FILE@[0; 106)
WHITESPACE@[6; 7)
L_CURLY@[7; 8)
WHITESPACE@[8; 13)
- FUNCTION@[13; 26)
+ FN_DEF@[13; 26)
FN_KW@[13; 15)
WHITESPACE@[15; 16)
NAME@[16; 17)
@@ -25,7 +25,7 @@ FILE@[0; 106)
L_CURLY@[24; 25)
R_CURLY@[25; 26)
WHITESPACE@[26; 31)
- FUNCTION@[31; 46)
+ FN_DEF@[31; 46)
FN_KW@[31; 33)
WHITESPACE@[33; 34)
NAME@[34; 35)
@@ -42,7 +42,7 @@ FILE@[0; 106)
L_CURLY@[44; 45)
R_CURLY@[45; 46)
WHITESPACE@[46; 51)
- FUNCTION@[51; 69)
+ FN_DEF@[51; 69)
FN_KW@[51; 53)
WHITESPACE@[53; 54)
NAME@[54; 55)
@@ -61,7 +61,7 @@ FILE@[0; 106)
L_CURLY@[67; 68)
R_CURLY@[68; 69)
WHITESPACE@[69; 74)
- FUNCTION@[74; 103)
+ FN_DEF@[74; 103)
FN_KW@[74; 76)
WHITESPACE@[76; 77)
NAME@[77; 78)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0056_trait_item.txt b/crates/libsyntax2/tests/data/parser/inline/0056_trait_item.txt
index b9dc6a0fd..40749d12a 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0056_trait_item.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0056_trait_item.txt
@@ -1,5 +1,5 @@
FILE@[0; 42)
- TRAIT@[0; 41)
+ TRAIT_DEF@[0; 41)
TRAIT_KW@[0; 5)
WHITESPACE@[5; 6)
NAME@[6; 7)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0057_auto_trait.txt b/crates/libsyntax2/tests/data/parser/inline/0057_auto_trait.txt
index c7679b643..738661e3c 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0057_auto_trait.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0057_auto_trait.txt
@@ -1,5 +1,5 @@
FILE@[0; 16)
- TRAIT@[0; 15)
+ TRAIT_DEF@[0; 15)
AUTO_KW@[0; 4)
WHITESPACE@[4; 5)
TRAIT_KW@[5; 10)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0058_type_arg.txt b/crates/libsyntax2/tests/data/parser/inline/0058_type_arg.txt
index f69ce4738..297456ec4 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0058_type_arg.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0058_type_arg.txt
@@ -1,5 +1,5 @@
FILE@[0; 35)
- TYPE_ITEM@[0; 34)
+ TYPE_DEF@[0; 34)
TYPE_KW@[0; 4)
WHITESPACE@[4; 5)
NAME@[5; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0059_function_where_clause.txt b/crates/libsyntax2/tests/data/parser/inline/0059_function_where_clause.txt
index 065b0fd21..36822ac05 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0059_function_where_clause.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0059_function_where_clause.txt
@@ -1,5 +1,5 @@
FILE@[0; 29)
- FUNCTION@[0; 28)
+ FN_DEF@[0; 28)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0060_function_type_params.txt b/crates/libsyntax2/tests/data/parser/inline/0060_function_type_params.txt
index 8809ebc04..c03553c0d 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0060_function_type_params.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0060_function_type_params.txt
@@ -1,5 +1,5 @@
FILE@[0; 28)
- FUNCTION@[0; 27)
+ FN_DEF@[0; 27)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0061_struct_lit.txt b/crates/libsyntax2/tests/data/parser/inline/0061_struct_lit.txt
index 1d048c5ba..2eb04a3c7 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0061_struct_lit.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0061_struct_lit.txt
@@ -1,5 +1,5 @@
FILE@[0; 86)
- FUNCTION@[0; 85)
+ FN_DEF@[0; 85)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0063_impl_trait_type.txt b/crates/libsyntax2/tests/data/parser/inline/0063_impl_trait_type.txt
index bbebf1086..aa9981ba6 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0063_impl_trait_type.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0063_impl_trait_type.txt
@@ -1,5 +1,5 @@
FILE@[0; 43)
- TYPE_ITEM@[0; 42)
+ TYPE_DEF@[0; 42)
TYPE_KW@[0; 4)
WHITESPACE@[4; 5)
NAME@[5; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0063_lambda_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0063_lambda_expr.txt
index 122a99e52..98db37cb6 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0063_lambda_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0063_lambda_expr.txt
@@ -1,5 +1,5 @@
FILE@[0; 74)
- FUNCTION@[0; 74)
+ FN_DEF@[0; 74)
FN_KW@[0; 2)
NAME@[2; 6)
WHITESPACE@[2; 3)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0064_param_list.txt b/crates/libsyntax2/tests/data/parser/inline/0064_param_list.txt
index 14db495b9..daad3dc73 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0064_param_list.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0064_param_list.txt
@@ -1,5 +1,5 @@
FILE@[0; 67)
- FUNCTION@[0; 9)
+ FN_DEF@[0; 9)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 4)
@@ -12,7 +12,7 @@ FILE@[0; 67)
L_CURLY@[7; 8)
R_CURLY@[8; 9)
WHITESPACE@[9; 10)
- FUNCTION@[10; 25)
+ FN_DEF@[10; 25)
FN_KW@[10; 12)
WHITESPACE@[12; 13)
NAME@[13; 14)
@@ -36,7 +36,7 @@ FILE@[0; 67)
L_CURLY@[23; 24)
R_CURLY@[24; 25)
WHITESPACE@[25; 26)
- FUNCTION@[26; 43)
+ FN_DEF@[26; 43)
FN_KW@[26; 28)
WHITESPACE@[28; 29)
NAME@[29; 30)
@@ -62,7 +62,7 @@ FILE@[0; 67)
L_CURLY@[41; 42)
R_CURLY@[42; 43)
WHITESPACE@[43; 44)
- FUNCTION@[44; 66)
+ FN_DEF@[44; 66)
FN_KW@[44; 46)
WHITESPACE@[46; 47)
NAME@[47; 48)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0065_if_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0065_if_expr.txt
index 6ed53264a..f6895b4f7 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0065_if_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0065_if_expr.txt
@@ -1,5 +1,5 @@
FILE@[0; 107)
- FUNCTION@[0; 106)
+ FN_DEF@[0; 106)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0066_lambda_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0066_lambda_expr.txt
index 6d9aeb331..a5acd9d12 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0066_lambda_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0066_lambda_expr.txt
@@ -1,5 +1,5 @@
FILE@[0; 79)
- FUNCTION@[0; 78)
+ FN_DEF@[0; 78)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0067_block_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0067_block_expr.txt
index 981f39e6e..688466a13 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0067_block_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0067_block_expr.txt
@@ -1,5 +1,5 @@
FILE@[0; 36)
- FUNCTION@[0; 35)
+ FN_DEF@[0; 35)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0068_pub_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0068_pub_expr.txt
index 92e58938b..22d30cf32 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0068_pub_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0068_pub_expr.txt
@@ -1,5 +1,5 @@
FILE@[0; 29)
- FUNCTION@[0; 20)
+ FN_DEF@[0; 20)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0068_return_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0068_return_expr.txt
index 4e4ec85b6..fa999bfca 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0068_return_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0068_return_expr.txt
@@ -1,5 +1,5 @@
FILE@[0; 40)
- FUNCTION@[0; 39)
+ FN_DEF@[0; 39)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0069_match_arm.txt b/crates/libsyntax2/tests/data/parser/inline/0069_match_arm.txt
index 3377e8342..a3061cfa2 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0069_match_arm.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0069_match_arm.txt
@@ -1,5 +1,5 @@
FILE@[0; 78)
- FUNCTION@[0; 77)
+ FN_DEF@[0; 77)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0070_match_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0070_match_expr.txt
index f9ba54486..a722766d0 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0070_match_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0070_match_expr.txt
@@ -1,5 +1,5 @@
FILE@[0; 47)
- FUNCTION@[0; 46)
+ FN_DEF@[0; 46)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0071_tuple_pat_fields.txt b/crates/libsyntax2/tests/data/parser/inline/0071_tuple_pat_fields.txt
index f54835277..76df989fc 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0071_tuple_pat_fields.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0071_tuple_pat_fields.txt
@@ -1,5 +1,5 @@
FILE@[0; 97)
- FUNCTION@[0; 96)
+ FN_DEF@[0; 96)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0072_path_part.txt b/crates/libsyntax2/tests/data/parser/inline/0072_path_part.txt
index 20da5de86..dabc64d2b 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0072_path_part.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0072_path_part.txt
@@ -1,5 +1,5 @@
FILE@[0; 103)
- FUNCTION@[0; 102)
+ FN_DEF@[0; 102)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0073_struct_pat_fields.txt b/crates/libsyntax2/tests/data/parser/inline/0073_struct_pat_fields.txt
index fc0d44f7a..9a0b6dbec 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0073_struct_pat_fields.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0073_struct_pat_fields.txt
@@ -1,5 +1,5 @@
FILE@[0; 119)
- FUNCTION@[0; 118)
+ FN_DEF@[0; 118)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0074_unary_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0074_unary_expr.txt
index e0b4ff964..4da473a7f 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0074_unary_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0074_unary_expr.txt
@@ -1,5 +1,5 @@
FILE@[0; 44)
- FUNCTION@[0; 43)
+ FN_DEF@[0; 43)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0075_try_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0075_try_expr.txt
index f7b86f269..c97d671d2 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0075_try_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0075_try_expr.txt
@@ -1,5 +1,5 @@
FILE@[0; 21)
- FUNCTION@[0; 20)
+ FN_DEF@[0; 20)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0076_cond.txt b/crates/libsyntax2/tests/data/parser/inline/0076_cond.txt
index 0cde88a90..2ee8fa78a 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0076_cond.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0076_cond.txt
@@ -1,5 +1,5 @@
FILE@[0; 38)
- FUNCTION@[0; 37)
+ FN_DEF@[0; 37)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0077_while_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0077_while_expr.txt
index 82e63fd46..45a0c92dd 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0077_while_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0077_while_expr.txt
@@ -1,5 +1,5 @@
FILE@[0; 70)
- FUNCTION@[0; 69)
+ FN_DEF@[0; 69)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0078_mod_contents.txt b/crates/libsyntax2/tests/data/parser/inline/0078_mod_contents.txt
index 0c6b9a42a..c6be58e75 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0078_mod_contents.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0078_mod_contents.txt
@@ -1,5 +1,5 @@
FILE@[0; 70)
- FUNCTION@[0; 11)
+ FN_DEF@[0; 11)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
@@ -53,7 +53,7 @@ FILE@[0; 70)
L_CURLY@[57; 58)
R_CURLY@[58; 59)
WHITESPACE@[59; 60)
- STRUCT@[60; 69)
+ STRUCT_DEF@[60; 69)
STRUCT_KW@[60; 66)
WHITESPACE@[66; 67)
NAME@[67; 68)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0079_cast_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0079_cast_expr.txt
index 642557e15..b49926d22 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0079_cast_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0079_cast_expr.txt
@@ -1,5 +1,5 @@
FILE@[0; 28)
- FUNCTION@[0; 27)
+ FN_DEF@[0; 27)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0080_tuple_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0080_tuple_expr.txt
index 728ba6ec7..d2b4051a3 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0080_tuple_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0080_tuple_expr.txt
@@ -1,5 +1,5 @@
FILE@[0; 40)
- FUNCTION@[0; 39)
+ FN_DEF@[0; 39)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0081_index_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0081_index_expr.txt
index 80af4caed..9da850898 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0081_index_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0081_index_expr.txt
@@ -1,5 +1,5 @@
FILE@[0; 26)
- FUNCTION@[0; 25)
+ FN_DEF@[0; 25)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0082_tuple_pat.txt b/crates/libsyntax2/tests/data/parser/inline/0082_tuple_pat.txt
index d8314b5d8..d47c712db 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0082_tuple_pat.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0082_tuple_pat.txt
@@ -1,5 +1,5 @@
FILE@[0; 39)
- FUNCTION@[0; 38)
+ FN_DEF@[0; 38)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 7)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0083_postfix_range.txt b/crates/libsyntax2/tests/data/parser/inline/0083_postfix_range.txt
index bf9b2c695..312f8df1e 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0083_postfix_range.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0083_postfix_range.txt
@@ -1,5 +1,5 @@
FILE@[0; 26)
- FUNCTION@[0; 25)
+ FN_DEF@[0; 25)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0084_loop_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0084_loop_expr.txt
index 5e0de55d4..eba105e64 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0084_loop_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0084_loop_expr.txt
@@ -1,5 +1,5 @@
FILE@[0; 26)
- FUNCTION@[0; 25)
+ FN_DEF@[0; 25)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0085_for_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0085_for_expr.txt
index 3a378cfcf..c140b7225 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0085_for_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0085_for_expr.txt
@@ -1,5 +1,5 @@
FILE@[0; 33)
- FUNCTION@[0; 32)
+ FN_DEF@[0; 32)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0085_match_arms_commas.txt b/crates/libsyntax2/tests/data/parser/inline/0085_match_arms_commas.txt
index 5465a3797..fb8f36ec9 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0085_match_arms_commas.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0085_match_arms_commas.txt
@@ -1,5 +1,5 @@
FILE@[0; 83)
- FUNCTION@[0; 82)
+ FN_DEF@[0; 82)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0086_array_expr.txt b/crates/libsyntax2/tests/data/parser/inline/0086_array_expr.txt
index 9a5f56edf..e3b9c0dcd 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0086_array_expr.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0086_array_expr.txt
@@ -1,5 +1,5 @@
FILE@[0; 55)
- FUNCTION@[0; 54)
+ FN_DEF@[0; 54)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0086_no_semi_after_block.txt b/crates/libsyntax2/tests/data/parser/inline/0086_no_semi_after_block.txt
index d19a270ac..3cb9eb11d 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0086_no_semi_after_block.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0086_no_semi_after_block.txt
@@ -1,5 +1,5 @@
FILE@[0; 107)
- FUNCTION@[0; 106)
+ FN_DEF@[0; 106)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0087_stmt_postfix_expr_ambiguity.txt b/crates/libsyntax2/tests/data/parser/inline/0087_stmt_postfix_expr_ambiguity.txt
index e83b6d183..17351c87c 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0087_stmt_postfix_expr_ambiguity.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0087_stmt_postfix_expr_ambiguity.txt
@@ -1,5 +1,5 @@
FILE@[0; 84)
- FUNCTION@[0; 83)
+ FN_DEF@[0; 83)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0088_stmt_bin_expr_ambiguity.txt b/crates/libsyntax2/tests/data/parser/inline/0088_stmt_bin_expr_ambiguity.txt
index df4c20b0e..51db54f15 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0088_stmt_bin_expr_ambiguity.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0088_stmt_bin_expr_ambiguity.txt
@@ -1,5 +1,5 @@
FILE@[0; 46)
- FUNCTION@[0; 45)
+ FN_DEF@[0; 45)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0089_slice_pat.txt b/crates/libsyntax2/tests/data/parser/inline/0089_slice_pat.txt
index 8379df33b..8c3aaf096 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0089_slice_pat.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0089_slice_pat.txt
@@ -1,5 +1,5 @@
FILE@[0; 39)
- FUNCTION@[0; 38)
+ FN_DEF@[0; 38)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 7)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0090_trait_item_items.txt b/crates/libsyntax2/tests/data/parser/inline/0090_trait_item_items.txt
index c04c48588..62d728f21 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0090_trait_item_items.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0090_trait_item_items.txt
@@ -10,7 +10,7 @@ FILE@[0; 83)
WHITESPACE@[6; 7)
L_CURLY@[7; 8)
WHITESPACE@[8; 13)
- TYPE_ITEM@[13; 27)
+ TYPE_DEF@[13; 27)
TYPE_KW@[13; 17)
WHITESPACE@[17; 18)
NAME@[18; 19)
@@ -23,7 +23,7 @@ FILE@[0; 83)
IDENT@[21; 26) "Clone"
SEMI@[26; 27)
WHITESPACE@[27; 32)
- CONST_ITEM@[32; 45)
+ CONST_DEF@[32; 45)
CONST_KW@[32; 37)
WHITESPACE@[37; 38)
NAME@[38; 39)
@@ -37,7 +37,7 @@ FILE@[0; 83)
IDENT@[41; 44) "i32"
SEMI@[44; 45)
WHITESPACE@[45; 50)
- FUNCTION@[50; 61)
+ FN_DEF@[50; 61)
FN_KW@[50; 52)
WHITESPACE@[52; 53)
NAME@[53; 56)
@@ -50,7 +50,7 @@ FILE@[0; 83)
L_CURLY@[59; 60)
R_CURLY@[60; 61)
WHITESPACE@[61; 66)
- FUNCTION@[66; 80)
+ FN_DEF@[66; 80)
FN_KW@[66; 68)
WHITESPACE@[68; 69)
NAME@[69; 72)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0091_fn_decl.txt b/crates/libsyntax2/tests/data/parser/inline/0091_fn_decl.txt
index a6e144776..e5c96aa76 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0091_fn_decl.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0091_fn_decl.txt
@@ -1,5 +1,5 @@
FILE@[0; 22)
- TRAIT@[0; 21)
+ TRAIT_DEF@[0; 21)
TRAIT_KW@[0; 5)
WHITESPACE@[5; 6)
NAME@[6; 7)
@@ -7,7 +7,7 @@ FILE@[0; 22)
WHITESPACE@[7; 8)
L_CURLY@[8; 9)
WHITESPACE@[9; 10)
- FUNCTION@[10; 19)
+ FN_DEF@[10; 19)
FN_KW@[10; 12)
WHITESPACE@[12; 13)
NAME@[13; 16)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0092_literal_pattern.txt b/crates/libsyntax2/tests/data/parser/inline/0092_literal_pattern.txt
index a2f985408..5d49c31fe 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0092_literal_pattern.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0092_literal_pattern.txt
@@ -1,5 +1,5 @@
FILE@[0; 95)
- FUNCTION@[0; 94)
+ FN_DEF@[0; 94)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 7)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0093_path_fn_trait_args.txt b/crates/libsyntax2/tests/data/parser/inline/0093_path_fn_trait_args.txt
index 800a4ac14..a98702f8f 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0093_path_fn_trait_args.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0093_path_fn_trait_args.txt
@@ -1,5 +1,5 @@
FILE@[0; 32)
- TYPE_ITEM@[0; 31)
+ TYPE_DEF@[0; 31)
TYPE_KW@[0; 4)
WHITESPACE@[4; 5)
NAME@[5; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0094_range_pat.txt b/crates/libsyntax2/tests/data/parser/inline/0094_range_pat.txt
index cb858044a..8b174b908 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0094_range_pat.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0094_range_pat.txt
@@ -1,5 +1,5 @@
FILE@[0; 47)
- FUNCTION@[0; 46)
+ FN_DEF@[0; 46)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 7)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0095_path_type_with_bounds.txt b/crates/libsyntax2/tests/data/parser/inline/0095_path_type_with_bounds.txt
index 57c38e7ee..5b6252d0e 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0095_path_type_with_bounds.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0095_path_type_with_bounds.txt
@@ -1,5 +1,5 @@
FILE@[0; 27)
- FUNCTION@[0; 26)
+ FN_DEF@[0; 26)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0096_value_parameters_no_patterns.txt b/crates/libsyntax2/tests/data/parser/inline/0096_value_parameters_no_patterns.txt
index c3f9bf685..402770112 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0096_value_parameters_no_patterns.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0096_value_parameters_no_patterns.txt
@@ -1,5 +1,5 @@
FILE@[0; 54)
- TYPE_ITEM@[0; 53)
+ TYPE_DEF@[0; 53)
TYPE_KW@[0; 4)
WHITESPACE@[4; 5)
NAME@[5; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0097_param_list_opt_patterns.txt b/crates/libsyntax2/tests/data/parser/inline/0097_param_list_opt_patterns.txt
index 4cb3bdac5..bed6e9881 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0097_param_list_opt_patterns.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0097_param_list_opt_patterns.txt
@@ -1,5 +1,5 @@
FILE@[0; 35)
- FUNCTION@[0; 34)
+ FN_DEF@[0; 34)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0098_where_clause.txt b/crates/libsyntax2/tests/data/parser/inline/0098_where_clause.txt
index 150f125a7..21c5ea958 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0098_where_clause.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0098_where_clause.txt
@@ -1,5 +1,5 @@
FILE@[0; 87)
- FUNCTION@[0; 86)
+ FN_DEF@[0; 86)
FN_KW@[0; 2)
WHITESPACE@[2; 3)
NAME@[3; 6)
diff --git a/crates/libsyntax2/tests/data/parser/inline/0099_crate_keyword_vis.txt b/crates/libsyntax2/tests/data/parser/inline/0099_crate_keyword_vis.txt
index a830d99d9..7916bf834 100644
--- a/crates/libsyntax2/tests/data/parser/inline/0099_crate_keyword_vis.txt
+++ b/crates/libsyntax2/tests/data/parser/inline/0099_crate_keyword_vis.txt
@@ -1,5 +1,5 @@
FILE@[0; 20)
- FUNCTION@[0; 19)
+ FN_DEF@[0; 19)
VISIBILITY@[0; 5)
CRATE_KW@[0; 5)
WHITESPACE@[5; 6)
--
cgit v1.2.3