diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-05-05 17:13:57 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-05-05 17:13:57 +0100 |
| commit | 58f64313fdbb215b29cceb843e06d2c1541d9f56 (patch) | |
| tree | 0c95a20510f832ec5f208a1ede39f8aad8ffcd86 /xtask | |
| parent | 756e91732b7a92d9156f5c1d8ffcaf5155cf4680 (diff) | |
| parent | 92665358cd98913e3fef8294e1889cc0bb919e3f (diff) | |
Merge #4321
4321: Rename ImplItem to AssocItem r=matklad a=edwin0cheng
Related discussion: https://github.com/rust-analyzer/rust-analyzer/pull/4283#discussion_r419352265
Co-authored-by: Edwin Cheng <[email protected]>
Diffstat (limited to 'xtask')
| -rw-r--r-- | xtask/src/ast_src.rs | 4 |
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 { | |||
| 373 | 373 | ||
| 374 | struct ItemList: ModuleItemOwner { | 374 | struct ItemList: ModuleItemOwner { |
| 375 | T!['{'], | 375 | T!['{'], |
| 376 | impl_items: [ImplItem], | 376 | assoc_items: [AssocItem], |
| 377 | T!['}'] | 377 | T!['}'] |
| 378 | } | 378 | } |
| 379 | 379 | ||
| @@ -685,7 +685,7 @@ pub(crate) const AST_SRC: AstSrc = AstSrc { | |||
| 685 | } | 685 | } |
| 686 | 686 | ||
| 687 | /* impl blocks can also contain MacroCall */ | 687 | /* impl blocks can also contain MacroCall */ |
| 688 | enum ImplItem: NameOwner, AttrsOwner { | 688 | enum AssocItem: NameOwner, AttrsOwner { |
| 689 | FnDef, TypeAliasDef, ConstDef | 689 | FnDef, TypeAliasDef, ConstDef |
| 690 | } | 690 | } |
| 691 | 691 | ||