diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-07-30 11:01:43 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-07-30 11:01:43 +0100 |
commit | dc49f88f17c760bb105625d8dd69f439ff7cdc9e (patch) | |
tree | ab84c1ee11371a74587209391e2b7cb1b3e67feb /xtask/src | |
parent | 74864d560b9293174c82fdee2b9d15991ebf075f (diff) | |
parent | 026e4e6af1e58843f3535f6e0f5365d0c2529e4e (diff) |
Merge #5583
5583: Rename Rename r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'xtask/src')
-rw-r--r-- | xtask/src/ast_src.rs | 2 | ||||
-rw-r--r-- | xtask/src/codegen/rust.ungram | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/xtask/src/ast_src.rs b/xtask/src/ast_src.rs index d2a408e77..bcd92c3bc 100644 --- a/xtask/src/ast_src.rs +++ b/xtask/src/ast_src.rs | |||
@@ -194,7 +194,7 @@ pub(crate) const KINDS_SRC: KindsSrc = KindsSrc { | |||
194 | "PATH", | 194 | "PATH", |
195 | "PATH_SEGMENT", | 195 | "PATH_SEGMENT", |
196 | "LITERAL", | 196 | "LITERAL", |
197 | "ALIAS", | 197 | "RENAME", |
198 | "VISIBILITY", | 198 | "VISIBILITY", |
199 | "WHERE_CLAUSE", | 199 | "WHERE_CLAUSE", |
200 | "WHERE_PRED", | 200 | "WHERE_PRED", |
diff --git a/xtask/src/codegen/rust.ungram b/xtask/src/codegen/rust.ungram index 470ac8c8f..76c070402 100644 --- a/xtask/src/codegen/rust.ungram +++ b/xtask/src/codegen/rust.ungram | |||
@@ -396,16 +396,16 @@ UseItem = | |||
396 | Attr* Visibility? 'use' UseTree ';' | 396 | Attr* Visibility? 'use' UseTree ';' |
397 | 397 | ||
398 | UseTree = | 398 | UseTree = |
399 | Path ('::' ('*' | UseTreeList)) Alias? | 399 | Path ('::' ('*' | UseTreeList)) Rename? |
400 | 400 | ||
401 | UseTreeList = | 401 | UseTreeList = |
402 | '{' UseTree* '}' | 402 | '{' UseTree* '}' |
403 | 403 | ||
404 | Alias = | 404 | Rename = |
405 | 'as' Name | 405 | 'as' Name |
406 | 406 | ||
407 | ExternCrateItem = | 407 | ExternCrateItem = |
408 | Attr* Visibility? 'extern' 'crate' (NameRef | 'self') Alias? ';' | 408 | Attr* Visibility? 'extern' 'crate' (NameRef | 'self') Rename? ';' |
409 | 409 | ||
410 | Path = | 410 | Path = |
411 | (qualifier:Path '::')? segment:PathSegment | 411 | (qualifier:Path '::')? segment:PathSegment |