Merge branch 'master' of github.com:rust-analyzer/rust-analyzer into fix_4311

1 files changed, 2 insertions, 2 deletions

diff --git a/xtask/src/ast_src.rs b/xtask/src/ast_src.rs
index 2f8065b73..fe3eb85de 100644
--- a/xtask/src/ast_src.rs
+++ b/xtask/src/ast_src.rs
@@ -373,7 +373,7 @@ pub(crate) const AST_SRC: AstSrc = AstSrc {
 
         struct ItemList: ModuleItemOwner {
             T!['{'],
-            impl_items: [ImplItem],
+            assoc_items: [AssocItem],
             T!['}']
         }
 
@@ -685,7 +685,7 @@ pub(crate) const AST_SRC: AstSrc = AstSrc {
         }
 
         /* impl blocks can also contain MacroCall */
-        enum ImplItem: NameOwner, AttrsOwner {
+        enum AssocItem: NameOwner, AttrsOwner {
             FnDef, TypeAliasDef, ConstDef
         }