diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-09-17 14:27:50 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-09-17 14:27:50 +0100 |
commit | 7af7e1f25322b723fbaf0b2477b2b0716905f619 (patch) | |
tree | 939afa0f475610c3b618b7366ffd05101334c8c8 /crates/hir_def/src/item_tree/lower.rs | |
parent | d84c18d989d07785127d00395b929fc69eca19e6 (diff) | |
parent | 6eea06415d96012b01204611a65159b1a251a99d (diff) |
Merge #6024
6024: Give `ExternCrate` a `Name`, not a `ModPath` r=jonas-schievink a=jonas-schievink
Simplifies things
Co-authored-by: Jonas Schievink <[email protected]>
Diffstat (limited to 'crates/hir_def/src/item_tree/lower.rs')
-rw-r--r-- | crates/hir_def/src/item_tree/lower.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/hir_def/src/item_tree/lower.rs b/crates/hir_def/src/item_tree/lower.rs index da62e1297..54814f141 100644 --- a/crates/hir_def/src/item_tree/lower.rs +++ b/crates/hir_def/src/item_tree/lower.rs | |||
@@ -503,7 +503,7 @@ impl Ctx { | |||
503 | &mut self, | 503 | &mut self, |
504 | extern_crate: &ast::ExternCrate, | 504 | extern_crate: &ast::ExternCrate, |
505 | ) -> Option<FileItemTreeId<ExternCrate>> { | 505 | ) -> Option<FileItemTreeId<ExternCrate>> { |
506 | let path = ModPath::from_name_ref(&extern_crate.name_ref()?); | 506 | let name = extern_crate.name_ref()?.as_name(); |
507 | let alias = extern_crate.rename().map(|a| { | 507 | let alias = extern_crate.rename().map(|a| { |
508 | a.name().map(|it| it.as_name()).map_or(ImportAlias::Underscore, ImportAlias::Alias) | 508 | a.name().map(|it| it.as_name()).map_or(ImportAlias::Underscore, ImportAlias::Alias) |
509 | }); | 509 | }); |
@@ -512,7 +512,7 @@ impl Ctx { | |||
512 | // FIXME: cfg_attr | 512 | // FIXME: cfg_attr |
513 | let is_macro_use = extern_crate.has_atom_attr("macro_use"); | 513 | let is_macro_use = extern_crate.has_atom_attr("macro_use"); |
514 | 514 | ||
515 | let res = ExternCrate { path, alias, visibility, is_macro_use, ast_id }; | 515 | let res = ExternCrate { name, alias, visibility, is_macro_use, ast_id }; |
516 | Some(id(self.data().extern_crates.alloc(res))) | 516 | Some(id(self.data().extern_crates.alloc(res))) |
517 | } | 517 | } |
518 | 518 | ||