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 /crates/ra_hir_def/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 'crates/ra_hir_def/src')
-rw-r--r-- | crates/ra_hir_def/src/item_tree/lower.rs | 2 | ||||
-rw-r--r-- | crates/ra_hir_def/src/path/lower/lower_use.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir_def/src/item_tree/lower.rs b/crates/ra_hir_def/src/item_tree/lower.rs index 4fc21a642..6c58c6378 100644 --- 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 { | |||
501 | extern_crate: &ast::ExternCrateItem, | 501 | extern_crate: &ast::ExternCrateItem, |
502 | ) -> Option<FileItemTreeId<ExternCrate>> { | 502 | ) -> Option<FileItemTreeId<ExternCrate>> { |
503 | let path = ModPath::from_name_ref(&extern_crate.name_ref()?); | 503 | let path = ModPath::from_name_ref(&extern_crate.name_ref()?); |
504 | let alias = extern_crate.alias().map(|a| { | 504 | let alias = extern_crate.rename().map(|a| { |
505 | a.name().map(|it| it.as_name()).map_or(ImportAlias::Underscore, ImportAlias::Alias) | 505 | a.name().map(|it| it.as_name()).map_or(ImportAlias::Underscore, ImportAlias::Alias) |
506 | }); | 506 | }); |
507 | let visibility = self.lower_visibility(extern_crate); | 507 | 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 index 7cc655487..794be45e8 100644 --- 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( | |||
31 | lower_use_tree(prefix.clone(), child_tree, hygiene, cb); | 31 | lower_use_tree(prefix.clone(), child_tree, hygiene, cb); |
32 | } | 32 | } |
33 | } else { | 33 | } else { |
34 | let alias = tree.alias().map(|a| { | 34 | let alias = tree.rename().map(|a| { |
35 | a.name().map(|it| it.as_name()).map_or(ImportAlias::Underscore, ImportAlias::Alias) | 35 | a.name().map(|it| it.as_name()).map_or(ImportAlias::Underscore, ImportAlias::Alias) |
36 | }); | 36 | }); |
37 | let is_glob = tree.star_token().is_some(); | 37 | let is_glob = tree.star_token().is_some(); |