From 20ff1cdcfbef92429962569f7e98a169c6a10e50 Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Tue, 23 Jun 2020 18:31:14 +0200 Subject: Address more comments --- crates/ra_hir_def/src/data.rs | 7 +++---- crates/ra_hir_def/src/item_tree/lower.rs | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'crates') diff --git a/crates/ra_hir_def/src/data.rs b/crates/ra_hir_def/src/data.rs index 51c97c584..5f8eb72a0 100644 --- a/crates/ra_hir_def/src/data.rs +++ b/crates/ra_hir_def/src/data.rs @@ -234,10 +234,9 @@ fn collect_items( // FIXME: cfg? AssocItem::Const(id) => { let item = &item_tree[id]; - let name = if let Some(name) = item.name.clone() { - name - } else { - continue; + let name = match item.name.clone() { + Some(name) => name, + None => continue, }; let def = ConstLoc { container, id: ItemTreeId::new(file_id, id) }.intern(db); items.push((name, def.into())); diff --git a/crates/ra_hir_def/src/item_tree/lower.rs b/crates/ra_hir_def/src/item_tree/lower.rs index b97927f27..733fcac7a 100644 --- a/crates/ra_hir_def/src/item_tree/lower.rs +++ b/crates/ra_hir_def/src/item_tree/lower.rs @@ -136,7 +136,7 @@ impl Ctx { fn collect_inner_items(&mut self, container: &SyntaxNode) { let forced_vis = self.forced_visibility.take(); - let mut inner_items = mem::replace(&mut self.tree.inner_items, FxHashMap::default()); + let mut inner_items = mem::take(&mut self.tree.inner_items); inner_items.extend( container.descendants().skip(1).filter_map(ast::ModuleItem::cast).filter_map(|item| { let ast_id = self.source_ast_id_map.ast_id(&item); -- cgit v1.2.3