Merge #5583

bors[bot] · matklad · web-flow · commit dc49f88f17c7 · 2020-07-30T10:01:43.000Z
5583: Rename Rename r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov &lt;aleksey.kladov@gmail.com&gt;
diff --git a/crates/ra_assists/src/utils/insert_use.rs b/crates/ra_assists/src/utils/insert_use.rs
@@ -215,7 +215,7 @@ fn walk_use_tree_for_best_action(
     let prev_len = current_path_segments.len();
 
     let tree_list = current_use_tree.use_tree_list();
-    let alias = current_use_tree.alias();
+    let alias = current_use_tree.rename();
 
     let path = match current_use_tree.path() {
         Some(path) => path,
diff --git a/crates/ra_hir_def/src/item_tree/lower.rs b/crates/ra_hir_def/src/item_tree/lower.rs
@@ -501,7 +501,7 @@ impl Ctx {
         extern_crate: &ast::ExternCrateItem,
     ) -> Option<FileItemTreeId<ExternCrate>> {
         let path = ModPath::from_name_ref(&extern_crate.name_ref()?);
-        let alias = extern_crate.alias().map(|a| {
+        let alias = extern_crate.rename().map(|a| {
             a.name().map(|it| it.as_name()).map_or(ImportAlias::Underscore, ImportAlias::Alias)
         });
         let visibility = self.lower_visibility(extern_crate);
diff --git a/crates/ra_hir_def/src/path/lower/lower_use.rs b/crates/ra_hir_def/src/path/lower/lower_use.rs
@@ -31,7 +31,7 @@ pub(crate) fn lower_use_tree(
             lower_use_tree(prefix.clone(), child_tree, hygiene, cb);
         }
     } else {
-        let alias = tree.alias().map(|a| {
+        let alias = tree.rename().map(|a| {
             a.name().map(|it| it.as_name()).map_or(ImportAlias::Underscore, ImportAlias::Alias)
         });
         let is_glob = tree.star_token().is_some();
diff --git a/crates/ra_ide_db/src/defs.rs b/crates/ra_ide_db/src/defs.rs
@@ -119,7 +119,7 @@ pub fn classify_name(sema: &Semantics<RootDatabase>, name: &ast::Name) -> Option
 
     match_ast! {
         match parent {
-            ast::Alias(it) => {
+            ast::Rename(it) => {
                 let use_tree = it.syntax().parent().and_then(ast::UseTree::cast)?;
                 let path = use_tree.path()?;
                 let path_segment = path.segment()?;
diff --git a/crates/ra_parser/src/grammar.rs b/crates/ra_parser/src/grammar.rs
@@ -224,7 +224,7 @@ fn opt_alias(p: &mut Parser) {
         if !p.eat(T![_]) {
             name(p);
         }
-        m.complete(p, ALIAS);
+        m.complete(p, RENAME);
     }
 }
 
diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs
@@ -221,7 +221,7 @@ pub enum SyntaxKind {
     PATH,
     PATH_SEGMENT,
     LITERAL,
-    ALIAS,
+    RENAME,
     VISIBILITY,
     WHERE_CLAUSE,
     WHERE_PRED,
diff --git a/crates/ra_syntax/src/ast/edit.rs b/crates/ra_syntax/src/ast/edit.rs
@@ -317,8 +317,12 @@ impl ast::UseTree {
             Some(it) => it,
             None => return self.clone(),
         };
-        let use_tree =
-            make::use_tree(suffix, self.use_tree_list(), self.alias(), self.star_token().is_some());
+        let use_tree = make::use_tree(
+            suffix,
+            self.use_tree_list(),
+            self.rename(),
+            self.star_token().is_some(),
+        );
         let nested = make::use_tree_list(iter::once(use_tree));
         return make::use_tree(prefix.clone(), Some(nested), None, false);
 
diff --git a/crates/ra_syntax/src/ast/generated/nodes.rs b/crates/ra_syntax/src/ast/generated/nodes.rs
@@ -75,7 +75,7 @@ impl ExternCrateItem {
     pub fn crate_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![crate]) }
     pub fn name_ref(&self) -> Option<NameRef> { support::child(&self.syntax) }
     pub fn self_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![self]) }
-    pub fn alias(&self) -> Option<Alias> { support::child(&self.syntax) }
+    pub fn rename(&self) -> Option<Rename> { support::child(&self.syntax) }
     pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -1178,7 +1178,7 @@ impl UseTree {
     pub fn coloncolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![::]) }
     pub fn star_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![*]) }
     pub fn use_tree_list(&self) -> Option<UseTreeList> { support::child(&self.syntax) }
-    pub fn alias(&self) -> Option<Alias> { support::child(&self.syntax) }
+    pub fn rename(&self) -> Option<Rename> { support::child(&self.syntax) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct UseTreeList {
@@ -1190,11 +1190,11 @@ impl UseTreeList {
     pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Alias {
+pub struct Rename {
     pub(crate) syntax: SyntaxNode,
 }
-impl ast::NameOwner for Alias {}
-impl Alias {
+impl ast::NameOwner for Rename {}
+impl Rename {
     pub fn as_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![as]) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -2683,8 +2683,8 @@ impl AstNode for UseTreeList {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for Alias {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == ALIAS }
+impl AstNode for Rename {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == RENAME }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -4040,7 +4040,7 @@ impl std::fmt::Display for UseTreeList {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for Alias {
+impl std::fmt::Display for Rename {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
diff --git a/crates/ra_syntax/src/ast/make.rs b/crates/ra_syntax/src/ast/make.rs
@@ -37,7 +37,7 @@ fn path_from_text(text: &str) -> ast::Path {
 pub fn use_tree(
     path: ast::Path,
     use_tree_list: Option<ast::UseTreeList>,
-    alias: Option<ast::Alias>,
+    alias: Option<ast::Rename>,
     add_star: bool,
 ) -> ast::UseTree {
     let mut buf = "use ".to_string();
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0043_use_alias.rast b/crates/ra_syntax/test_data/parser/inline/ok/0043_use_alias.rast
@@ -13,7 +13,7 @@ SOURCE_FILE@0..198
           NAME_REF@10..14
             IDENT@10..14 "path"
       WHITESPACE@14..15 " "
-      ALIAS@15..27
+      RENAME@15..27
         AS_KW@15..17 "as"
         WHITESPACE@17..18 " "
         NAME@18..27
@@ -43,7 +43,7 @@ SOURCE_FILE@0..198
               NAME_REF@49..53
                 IDENT@49..53 "path"
           WHITESPACE@53..54 " "
-          ALIAS@54..72
+          RENAME@54..72
             AS_KW@54..56 "as"
             WHITESPACE@56..57 " "
             NAME@57..72
@@ -61,7 +61,7 @@ SOURCE_FILE@0..198
               NAME_REF@86..90
                 IDENT@86..90 "path"
           WHITESPACE@90..91 " "
-          ALIAS@91..108
+          RENAME@91..108
             AS_KW@91..93 "as"
             WHITESPACE@93..94 " "
             NAME@94..108
@@ -130,7 +130,7 @@ SOURCE_FILE@0..198
           NAME_REF@186..191
             IDENT@186..191 "Trait"
       WHITESPACE@191..192 " "
-      ALIAS@192..196
+      RENAME@192..196
         AS_KW@192..194 "as"
         WHITESPACE@194..195 " "
         UNDERSCORE@195..196 "_"
diff --git a/crates/ra_syntax/test_data/parser/ok/0007_extern_crate.rast b/crates/ra_syntax/test_data/parser/ok/0007_extern_crate.rast
@@ -16,7 +16,7 @@ SOURCE_FILE@0..69
     NAME_REF@31..34
       IDENT@31..34 "foo"
     WHITESPACE@34..35 " "
-    ALIAS@35..41
+    RENAME@35..41
       AS_KW@35..37 "as"
       WHITESPACE@37..38 " "
       NAME@38..41
@@ -30,7 +30,7 @@ SOURCE_FILE@0..69
     WHITESPACE@55..56 " "
     SELF_KW@56..60 "self"
     WHITESPACE@60..61 " "
-    ALIAS@61..67
+    RENAME@61..67
       AS_KW@61..63 "as"
       WHITESPACE@63..64 " "
       NAME@64..67
diff --git a/crates/ra_syntax/test_data/parser/ok/0015_use_tree.rast b/crates/ra_syntax/test_data/parser/ok/0015_use_tree.rast
@@ -8,7 +8,7 @@ SOURCE_FILE@0..55
           NAME_REF@4..7
             IDENT@4..7 "foo"
       WHITESPACE@7..8 " "
-      ALIAS@8..14
+      RENAME@8..14
         AS_KW@8..10 "as"
         WHITESPACE@10..11 " "
         NAME@11..14
@@ -32,7 +32,7 @@ SOURCE_FILE@0..55
               NAME_REF@26..27
                 IDENT@26..27 "a"
           WHITESPACE@27..28 " "
-          ALIAS@28..32
+          RENAME@28..32
             AS_KW@28..30 "as"
             WHITESPACE@30..31 " "
             NAME@31..32
@@ -55,7 +55,7 @@ SOURCE_FILE@0..55
               NAME_REF@44..47
                 IDENT@44..47 "foo"
           WHITESPACE@47..48 " "
-          ALIAS@48..52
+          RENAME@48..52
             AS_KW@48..50 "as"
             WHITESPACE@50..51 " "
             NAME@51..52
diff --git a/xtask/src/ast_src.rs b/xtask/src/ast_src.rs
@@ -194,7 +194,7 @@ pub(crate) const KINDS_SRC: KindsSrc = KindsSrc {
         "PATH",
         "PATH_SEGMENT",
         "LITERAL",
-        "ALIAS",
+        "RENAME",
         "VISIBILITY",
         "WHERE_CLAUSE",
         "WHERE_PRED",
diff --git a/xtask/src/codegen/rust.ungram b/xtask/src/codegen/rust.ungram
@@ -396,16 +396,16 @@ UseItem =
   Attr* Visibility? 'use' UseTree ';'
 
 UseTree =
-  Path ('::' ('*' | UseTreeList))  Alias?
+  Path ('::' ('*' | UseTreeList))  Rename?
 
 UseTreeList =
   '{' UseTree* '}'
 
-Alias =
+Rename =
   'as' Name
 
 ExternCrateItem =
-  Attr* Visibility? 'extern' 'crate' (NameRef | 'self') Alias? ';'
+  Attr* Visibility? 'extern' 'crate' (NameRef | 'self') Rename? ';'
 
 Path =
   (qualifier:Path '::')? segment:PathSegment

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ pub(crate) fn lower_use_tree(`
`31`	`31`	`lower_use_tree(prefix.clone(), child_tree, hygiene, cb);`
`32`	`32`	`}`
`33`	`33`	`} else {`
`34`		`- let alias = tree.alias().map(\|a\| {`
	`34`	`+ let alias = tree.rename().map(\|a\| {`
`35`	`35`	`a.name().map(\|it\| it.as_name()).map_or(ImportAlias::Underscore, ImportAlias::Alias)`
`36`	`36`	`});`
`37`	`37`	`let is_glob = tree.star_token().is_some();`
Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ fn opt_alias(p: &mut Parser) {`
`224`	`224`	`if !p.eat(T![_]) {`
`225`	`225`	`name(p);`
`226`	`226`	`}`
`227`		`- m.complete(p, ALIAS);`
	`227`	`+ m.complete(p, RENAME);`
`228`	`228`	`}`
`229`	`229`	`}`
`230`	`230`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ impl ExternCrateItem {`
`75`	`75`	`pub fn crate_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![crate]) }`
`76`	`76`	`pub fn name_ref(&self) -> Option<NameRef> { support::child(&self.syntax) }`
`77`	`77`	`pub fn self_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![self]) }`
`78`		`- pub fn alias(&self) -> Option<Alias> { support::child(&self.syntax) }`
	`78`	`+ pub fn rename(&self) -> Option<Rename> { support::child(&self.syntax) }`
`79`	`79`	`pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }`
`80`	`80`	`}`
`81`	`81`	`#[derive(Debug, Clone, PartialEq, Eq, Hash)]`
`@@ -1178,7 +1178,7 @@ impl UseTree {`
`1178`	`1178`	`pub fn coloncolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![::]) }`
`1179`	`1179`	`pub fn star_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![*]) }`
`1180`	`1180`	`pub fn use_tree_list(&self) -> Option<UseTreeList> { support::child(&self.syntax) }`
`1181`		`- pub fn alias(&self) -> Option<Alias> { support::child(&self.syntax) }`
	`1181`	`+ pub fn rename(&self) -> Option<Rename> { support::child(&self.syntax) }`
`1182`	`1182`	`}`
`1183`	`1183`	`#[derive(Debug, Clone, PartialEq, Eq, Hash)]`
`1184`	`1184`	`pub struct UseTreeList {`
`@@ -1190,11 +1190,11 @@ impl UseTreeList {`
`1190`	`1190`	`pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }`
`1191`	`1191`	`}`
`1192`	`1192`	`#[derive(Debug, Clone, PartialEq, Eq, Hash)]`
`1193`		`-pub struct Alias {`
	`1193`	`+pub struct Rename {`
`1194`	`1194`	`pub(crate) syntax: SyntaxNode,`
`1195`	`1195`	`}`
`1196`		`-impl ast::NameOwner for Alias {}`
`1197`		`-impl Alias {`
	`1196`	`+impl ast::NameOwner for Rename {}`
	`1197`	`+impl Rename {`
`1198`	`1198`	`pub fn as_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![as]) }`
`1199`	`1199`	`}`
`1200`	`1200`	`#[derive(Debug, Clone, PartialEq, Eq, Hash)]`
`@@ -2683,8 +2683,8 @@ impl AstNode for UseTreeList {`
`2683`	`2683`	`}`
`2684`	`2684`	`fn syntax(&self) -> &SyntaxNode { &self.syntax }`
`2685`	`2685`	`}`
`2686`		`-impl AstNode for Alias {`
`2687`		`- fn can_cast(kind: SyntaxKind) -> bool { kind == ALIAS }`
	`2686`	`+impl AstNode for Rename {`
	`2687`	`+ fn can_cast(kind: SyntaxKind) -> bool { kind == RENAME }`
`2688`	`2688`	`fn cast(syntax: SyntaxNode) -> Option<Self> {`
`2689`	`2689`	`if Self::can_cast(syntax.kind()) {`
`2690`	`2690`	`Some(Self { syntax })`
`@@ -4040,7 +4040,7 @@ impl std::fmt::Display for UseTreeList {`
`4040`	`4040`	`std::fmt::Display::fmt(self.syntax(), f)`
`4041`	`4041`	`}`
`4042`	`4042`	`}`
`4043`		`-impl std::fmt::Display for Alias {`
	`4043`	`+impl std::fmt::Display for Rename {`
`4044`	`4044`	`fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {`
`4045`	`4045`	`std::fmt::Display::fmt(self.syntax(), f)`
`4046`	`4046`	`}`
-Original file line number
+Diff line change
           [email protected]
             [email protected] "path"
       [email protected] " "
 -      ALIAS@15..27
 +      RENAME@15..27
         [email protected] "as"
         [email protected] " "
         [email protected]
               [email protected]
                 [email protected] "path"
           [email protected] " "
 -          ALIAS@54..72
 +          RENAME@54..72
             [email protected] "as"
             [email protected] " "
             [email protected]
               [email protected]
                 [email protected] "path"
           [email protected] " "
 -          ALIAS@91..108
 +          RENAME@91..108
             [email protected] "as"
             [email protected] " "
             [email protected]
           [email protected]
             [email protected] "Trait"
       [email protected] " "
 -      ALIAS@192..196
 +      RENAME@192..196
         [email protected] "as"
         [email protected] " "
         [email protected] "_"