From d7f3d858add197f91969c69b1d4a14dbcb801f03 Mon Sep 17 00:00:00 2001 From: Jeremy Kolb Date: Sun, 19 Apr 2020 15:15:49 -0400 Subject: Some clippy fixes --- crates/ra_hir_expand/src/ast_id_map.rs | 2 +- crates/ra_hir_expand/src/builtin_macro.rs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'crates/ra_hir_expand') diff --git a/crates/ra_hir_expand/src/ast_id_map.rs b/crates/ra_hir_expand/src/ast_id_map.rs index a3ca302c2..d19569245 100644 --- a/crates/ra_hir_expand/src/ast_id_map.rs +++ b/crates/ra_hir_expand/src/ast_id_map.rs @@ -66,7 +66,7 @@ impl AstIdMap { // change parent's id. This means that, say, adding a new function to a // trait does not change ids of top-level items, which helps caching. bfs(node, |it| { - if let Some(module_item) = ast::ModuleItem::cast(it.clone()) { + if let Some(module_item) = ast::ModuleItem::cast(it) { res.alloc(module_item.syntax()); } }); diff --git a/crates/ra_hir_expand/src/builtin_macro.rs b/crates/ra_hir_expand/src/builtin_macro.rs index f9d3787f6..3da137f2e 100644 --- a/crates/ra_hir_expand/src/builtin_macro.rs +++ b/crates/ra_hir_expand/src/builtin_macro.rs @@ -301,7 +301,7 @@ fn relative_file(db: &dyn AstDatabase, call_id: MacroCallId, path: &str) -> Opti } // Extern paths ? - let krate = db.relevant_crates(call_site).get(0)?.clone(); + let krate = *db.relevant_crates(call_site).get(0)?; let (extern_source_id, relative_file) = db.crate_graph()[krate].extern_source.extern_path(path)?; @@ -329,7 +329,7 @@ fn include_expand( // FIXME: // Handle include as expression - let res = parse_to_token_tree(&db.file_text(file_id.into())) + let res = parse_to_token_tree(&db.file_text(file_id)) .ok_or_else(|| mbe::ExpandError::ConversionError)? .0; @@ -340,7 +340,7 @@ fn get_env_inner(db: &dyn AstDatabase, arg_id: EagerMacroId, key: &str) -> Optio let call_id: MacroCallId = arg_id.into(); let original_file = call_id.as_file().original_file(db); - let krate = db.relevant_crates(original_file).get(0)?.clone(); + let krate = *db.relevant_crates(original_file).get(0)?; db.crate_graph()[krate].env.get(key) } @@ -447,7 +447,7 @@ mod tests { file_id: file_id.into(), }; - let id: MacroCallId = db.intern_eager_expansion(eager.into()).into(); + let id: MacroCallId = db.intern_eager_expansion(eager).into(); id.as_file() } }; -- cgit v1.2.3