From 79d103d5b42c5b207c28b6eb8a6ab42f0c685ec5 Mon Sep 17 00:00:00 2001
From: Yoshua Wuyts <yoshuawuyts@gmail.com>
Date: Fri, 5 Feb 2021 16:57:26 +0100
Subject: [PATCH] Remove redundant clones

---
 crates/assists/src/assist_context.rs |  4 ++--
 crates/hir_def/src/body/lower.rs     |  2 +-
 crates/hir_def/src/data.rs           |  2 +-
 crates/hir_def/src/test_db.rs        |  2 +-
 crates/hir_ty/src/diagnostics.rs     |  2 +-
 crates/proc_macro_api/src/rpc.rs     |  2 +-
 crates/test_utils/src/fixture.rs     | 11 +----------
 7 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/crates/assists/src/assist_context.rs b/crates/assists/src/assist_context.rs
index 8d93edba218..bba6c08e02d 100644
--- a/crates/assists/src/assist_context.rs
+++ b/crates/assists/src/assist_context.rs
@@ -162,7 +162,7 @@ fn add_impl(&mut self, mut assist: Assist, f: impl FnOnce(&mut AssistBuilder)) -
         } else {
             None
         };
-        assist.source_change = source_change.clone();
+        assist.source_change = source_change;
 
         self.buf.push(assist);
         Some(())
@@ -242,7 +242,7 @@ pub(crate) fn rewrite(&mut self, rewriter: SyntaxRewriter) {
     }
     pub(crate) fn create_file(&mut self, dst: AnchoredPathBuf, content: impl Into<String>) {
         let file_system_edit =
-            FileSystemEdit::CreateFile { dst: dst.clone(), initial_contents: content.into() };
+            FileSystemEdit::CreateFile { dst: dst, initial_contents: content.into() };
         self.source_change.push_file_system_edit(file_system_edit);
     }
 
diff --git a/crates/hir_def/src/body/lower.rs b/crates/hir_def/src/body/lower.rs
index 28b11cddeee..c18001e15dc 100644
--- a/crates/hir_def/src/body/lower.rs
+++ b/crates/hir_def/src/body/lower.rs
@@ -712,7 +712,7 @@ fn collect_block(&mut self, block: ast::BlockExpr) -> ExprId {
         let statements =
             block.statements().filter_map(|s| self.collect_stmt(s)).flatten().collect();
         let tail = block.tail_expr().map(|e| self.collect_expr(e));
-        let syntax_node_ptr = AstPtr::new(&block.clone().into());
+        let syntax_node_ptr = AstPtr::new(&block.into());
         let expr_id = self.alloc_expr(
             Expr::Block { id: block_id, statements, tail, label: None },
             syntax_node_ptr,
diff --git a/crates/hir_def/src/data.rs b/crates/hir_def/src/data.rs
index 42fcca386aa..d3380e0f44d 100644
--- a/crates/hir_def/src/data.rs
+++ b/crates/hir_def/src/data.rs
@@ -43,7 +43,7 @@ pub(crate) fn fn_data_query(db: &dyn DefDatabase, func: FunctionId) -> Arc<Funct
             name: func.name.clone(),
             params: func.params.iter().map(|id| item_tree[*id].clone()).collect(),
             ret_type: item_tree[func.ret_type].clone(),
-            attrs: item_tree.attrs(db, krate, ModItem::from(loc.id.value).into()).clone(),
+            attrs: item_tree.attrs(db, krate, ModItem::from(loc.id.value).into()),
             has_self_param: func.has_self_param,
             has_body: func.has_body,
             is_unsafe: func.is_unsafe,
diff --git a/crates/hir_def/src/test_db.rs b/crates/hir_def/src/test_db.rs
index c4e36eda5e5..6665d902d62 100644
--- a/crates/hir_def/src/test_db.rs
+++ b/crates/hir_def/src/test_db.rs
@@ -161,7 +161,7 @@ pub(crate) fn check_diagnostics(&self) {
             let node = src.map(|ptr| ptr.to_node(&root));
             let frange = node.as_ref().original_file_range(db);
 
-            let message = d.message().to_owned();
+            let message = d.message();
             actual.entry(frange.file_id).or_default().push((frange.range, message));
         });
 
diff --git a/crates/hir_ty/src/diagnostics.rs b/crates/hir_ty/src/diagnostics.rs
index 323c5f96308..1b628d24750 100644
--- a/crates/hir_ty/src/diagnostics.rs
+++ b/crates/hir_ty/src/diagnostics.rs
@@ -480,7 +480,7 @@ pub(crate) fn check_diagnostics(ra_fixture: &str) {
             // FIXME: macros...
             let file_id = src.file_id.original_file(&db);
             let range = src.value.to_node(&root).text_range();
-            let message = d.message().to_owned();
+            let message = d.message();
             actual.entry(file_id).or_default().push((range, message));
         });
 
diff --git a/crates/proc_macro_api/src/rpc.rs b/crates/proc_macro_api/src/rpc.rs
index cf830b59f17..64cfdafc514 100644
--- a/crates/proc_macro_api/src/rpc.rs
+++ b/crates/proc_macro_api/src/rpc.rs
@@ -262,7 +262,7 @@ fn test_proc_macro_rpc_works() {
 
         assert_eq!(task.macro_body, back.macro_body);
 
-        let result = ExpansionResult { expansion: tt.clone() };
+        let result = ExpansionResult { expansion: tt };
         let json = serde_json::to_string(&result).unwrap();
         let back: ExpansionResult = serde_json::from_str(&json).unwrap();
 
diff --git a/crates/test_utils/src/fixture.rs b/crates/test_utils/src/fixture.rs
index e40b61a94a4..e3f57f3b2ac 100644
--- a/crates/test_utils/src/fixture.rs
+++ b/crates/test_utils/src/fixture.rs
@@ -95,16 +95,7 @@ fn parse_meta_line(meta: &str) -> Fixture {
             }
         }
 
-        Fixture {
-            path,
-            text: String::new(),
-            krate: krate,
-            deps,
-            cfg_atoms,
-            cfg_key_values,
-            edition,
-            env,
-        }
+        Fixture { path, text: String::new(), krate, deps, cfg_atoms, cfg_key_values, edition, env }
     }
 }