diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-07-30 12:30:00 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-07-30 12:30:00 +0100 |
commit | be803efb7c7ba257716fcc97c57ecfd07e278b07 (patch) | |
tree | 7618dd660346f62715e908355e51917c0b70f914 /crates/ra_hir_def/src/item_tree/lower.rs | |
parent | 570fdf26c90758c04b90fadfe1b0e6ee684c6dbe (diff) | |
parent | 96313283cd6cb7732ad4f6498f938dcd428d1864 (diff) |
Merge #5585
5585: Finish extern crate grammar r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir_def/src/item_tree/lower.rs')
-rw-r--r-- | crates/ra_hir_def/src/item_tree/lower.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_hir_def/src/item_tree/lower.rs b/crates/ra_hir_def/src/item_tree/lower.rs index 6c58c6378..8a36de311 100644 --- a/crates/ra_hir_def/src/item_tree/lower.rs +++ b/crates/ra_hir_def/src/item_tree/lower.rs | |||
@@ -95,7 +95,7 @@ impl Ctx { | |||
95 | ast::Item::TraitDef(_) | ast::Item::ImplDef(_) | ast::Item::ExternBlock(_) => {} | 95 | ast::Item::TraitDef(_) | ast::Item::ImplDef(_) | ast::Item::ExternBlock(_) => {} |
96 | 96 | ||
97 | // These don't have inner items. | 97 | // These don't have inner items. |
98 | ast::Item::Module(_) | ast::Item::ExternCrateItem(_) | ast::Item::UseItem(_) => {} | 98 | ast::Item::Module(_) | ast::Item::ExternCrate(_) | ast::Item::UseItem(_) => {} |
99 | }; | 99 | }; |
100 | 100 | ||
101 | let attrs = Attrs::new(item, &self.hygiene); | 101 | let attrs = Attrs::new(item, &self.hygiene); |
@@ -113,7 +113,7 @@ impl Ctx { | |||
113 | ast::Item::UseItem(ast) => Some(ModItems( | 113 | ast::Item::UseItem(ast) => Some(ModItems( |
114 | self.lower_use(ast).into_iter().map(Into::into).collect::<SmallVec<_>>(), | 114 | self.lower_use(ast).into_iter().map(Into::into).collect::<SmallVec<_>>(), |
115 | )), | 115 | )), |
116 | ast::Item::ExternCrateItem(ast) => self.lower_extern_crate(ast).map(Into::into), | 116 | ast::Item::ExternCrate(ast) => self.lower_extern_crate(ast).map(Into::into), |
117 | ast::Item::MacroCall(ast) => self.lower_macro_call(ast).map(Into::into), | 117 | ast::Item::MacroCall(ast) => self.lower_macro_call(ast).map(Into::into), |
118 | ast::Item::ExternBlock(ast) => { | 118 | ast::Item::ExternBlock(ast) => { |
119 | Some(ModItems(self.lower_extern_block(ast).into_iter().collect::<SmallVec<_>>())) | 119 | Some(ModItems(self.lower_extern_block(ast).into_iter().collect::<SmallVec<_>>())) |
@@ -498,7 +498,7 @@ impl Ctx { | |||
498 | 498 | ||
499 | fn lower_extern_crate( | 499 | fn lower_extern_crate( |
500 | &mut self, | 500 | &mut self, |
501 | extern_crate: &ast::ExternCrateItem, | 501 | extern_crate: &ast::ExternCrate, |
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.rename().map(|a| { | 504 | let alias = extern_crate.rename().map(|a| { |