Rename FnDef -> Fn

47 files changed, 120 insertions, 120 deletions

diff --git a/crates/ra_syntax/test_data/parser/ok/0005_fn_item.rast b/crates/ra_syntax/test_data/parser/ok/0005_fn_item.rast
index 0ec237f8e..a7a2b11a7 100644
--- a/crates/ra_syntax/test_data/parser/ok/0005_fn_item.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0005_fn_item.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..12
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast b/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast
index 37b452ec4..ea26f1440 100644
--- a/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast
@@ -26,7 +26,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      FN_DEF@31..47
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.rast b/crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.rast
index 0b9bc58e8..478fdba75 100644
--- a/crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..34
+  [email protected]
     [email protected]
       [email protected] "#"
       [email protected] "["
diff --git a/crates/ra_syntax/test_data/parser/ok/0012_visibility.rast b/crates/ra_syntax/test_data/parser/ok/0012_visibility.rast
index 980b34049..83a93b5a9 100644
--- a/crates/ra_syntax/test_data/parser/ok/0012_visibility.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0012_visibility.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..9
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -12,7 +12,7 @@ [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
-  FN_DEF@10..23
+  [email protected]
     [email protected]
       [email protected] "pub"
     [email protected] " "
@@ -28,7 +28,7 @@ [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
-  FN_DEF@24..44
+  [email protected]
     [email protected]
       [email protected] "pub"
       [email protected] "("
@@ -47,7 +47,7 @@ [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
-  FN_DEF@45..65
+  [email protected]
     [email protected]
       [email protected] "pub"
       [email protected] "("
@@ -66,7 +66,7 @@ [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
-  FN_DEF@66..97
+  [email protected]
     [email protected]
       [email protected] "pub"
       [email protected] "("
diff --git a/crates/ra_syntax/test_data/parser/ok/0017_attr_trailing_comma.rast b/crates/ra_syntax/test_data/parser/ok/0017_attr_trailing_comma.rast
index 964cbf5dd..a3e091ad3 100644
--- a/crates/ra_syntax/test_data/parser/ok/0017_attr_trailing_comma.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0017_attr_trailing_comma.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..22
+  [email protected]
     [email protected]
       [email protected] "#"
       [email protected] "["
diff --git a/crates/ra_syntax/test_data/parser/ok/0021_extern_fn.rast b/crates/ra_syntax/test_data/parser/ok/0021_extern_fn.rast
index 873791f50..5524efaaf 100644
--- a/crates/ra_syntax/test_data/parser/ok/0021_extern_fn.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0021_extern_fn.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..19
+  [email protected]
     [email protected]
       [email protected] "extern"
     [email protected] " "
@@ -16,7 +16,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@21..44
+  [email protected]
     [email protected]
       [email protected] "extern"
       [email protected] " "
@@ -35,7 +35,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@46..70
+  [email protected]
     [email protected]
       [email protected] "extern"
       [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.rast b/crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.rast
index 5701f566e..bb6527b48 100644
--- a/crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..34
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -11,7 +11,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      FN_DEF@16..32
+      [email protected]
         [email protected]
           [email protected] "extern"
         [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/ok/0026_const_fn_in_block.rast b/crates/ra_syntax/test_data/parser/ok/0026_const_fn_in_block.rast
index b029d8692..5bcf54deb 100644
--- a/crates/ra_syntax/test_data/parser/ok/0026_const_fn_in_block.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0026_const_fn_in_block.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..33
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -11,7 +11,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      FN_DEF@16..31
+      [email protected]
         [email protected] "const"
         [email protected] " "
         [email protected] "fn"
diff --git a/crates/ra_syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rast b/crates/ra_syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rast
index 299bbd136..a7cc12295 100644
--- a/crates/ra_syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..52
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -11,7 +11,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      FN_DEF@16..32
+      [email protected]
         [email protected] "unsafe"
         [email protected] " "
         [email protected] "fn"
diff --git a/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rast b/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rast
index de3c4b786..efe018484 100644
--- a/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..247
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0029_range_forms.rast b/crates/ra_syntax/test_data/parser/ok/0029_range_forms.rast
index dc47d68a6..47e46f009 100644
--- a/crates/ra_syntax/test_data/parser/ok/0029_range_forms.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0029_range_forms.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..152
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rast b/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rast
index 86c3b46c4..93f766149 100644
--- a/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..111
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0030_traits.rast b/crates/ra_syntax/test_data/parser/ok/0030_traits.rast
index 63693de4f..4bcf07ffb 100644
--- a/crates/ra_syntax/test_data/parser/ok/0030_traits.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0030_traits.rast
@@ -8,7 +8,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      FN_DEF@21..34
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -29,7 +29,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      FN_DEF@64..93
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0031_extern.rast b/crates/ra_syntax/test_data/parser/ok/0031_extern.rast
index ea285f52f..0509f7504 100644
--- a/crates/ra_syntax/test_data/parser/ok/0031_extern.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0031_extern.rast
@@ -6,7 +6,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      FN_DEF@13..87
+      [email protected]
         [email protected]
           [email protected] "pub"
         [email protected] " "
@@ -69,7 +69,7 @@ [email protected]
                   [email protected] "c_int"
         [email protected] ";"
       [email protected] "\n    "
-      FN_DEF@92..167
+      [email protected]
         [email protected]
           [email protected] "pub"
         [email protected] " "
@@ -134,7 +134,7 @@ [email protected]
                   [email protected] "c_int"
         [email protected] ";"
       [email protected] "\n    "
-      FN_DEF@172..276
+      [email protected]
         [email protected]
           [email protected] "pub"
         [email protected] " "
@@ -199,7 +199,7 @@ [email protected]
                   [email protected] "c_int"
         [email protected] ";"
       [email protected] "\n    "
-      FN_DEF@281..341
+      [email protected]
         [email protected]
           [email protected] "pub"
         [email protected] " "
@@ -248,7 +248,7 @@ [email protected]
                   [email protected] "c_int"
         [email protected] ";"
       [email protected] "\n    "
-      FN_DEF@346..469
+      [email protected]
         [email protected]
           [email protected] "pub"
         [email protected] " "
@@ -317,7 +317,7 @@ [email protected]
                   [email protected] "c_int"
         [email protected] ";"
       [email protected] "\n    "
-      FN_DEF@474..691
+      [email protected]
         [email protected]
           [email protected] "pub"
         [email protected] " "
@@ -416,7 +416,7 @@ [email protected]
                   [email protected] "c_int"
         [email protected] ";"
       [email protected] "\n    "
-      FN_DEF@696..864
+      [email protected]
         [email protected]
           [email protected] "pub"
         [email protected] " "
@@ -510,7 +510,7 @@ [email protected]
                   [email protected] "c_int"
         [email protected] ";"
       [email protected] "\n    "
-      FN_DEF@869..992
+      [email protected]
         [email protected]
           [email protected] "pub"
         [email protected] " "
@@ -579,7 +579,7 @@ [email protected]
                   [email protected] "c_int"
         [email protected] ";"
       [email protected] "\n    "
-      FN_DEF@997..1173
+      [email protected]
         [email protected]
           [email protected] "pub"
         [email protected] " "
@@ -690,7 +690,7 @@ [email protected]
                   [email protected] "ssize_t"
         [email protected] ";"
       [email protected] "\n    "
-      FN_DEF@1178..1289
+      [email protected]
         [email protected]
           [email protected] "pub"
         [email protected] " "
@@ -771,7 +771,7 @@ [email protected]
                   [email protected] "ssize_t"
         [email protected] ";"
       [email protected] "\n    "
-      FN_DEF@1294..1481
+      [email protected]
         [email protected]
           [email protected] "pub"
         [email protected] " "
@@ -888,7 +888,7 @@ [email protected]
                   [email protected] "ssize_t"
         [email protected] ";"
       [email protected] "\n    "
-      FN_DEF@1486..1595
+      [email protected]
         [email protected]
           [email protected] "pub"
         [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast b/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast
index 8d76c4e0b..1b2325a2d 100644
--- a/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..115
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0033_label_break.rast b/crates/ra_syntax/test_data/parser/ok/0033_label_break.rast
index 13b730ded..b3f29638c 100644
--- a/crates/ra_syntax/test_data/parser/ok/0033_label_break.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0033_label_break.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..505
+  [email protected]
     [email protected] "// format with label  ..."
     [email protected] "\n"
     [email protected] "fn"
diff --git a/crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.rast b/crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.rast
index 21874ae3a..5ad8c570d 100644
--- a/crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..61
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast b/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast
index bbdf896d1..2e36b54bc 100644
--- a/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast
@@ -120,7 +120,7 @@ [email protected]
   [email protected] "\n\n"
   [email protected] "// Just a grab bag of ..."
   [email protected] "\n\n"
-  FN_DEF@520..572
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -166,7 +166,7 @@ [email protected]
       [email protected] " "
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@574..624
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -178,7 +178,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      FN_DEF@591..607
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -217,7 +217,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@626..816
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -229,7 +229,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      FN_DEF@642..720
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -407,7 +407,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@818..1322
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -572,7 +572,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@1324..1539
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -809,7 +809,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@1541..1741
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -830,7 +830,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      FN_DEF@1575..1598
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -988,7 +988,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@1743..1904
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -1131,7 +1131,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@1906..1960
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -1166,7 +1166,7 @@ [email protected]
       [email protected] " "
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@1962..2198
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -1284,7 +1284,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@2200..2693
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -1468,7 +1468,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@2695..2832
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -1548,7 +1548,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@2834..2906
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -1599,7 +1599,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@2908..3042
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -1722,7 +1722,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@3044..3514
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -2056,7 +2056,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@3516..3552
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -2090,7 +2090,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@3554..3812
+  [email protected]
     [email protected]
       [email protected] "pub"
     [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rast b/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rast
index a64a82e94..a5f09e364 100644
--- a/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rast
@@ -1,7 +1,7 @@
 [email protected]
   [email protected] "// https://github.com ..."
   [email protected] "\n\n"
-  FN_DEF@62..156
+  [email protected]
     [email protected]
       [email protected] "pub"
     [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/ok/0038_where_pred_type.rast b/crates/ra_syntax/test_data/parser/ok/0038_where_pred_type.rast
index 7fd414090..22168eaf1 100644
--- a/crates/ra_syntax/test_data/parser/ok/0038_where_pred_type.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0038_where_pred_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..34
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0039_raw_fn_item.rast b/crates/ra_syntax/test_data/parser/ok/0039_raw_fn_item.rast
index 17be2c238..68a366354 100644
--- a/crates/ra_syntax/test_data/parser/ok/0039_raw_fn_item.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0039_raw_fn_item.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..14
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rast b/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rast
index acf32a852..92ede8ccb 100644
--- a/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..59
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast b/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast
index 573edc081..4f0c68822 100644
--- a/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast
@@ -20,7 +20,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      FN_DEF@90..139
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -55,7 +55,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@143..161
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -78,7 +78,7 @@ [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@163..198
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast b/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast
index 900eeb445..22eb22e3c 100644
--- a/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast
@@ -30,7 +30,7 @@ [email protected]
       [email protected] " "
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@92..159
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rast b/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rast
index 6d941487b..c9e6d88eb 100644
--- a/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..165
+  [email protected]
     [email protected] "// https://github.com ..."
     [email protected] "\n"
     [email protected] "fn"
diff --git a/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast b/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast
index 69aa0ba4d..5ebc53618 100644
--- a/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..461
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -101,7 +101,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      FN_DEF@544..683
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast b/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast
index 38e44e48a..29a5d48e6 100644
--- a/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast
@@ -1,7 +1,7 @@
 [email protected]
   [email protected] "// https://github.com ..."
   [email protected] "\n\n"
-  FN_DEF@62..341
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -288,7 +288,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@369..394
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rast b/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rast
index 28233c5d0..662576e5f 100644
--- a/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rast
@@ -1,7 +1,7 @@
 [email protected]
   [email protected] "// https://github.com ..."
   [email protected] "\n\n"
-  FN_DEF@60..256
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0049_async_block.rast b/crates/ra_syntax/test_data/parser/ok/0049_async_block.rast
index 0569488f8..57ecad3cf 100644
--- a/crates/ra_syntax/test_data/parser/ok/0049_async_block.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0049_async_block.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..45
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast b/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast
index 7847da085..798e81ca6 100644
--- a/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..52
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -52,7 +52,7 @@ [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@54..94
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast b/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast
index 919c690de..9a173b002 100644
--- a/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..37
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -41,7 +41,7 @@ [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
-  FN_DEF@38..62
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -83,7 +83,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] " "
-      FN_DEF@77..126
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -132,7 +132,7 @@ [email protected]
       [email protected] " "
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@130..172
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -195,7 +195,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      FN_DEF@190..234
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -263,7 +263,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n     "
-      FN_DEF@252..277
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -287,7 +287,7 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n     "
-      FN_DEF@283..305
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -311,7 +311,7 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n     "
-      FN_DEF@311..334
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -336,7 +336,7 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n     "
-      FN_DEF@340..371
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -368,7 +368,7 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n     "
-      FN_DEF@377..407
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -400,7 +400,7 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n     "
-      FN_DEF@413..447
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -434,7 +434,7 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n     "
-      FN_DEF@453..480
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -465,7 +465,7 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n     "
-      FN_DEF@486..517
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast b/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast
index 65cfa7bc5..a30000398 100644
--- a/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..79
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast b/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast
index d6aec7ab9..e3997ac5b 100644
--- a/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..26
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -35,7 +35,7 @@ [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@28..56
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -77,7 +77,7 @@ [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@58..87
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rast b/crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rast
index 9e0cec35f..1c893180c 100644
--- a/crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rast
@@ -12,7 +12,7 @@ [email protected]
       [email protected] ")"
     [email protected] ";"
   [email protected] "\n\n"
-  FN_DEF@14..48
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0056_neq_in_type.rast b/crates/ra_syntax/test_data/parser/ok/0056_neq_in_type.rast
index 7fa3033ac..3ef916e55 100644
--- a/crates/ra_syntax/test_data/parser/ok/0056_neq_in_type.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0056_neq_in_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..70
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rast b/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rast
index d93968016..53410a1ee 100644
--- a/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..17
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -23,7 +23,7 @@ [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@19..50
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.rast b/crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.rast
index b5c72ee36..a1dfd58f2 100644
--- a/crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..78
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rast b/crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rast
index ddcb139c1..767b516a2 100644
--- a/crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..104
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0060_as_range.rast b/crates/ra_syntax/test_data/parser/ok/0060_as_range.rast
index 098152fc3..1fd1a2888 100644
--- a/crates/ra_syntax/test_data/parser/ok/0060_as_range.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0060_as_range.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..55
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0061_match_full_range.rast b/crates/ra_syntax/test_data/parser/ok/0061_match_full_range.rast
index c6e982976..ba49c115b 100644
--- a/crates/ra_syntax/test_data/parser/ok/0061_match_full_range.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0061_match_full_range.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..34
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0062_macro_2.0.rast b/crates/ra_syntax/test_data/parser/ok/0062_macro_2.0.rast
index bf791ee2b..0c22c31a4 100644
--- a/crates/ra_syntax/test_data/parser/ok/0062_macro_2.0.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0062_macro_2.0.rast
@@ -51,7 +51,7 @@ [email protected]
         [email protected] "\n"
         [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@95..348
+  [email protected]
     [email protected]
       [email protected] "#"
       [email protected] "["
diff --git a/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast b/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast
index 40619b46e..a87bbf4eb 100644
--- a/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast
@@ -8,7 +8,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      FN_DEF@14..46
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -50,7 +50,7 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n    "
-      FN_DEF@51..74
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -92,7 +92,7 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n    "
-      FN_DEF@79..108
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -123,7 +123,7 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n    "
-      FN_DEF@113..135
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -155,7 +155,7 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n    "
-      FN_DEF@140..167
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rast b/crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rast
index 5a9f07c89..7adedb02e 100644
--- a/crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rast
@@ -8,7 +8,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      FN_DEF@17..40
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -37,7 +37,7 @@ [email protected]
           [email protected] ")"
         [email protected] ";"
       [email protected] "\n    "
-      FN_DEF@45..70
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -69,7 +69,7 @@ [email protected]
           [email protected] ")"
         [email protected] ";"
       [email protected] "\n    "
-      FN_DEF@75..123
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast b/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast
index 7b026e33b..ef0eca47c 100644
--- a/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast
@@ -11,7 +11,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      FN_DEF@13..45
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -53,7 +53,7 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n    "
-      FN_DEF@50..73
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -95,7 +95,7 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n    "
-      FN_DEF@78..107
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -126,7 +126,7 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n    "
-      FN_DEF@112..134
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0065_comment_newline.rast b/crates/ra_syntax/test_data/parser/ok/0065_comment_newline.rast
index d1fffdd63..29bd38c05 100644
--- a/crates/ra_syntax/test_data/parser/ok/0065_comment_newline.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0065_comment_newline.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..25
+  [email protected]
     [email protected] "/// Example"
     [email protected] "\n\n"
     [email protected] "fn"
diff --git a/crates/ra_syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rast b/crates/ra_syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rast
index eb2f8eb3c..7996dc121 100644
--- a/crates/ra_syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..39
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast b/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast
index 503585103..e4c2578f6 100644
--- a/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..55
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -59,7 +59,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n"
-  FN_DEF@56..107
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -110,7 +110,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n"
-  FN_DEF@108..170
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -177,7 +177,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n"
-  FN_DEF@171..223
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -231,7 +231,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n"
-  FN_DEF@224..300
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -313,7 +313,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n"
-  FN_DEF@301..373
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]