From 705f7e6e2644bf5de4255bc05ea8d9d5027c29b0 Mon Sep 17 00:00:00 2001 From: Maan2003 Date: Sun, 13 Jun 2021 09:27:19 +0530 Subject: clippy::clone_on_copy --- crates/hir/src/lib.rs | 2 +- crates/hir_def/src/attr.rs | 2 +- crates/hir_def/src/item_scope.rs | 2 +- crates/hir_expand/src/proc_macro.rs | 1 - crates/ide/src/goto_definition.rs | 2 +- crates/ide/src/goto_implementation.rs | 2 +- crates/ide/src/hover.rs | 2 +- 7 files changed, 6 insertions(+), 7 deletions(-) (limited to 'crates') diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs index f6eb23262..bd923cba8 100644 --- a/crates/hir/src/lib.rs +++ b/crates/hir/src/lib.rs @@ -452,7 +452,7 @@ impl Module { } pub fn visibility_of(self, db: &dyn HirDatabase, def: &ModuleDef) -> Option { - self.id.def_map(db.upcast())[self.id.local_id].scope.visibility_of(def.clone().into()) + self.id.def_map(db.upcast())[self.id.local_id].scope.visibility_of((*def).into()) } pub fn diagnostics( diff --git a/crates/hir_def/src/attr.rs b/crates/hir_def/src/attr.rs index d9f9fadc1..2b21cf927 100644 --- a/crates/hir_def/src/attr.rs +++ b/crates/hir_def/src/attr.rs @@ -606,7 +606,7 @@ pub struct DocsRangeMap { impl DocsRangeMap { pub fn map(&self, range: TextRange) -> Option> { let found = self.mapping.binary_search_by(|(probe, ..)| probe.ordering(range)).ok()?; - let (line_docs_range, idx, original_line_src_range) = self.mapping[found].clone(); + let (line_docs_range, idx, original_line_src_range) = self.mapping[found]; if !line_docs_range.contains_range(range) { return None; } diff --git a/crates/hir_def/src/item_scope.rs b/crates/hir_def/src/item_scope.rs index 0f74f050d..08407ebfa 100644 --- a/crates/hir_def/src/item_scope.rs +++ b/crates/hir_def/src/item_scope.rs @@ -59,7 +59,7 @@ pub struct ItemScope { pub(crate) static BUILTIN_SCOPE: Lazy> = Lazy::new(|| { BuiltinType::ALL .iter() - .map(|(name, ty)| (name.clone(), PerNs::types(ty.clone().into(), Visibility::Public))) + .map(|(name, ty)| (name.clone(), PerNs::types((*ty).into(), Visibility::Public))) .collect() }); diff --git a/crates/hir_expand/src/proc_macro.rs b/crates/hir_expand/src/proc_macro.rs index 3ad2d3bf7..025e10239 100644 --- a/crates/hir_expand/src/proc_macro.rs +++ b/crates/hir_expand/src/proc_macro.rs @@ -45,7 +45,6 @@ impl ProcMacroExpander { let proc_macro = krate_graph[self.krate] .proc_macro .get(id.0 as usize) - .clone() .ok_or_else(|| err!("No derive macro found."))?; // Proc macros have access to the environment variables of the invoking crate. diff --git a/crates/ide/src/goto_definition.rs b/crates/ide/src/goto_definition.rs index 27a292d83..d29ee64a5 100644 --- a/crates/ide/src/goto_definition.rs +++ b/crates/ide/src/goto_definition.rs @@ -43,7 +43,7 @@ pub(crate) fn goto_definition( let (docs, doc_mapping) = attributes.docs_with_rangemap(db)?; let (_, link, ns) = extract_definitions_from_markdown(docs.as_str()).into_iter().find(|(range, ..)| { - doc_mapping.map(range.clone()).map_or(false, |InFile { file_id, value: range }| { + doc_mapping.map(*range).map_or(false, |InFile { file_id, value: range }| { file_id == position.file_id.into() && range.contains(position.offset) }) })?; diff --git a/crates/ide/src/goto_implementation.rs b/crates/ide/src/goto_implementation.rs index 95fd39850..0013820b4 100644 --- a/crates/ide/src/goto_implementation.rs +++ b/crates/ide/src/goto_implementation.rs @@ -87,7 +87,7 @@ fn impls_for_trait_item( .filter_map(|imp| { let item = imp.items(sema.db).iter().find_map(|itm| { let itm_name = itm.name(sema.db)?; - (itm_name == fun_name).then(|| itm.clone()) + (itm_name == fun_name).then(|| *itm) })?; item.try_to_nav(sema.db) }) diff --git a/crates/ide/src/hover.rs b/crates/ide/src/hover.rs index b4b3b45b5..4ba4f61d8 100644 --- a/crates/ide/src/hover.rs +++ b/crates/ide/src/hover.rs @@ -131,7 +131,7 @@ pub(crate) fn hover( let (docs, doc_mapping) = attributes.docs_with_rangemap(db)?; let (idl_range, link, ns) = extract_definitions_from_markdown(docs.as_str()).into_iter().find_map(|(range, link, ns)| { - let InFile { file_id, value: range } = doc_mapping.map(range.clone())?; + let InFile { file_id, value: range } = doc_mapping.map(range)?; if file_id == position.file_id.into() && range.contains(position.offset) { Some((range, link, ns)) } else { -- cgit v1.2.3