33 files changed, 40 insertions, 40 deletions

diff --git a/crates/ra_parser/src/grammar.rs b/crates/ra_parser/src/grammar.rs
index de2c98afd..3350e23b9 100644
--- a/crates/ra_parser/src/grammar.rs
+++ b/crates/ra_parser/src/grammar.rs
@@ -149,12 +149,12 @@ pub(crate) fn reparser(
         USE_TREE_LIST => items::use_tree_list,
         EXTERN_ITEM_LIST => items::extern_item_list,
         TOKEN_TREE if first_child? == T!['{'] => items::token_tree,
-        ITEM_LIST => match parent? {
+        ASSOC_ITEM_LIST => match parent? {
             IMPL_DEF => items::impl_item_list,
             TRAIT_DEF => items::trait_item_list,
-            MODULE => items::mod_item_list,
             _ => return None,
         },
+        ITEM_LIST => items::mod_item_list,
         _ => return None,
     };
     Some(res)
diff --git a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast
index 31cc4e551..a87e5061a 100644
--- a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast
+++ b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast
@@ -8,7 +8,7 @@ [email protected]
           [email protected]
             [email protected] "FnScopes"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "\n    "
       [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast b/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast
index bf07409fb..254ff546a 100644
--- a/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast
+++ b/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast
@@ -41,7 +41,7 @@ [email protected]
                       [email protected] "T"
             [email protected] ">"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast b/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast
index e3cda7c43..bc446e3df 100644
--- a/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast
+++ b/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast
@@ -14,7 +14,7 @@ [email protected]
       [email protected] "("
       [email protected] ")"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "\n    "
       [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0043_default_const.rast b/crates/ra_syntax/test_data/parser/err/0043_default_const.rast
index 8eb583ef8..6ca1a4870 100644
--- a/crates/ra_syntax/test_data/parser/err/0043_default_const.rast
+++ b/crates/ra_syntax/test_data/parser/err/0043_default_const.rast
@@ -5,7 +5,7 @@ [email protected]
     [email protected]
       [email protected] "T"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "\n  "
       [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rast b/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rast
index fd939be8d..2d0253aa0 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rast
@@ -8,7 +8,7 @@ [email protected]
           [email protected]
             [email protected] "Type"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
@@ -29,7 +29,7 @@ [email protected]
           [email protected]
             [email protected] "T"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
@@ -45,7 +45,7 @@ [email protected]
           [email protected]
             [email protected] "NotType"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
@@ -69,7 +69,7 @@ [email protected]
           [email protected]
             [email protected] "NotType"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast b/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast
index b8cd0587d..5501dc5a6 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast
@@ -5,7 +5,7 @@ [email protected]
     [email protected]
       [email protected] "T"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "\n    "
       [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast
index a38b4f573..f422acdda 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast
@@ -8,7 +8,7 @@ [email protected]
           [email protected]
             [email protected] "F"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "\n    "
       [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast b/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast
index 9f4a9e69b..0cd1dffc9 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast
@@ -8,7 +8,7 @@ [email protected]
           [email protected]
             [email protected] "S"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "\n    "
       [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0016_unsafe_trait.rast b/crates/ra_syntax/test_data/parser/inline/ok/0016_unsafe_trait.rast
index d59c6006d..69b82e33c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0016_unsafe_trait.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0016_unsafe_trait.rast
@@ -7,7 +7,7 @@ [email protected]
     [email protected]
       [email protected] "T"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast b/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast
index 15da6fdd6..79148e953 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast
@@ -8,7 +8,7 @@ [email protected]
           [email protected]
             [email protected] "S"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "\n    "
       [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast
index c204aeb63..31b5b6616 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast
@@ -8,7 +8,7 @@ [email protected]
           [email protected]
             [email protected] "F"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "\n    "
       [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0041_trait_item.rast b/crates/ra_syntax/test_data/parser/inline/ok/0041_trait_item.rast
index 1ae791361..884ab2dbf 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0041_trait_item.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0041_trait_item.rast
@@ -48,7 +48,7 @@ [email protected]
                   [email protected]
                     [email protected] "Copy"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
@@ -119,7 +119,7 @@ [email protected]
                   [email protected]
                     [email protected] "Copy"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0047_unsafe_default_impl.rast b/crates/ra_syntax/test_data/parser/inline/ok/0047_unsafe_default_impl.rast
index 52de6023b..8a6b5a8fc 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0047_unsafe_default_impl.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0047_unsafe_default_impl.rast
@@ -12,7 +12,7 @@ [email protected]
           [email protected]
             [email protected] "Foo"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0050_fn_decl.rast b/crates/ra_syntax/test_data/parser/inline/ok/0050_fn_decl.rast
index 8bf62cda9..5f1429102 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0050_fn_decl.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0050_fn_decl.rast
@@ -5,7 +5,7 @@ [email protected]
     [email protected]
       [email protected] "T"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] " "
       [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0063_impl_def_neg.rast b/crates/ra_syntax/test_data/parser/inline/ok/0063_impl_def_neg.rast
index 24b9a1f46..31178f86e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0063_impl_def_neg.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0063_impl_def_neg.rast
@@ -17,7 +17,7 @@ [email protected]
           [email protected]
             [email protected] "X"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0079_impl_def.rast b/crates/ra_syntax/test_data/parser/inline/ok/0079_impl_def.rast
index a00ab40f9..26825ef86 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0079_impl_def.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0079_impl_def.rast
@@ -8,7 +8,7 @@ [email protected]
           [email protected]
             [email protected] "Foo"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0087_unsafe_impl.rast b/crates/ra_syntax/test_data/parser/inline/ok/0087_unsafe_impl.rast
index 01ed3afca..e3223cee5 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0087_unsafe_impl.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0087_unsafe_impl.rast
@@ -10,7 +10,7 @@ [email protected]
           [email protected]
             [email protected] "Foo"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0091_auto_trait.rast b/crates/ra_syntax/test_data/parser/inline/ok/0091_auto_trait.rast
index 800412cef..7efa4c34d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0091_auto_trait.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0091_auto_trait.rast
@@ -7,7 +7,7 @@ [email protected]
     [email protected]
       [email protected] "T"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0094_unsafe_auto_trait.rast b/crates/ra_syntax/test_data/parser/inline/ok/0094_unsafe_auto_trait.rast
index 9370f6ae7..fad27be66 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0094_unsafe_auto_trait.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0094_unsafe_auto_trait.rast
@@ -9,7 +9,7 @@ [email protected]
     [email protected]
       [email protected] "T"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0097_default_impl.rast b/crates/ra_syntax/test_data/parser/inline/ok/0097_default_impl.rast
index 80bda4ba7..8a839a4a6 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0097_default_impl.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0097_default_impl.rast
@@ -10,7 +10,7 @@ [email protected]
           [email protected]
             [email protected] "Foo"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast b/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast
index a65a5c85f..ea54347fc 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast
@@ -17,7 +17,7 @@ [email protected]
           [email protected]
             [email protected] "F"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "\n     "
       [email protected] "//! This is a doc com ..."
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.rast
index 00ce5ecf0..3772cb64b 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.rast
@@ -16,7 +16,7 @@ [email protected]
           [email protected]
             [email protected] "Foo"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "\n    "
       [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rast b/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rast
index e70c3b710..77e12cad6 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rast
@@ -32,7 +32,7 @@ [email protected]
                       [email protected] "N"
             [email protected] ">"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_fn.rast
index adb6159f4..c0b8c0300 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_fn.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_fn.rast
@@ -16,7 +16,7 @@ [email protected]
           [email protected]
             [email protected] "Foo"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "\n    "
       [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_impl.rast b/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_impl.rast
index a9eda5668..e0c338297 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_impl.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_impl.rast
@@ -12,7 +12,7 @@ [email protected]
           [email protected]
             [email protected] "Foo"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
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 0aadc11a4..63693de4f 100644
--- a/crates/ra_syntax/test_data/parser/ok/0030_traits.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0030_traits.rast
@@ -5,7 +5,7 @@ [email protected]
     [email protected]
       [email protected] "Runnable"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "\n    "
       [email protected]
@@ -26,7 +26,7 @@ [email protected]
     [email protected]
       [email protected] "TraitWithExpr"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "\n    "
       [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 468982b74..573edc081 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
@@ -17,7 +17,7 @@ [email protected]
           [email protected]
             [email protected] "Foo"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "\n    "
       [email protected]
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 e8b095251..69aa0ba4d 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
@@ -98,7 +98,7 @@ [email protected]
           [email protected]
             [email protected] "Whatever"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "\n    "
       [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 816740a7c..919c690de 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
@@ -192,7 +192,7 @@ [email protected]
     [email protected]
       [email protected] "Foo"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "\n    "
       [email protected]
@@ -260,7 +260,7 @@ [email protected]
           [email protected]
             [email protected] "S"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "\n     "
       [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 886b211d0..40619b46e 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
@@ -5,7 +5,7 @@ [email protected]
     [email protected]
       [email protected] "T"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "\n    "
       [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 a0423806c..7b026e33b 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
@@ -8,7 +8,7 @@ [email protected]
           [email protected]
             [email protected] "U"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "\n    "
       [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0066_default_const.rast b/crates/ra_syntax/test_data/parser/ok/0066_default_const.rast
index dab0247ee..584b2faf1 100644
--- a/crates/ra_syntax/test_data/parser/ok/0066_default_const.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0066_default_const.rast
@@ -16,7 +16,7 @@ [email protected]
           [email protected]
             [email protected] "Foo"
     [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
       [email protected] "{"
       [email protected] "\n  "
       [email protected]