aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_syntax/src/grammar.ron
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2019-01-04 17:30:42 +0000
committerbors[bot] <bors[bot]@users.noreply.github.com>2019-01-04 17:30:42 +0000
commit03e70711e69fbec175ee3eabe923fd84f1f50ed8 (patch)
treef3f06509c39c3cbeadd0e82d534834270c8fc395 /crates/ra_syntax/src/grammar.ron
parenta0d483011d5f84747fcc5d5fe9c82f4405d24db9 (diff)
parentfe6c4115f6c8bb5b5f276bafcbd9cc3fc1d504d1 (diff)
Merge #426
426: Rename ImplItem to ImplBlock r=flodiebold a=flodiebold rustc uses the name ImplItem for items in impls, not the impl {} block itself, which could lead to confusion. Extracted from #370. Co-authored-by: Florian Diebold <[email protected]>
Diffstat (limited to 'crates/ra_syntax/src/grammar.ron')
-rw-r--r--crates/ra_syntax/src/grammar.ron6
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_syntax/src/grammar.ron b/crates/ra_syntax/src/grammar.ron
index 2abb9da61..9a4a96fac 100644
--- a/crates/ra_syntax/src/grammar.ron
+++ b/crates/ra_syntax/src/grammar.ron
@@ -128,7 +128,7 @@ Grammar(
128 "STATIC_DEF", 128 "STATIC_DEF",
129 "CONST_DEF", 129 "CONST_DEF",
130 "TRAIT_DEF", 130 "TRAIT_DEF",
131 "IMPL_ITEM", 131 "IMPL_BLOCK",
132 "TYPE_DEF", 132 "TYPE_DEF",
133 "MACRO_CALL", 133 "MACRO_CALL",
134 "TOKEN_TREE", 134 "TOKEN_TREE",
@@ -307,7 +307,7 @@ Grammar(
307 "AttrsOwner", 307 "AttrsOwner",
308 "DocCommentsOwner" 308 "DocCommentsOwner"
309 ] ), 309 ] ),
310 "ImplItem": (), 310 "ImplBlock": (collections: []),
311 311
312 "ParenType": (options: ["TypeRef"]), 312 "ParenType": (options: ["TypeRef"]),
313 "TupleType": ( collections: [["fields", "TypeRef"]] ), 313 "TupleType": ( collections: [["fields", "TypeRef"]] ),
@@ -348,7 +348,7 @@ Grammar(
348 ], 348 ],
349 ), 349 ),
350 "ModuleItem": ( 350 "ModuleItem": (
351 enum: ["StructDef", "EnumDef", "FnDef", "TraitDef", "TypeDef", "ImplItem", 351 enum: ["StructDef", "EnumDef", "FnDef", "TraitDef", "TypeDef", "ImplBlock",
352 "UseItem", "ExternCrateItem", "ConstDef", "StaticDef", "Module" ] 352 "UseItem", "ExternCrateItem", "ConstDef", "StaticDef", "Module" ]
353 ), 353 ),
354 354