remove redundant clones

matthiaskrgr · matthiaskrgr · commit 476e10e961e0 · 2024-01-07T00:17:48.000+01:00
diff --git a/crates/hir-def/src/body/lower.rs b/crates/hir-def/src/body/lower.rs
@@ -1610,7 +1610,7 @@ impl ExprCollector<'_> {
                 |name| self.alloc_expr_desugared(Expr::Path(Path::from(name))),
                 |name, span| {
                     if let Some(span) = span {
-                        mappings.push((span, name.clone()))
+                        mappings.push((span, name))
                     }
                 },
             ),
diff --git a/crates/hir-def/src/nameres/collector.rs b/crates/hir-def/src/nameres/collector.rs
@@ -1397,7 +1397,7 @@ impl DefCollector<'_> {
                     always!(krate == loc.def.krate);
                     DefDiagnostic::unresolved_proc_macro(module_id, loc.kind.clone(), loc.def.krate)
                 }
-                _ => DefDiagnostic::macro_error(module_id, loc.kind.clone(), err.to_string()),
+                _ => DefDiagnostic::macro_error(module_id, loc.kind, err.to_string()),
             };
 
             self.def_map.diagnostics.push(diag);
diff --git a/crates/hir-ty/src/display.rs b/crates/hir-ty/src/display.rs
@@ -609,7 +609,7 @@ fn render_const_scalar(
                 }
                 hir_def::AdtId::EnumId(e) => {
                     let Some((var_id, var_layout)) =
-                        detect_variant_from_bytes(&layout, f.db, trait_env.clone(), b, e)
+                        detect_variant_from_bytes(&layout, f.db, trait_env, b, e)
                     else {
                         return f.write_str("<failed-to-detect-variant>");
                     };
diff --git a/crates/hir-ty/src/infer.rs b/crates/hir-ty/src/infer.rs
@@ -738,7 +738,7 @@ impl<'a> InferenceContext<'a> {
         result.tuple_field_access_types = tuple_field_accesses_rev
             .into_iter()
             .enumerate()
-            .map(|(idx, subst)| (TupleId(idx as u32), table.resolve_completely(subst.clone())))
+            .map(|(idx, subst)| (TupleId(idx as u32), table.resolve_completely(subst)))
             .collect();
         result
     }
diff --git a/crates/hir-ty/src/infer/closure.rs b/crates/hir-ty/src/infer/closure.rs
@@ -130,7 +130,7 @@ impl HirPlace {
                 ctx.owner.module(ctx.db.upcast()).krate(),
             );
         }
-        ty.clone()
+        ty
     }
 
     fn capture_kind_of_truncated_place(
@@ -245,7 +245,7 @@ pub(crate) struct CapturedItemWithoutTy {
 
 impl CapturedItemWithoutTy {
     fn with_ty(self, ctx: &mut InferenceContext<'_>) -> CapturedItem {
-        let ty = self.place.ty(ctx).clone();
+        let ty = self.place.ty(ctx);
         let ty = match &self.kind {
             CaptureKind::ByValue => ty,
             CaptureKind::ByRef(bk) => {
@@ -396,7 +396,7 @@ impl InferenceContext<'_> {
 
     fn consume_place(&mut self, place: HirPlace, span: MirSpan) {
         if self.is_upvar(&place) {
-            let ty = place.ty(self).clone();
+            let ty = place.ty(self);
             let kind = if self.is_ty_copy(ty) {
                 CaptureKind::ByRef(BorrowKind::Shared)
             } else {
diff --git a/crates/hir-ty/src/infer/expr.rs b/crates/hir-ty/src/infer/expr.rs
@@ -978,7 +978,7 @@ impl InferenceContext<'_> {
                 .push(callee_ty.clone())
                 .push(TyBuilder::tuple_with(params.iter().cloned()))
                 .build();
-            self.write_method_resolution(tgt_expr, func, subst.clone());
+            self.write_method_resolution(tgt_expr, func, subst);
         }
     }
 
diff --git a/crates/hir-ty/src/infer/pat.rs b/crates/hir-ty/src/infer/pat.rs
@@ -336,7 +336,7 @@ impl InferenceContext<'_> {
             &Pat::Lit(expr) => {
                 // Don't emit type mismatches again, the expression lowering already did that.
                 let ty = self.infer_lit_pat(expr, &expected);
-                self.write_pat_ty(pat, ty.clone());
+                self.write_pat_ty(pat, ty);
                 return self.pat_ty_after_adjustment(pat);
             }
             Pat::Box { inner } => match self.resolve_boxed_box() {
diff --git a/crates/hir-ty/src/layout.rs b/crates/hir-ty/src/layout.rs
@@ -164,7 +164,7 @@ fn layout_of_simd_ty(
     };
 
     // Compute the ABI of the element type:
-    let e_ly = db.layout_of_ty(e_ty, env.clone())?;
+    let e_ly = db.layout_of_ty(e_ty, env)?;
     let Abi::Scalar(e_abi) = e_ly.abi else {
         return Err(LayoutError::Unknown);
     };
@@ -204,17 +204,17 @@ pub fn layout_of_ty_query(
     };
     let cx = LayoutCx { target: &target };
     let dl = &*cx.current_data_layout();
-    let ty = normalize(db, trait_env.clone(), ty.clone());
+    let ty = normalize(db, trait_env.clone(), ty);
     let result = match ty.kind(Interner) {
         TyKind::Adt(AdtId(def), subst) => {
             if let hir_def::AdtId::StructId(s) = def {
                 let data = db.struct_data(*s);
                 let repr = data.repr.unwrap_or_default();
                 if repr.simd() {
-                    return layout_of_simd_ty(db, *s, subst, trait_env.clone(), &target);
+                    return layout_of_simd_ty(db, *s, subst, trait_env, &target);
                 }
             };
-            return db.layout_of_adt(*def, subst.clone(), trait_env.clone());
+            return db.layout_of_adt(*def, subst.clone(), trait_env);
         }
         TyKind::Scalar(s) => match s {
             chalk_ir::Scalar::Bool => Layout::scalar(
@@ -280,7 +280,7 @@ pub fn layout_of_ty_query(
         }
         TyKind::Array(element, count) => {
             let count = try_const_usize(db, &count).ok_or(LayoutError::HasErrorConst)? as u64;
-            let element = db.layout_of_ty(element.clone(), trait_env.clone())?;
+            let element = db.layout_of_ty(element.clone(), trait_env)?;
             let size = element.size.checked_mul(count, dl).ok_or(LayoutError::SizeOverflow)?;
 
             let abi = if count != 0 && matches!(element.abi, Abi::Uninhabited) {
@@ -303,7 +303,7 @@ pub fn layout_of_ty_query(
             }
         }
         TyKind::Slice(element) => {
-            let element = db.layout_of_ty(element.clone(), trait_env.clone())?;
+            let element = db.layout_of_ty(element.clone(), trait_env)?;
             Layout {
                 variants: Variants::Single { index: struct_variant_idx() },
                 fields: FieldsShape::Array { stride: element.size, count: 0 },
@@ -345,7 +345,7 @@ pub fn layout_of_ty_query(
                 }))
                 .intern(Interner);
             }
-            unsized_part = normalize(db, trait_env.clone(), unsized_part);
+            unsized_part = normalize(db, trait_env, unsized_part);
             let metadata = match unsized_part.kind(Interner) {
                 TyKind::Slice(_) | TyKind::Str => {
                     scalar_unit(dl, Primitive::Int(dl.ptr_sized_integer(), false))
@@ -384,7 +384,7 @@ pub fn layout_of_ty_query(
             match impl_trait_id {
                 crate::ImplTraitId::ReturnTypeImplTrait(func, idx) => {
                     let infer = db.infer(func.into());
-                    return db.layout_of_ty(infer.type_of_rpit[idx].clone(), trait_env.clone());
+                    return db.layout_of_ty(infer.type_of_rpit[idx].clone(), trait_env);
                 }
                 crate::ImplTraitId::AsyncBlockTypeImplTrait(_, _) => {
                     return Err(LayoutError::NotImplemented)
diff --git a/crates/hir-ty/src/method_resolution.rs b/crates/hir-ty/src/method_resolution.rs
@@ -1350,7 +1350,7 @@ pub(crate) fn resolve_indexing_op(
     ty: Canonical<Ty>,
     index_trait: TraitId,
 ) -> Option<ReceiverAdjustments> {
-    let mut table = InferenceTable::new(db, env.clone());
+    let mut table = InferenceTable::new(db, env);
     let ty = table.instantiate_canonical(ty);
     let deref_chain = autoderef_method_receiver(&mut table, ty);
     for (ty, adj) in deref_chain {
diff --git a/crates/hir-ty/src/mir/eval.rs b/crates/hir-ty/src/mir/eval.rs
@@ -1533,7 +1533,7 @@ impl Evaluator<'_> {
                 }
             },
             TyKind::Dyn(_) => {
-                let vtable = self.vtable_map.id(current_ty.clone());
+                let vtable = self.vtable_map.id(current_ty);
                 let mut r = Vec::with_capacity(16);
                 let addr = addr.get(self)?;
                 r.extend(addr.iter().copied());
diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs
@@ -1093,7 +1093,7 @@ impl Field {
 
     pub fn layout(&self, db: &dyn HirDatabase) -> Result<Layout, LayoutError> {
         db.layout_of_ty(
-            self.ty(db).ty.clone(),
+            self.ty(db).ty,
             db.trait_environment(match hir_def::VariantId::from(self.parent) {
                 hir_def::VariantId::EnumVariantId(id) => GenericDefId::EnumVariantId(id),
                 hir_def::VariantId::StructId(id) => GenericDefId::AdtId(id.into()),
diff --git a/crates/hir/src/semantics.rs b/crates/hir/src/semantics.rs
@@ -428,7 +428,7 @@ impl<'db> SemanticsImpl<'db> {
         if let Some(original_string) = ast::String::cast(original_token.clone()) {
             if let Some(quote) = original_string.open_quote_text_range() {
                 return self
-                    .descend_into_macros(DescendPreference::SameText, original_token.clone())
+                    .descend_into_macros(DescendPreference::SameText, original_token)
                     .into_iter()
                     .find_map(|token| {
                         self.resolve_offset_in_format_args(
diff --git a/crates/ide-assists/src/handlers/bool_to_enum.rs b/crates/ide-assists/src/handlers/bool_to_enum.rs
@@ -301,7 +301,7 @@ fn replace_usages(
 
                 // add imports across modules where needed
                 if let Some((import_scope, path)) = import_data {
-                    let scope = match import_scope.clone() {
+                    let scope = match import_scope {
                         ImportScope::File(it) => ImportScope::File(edit.make_mut(it)),
                         ImportScope::Module(it) => ImportScope::Module(edit.make_mut(it)),
                         ImportScope::Block(it) => ImportScope::Block(edit.make_mut(it)),
@@ -329,7 +329,7 @@ fn augment_references_with_imports(
     references
         .into_iter()
         .filter_map(|FileReference { range, name, .. }| {
-            let name = name.clone().into_name_like()?;
+            let name = name.into_name_like()?;
             ctx.sema.scope(name.syntax()).map(|scope| (range, name, scope.module()))
         })
         .map(|(range, name, ref_module)| {
diff --git a/crates/ide-assists/src/handlers/convert_tuple_return_type_to_struct.rs b/crates/ide-assists/src/handlers/convert_tuple_return_type_to_struct.rs
@@ -190,7 +190,7 @@ fn augment_references_with_imports(
             ctx.sema.scope(name.syntax()).map(|scope| (name, scope.module()))
         })
         .map(|(name, ref_module)| {
-            let new_name = edit.make_mut(name.clone());
+            let new_name = edit.make_mut(name);
 
             // if the referenced module is not the same as the target one and has not been seen before, add an import
             let import_data = if ref_module.nearest_non_block_module(ctx.db()) != *target_module
diff --git a/crates/ide-assists/src/handlers/generate_delegate_methods.rs b/crates/ide-assists/src/handlers/generate_delegate_methods.rs
@@ -147,7 +147,7 @@ pub(crate) fn generate_delegate_methods(acc: &mut Assists, ctx: &AssistContext<'
                     None => {
                         let name = &strukt_name.to_string();
                         let params = strukt.generic_param_list();
-                        let ty_params = params.clone();
+                        let ty_params = params;
                         let where_clause = strukt.where_clause();
 
                         let impl_def = make::impl_(
diff --git a/crates/ide-assists/src/handlers/generate_function.rs b/crates/ide-assists/src/handlers/generate_function.rs
@@ -432,7 +432,7 @@ fn get_fn_target(
         }
         None => next_space_for_fn_after_call_site(ast::CallableExpr::Call(call))?,
     };
-    Some((target.clone(), file))
+    Some((target, file))
 }
 
 fn get_method_target(
diff --git a/crates/ide-assists/src/handlers/generate_mut_trait_impl.rs b/crates/ide-assists/src/handlers/generate_mut_trait_impl.rs
@@ -47,7 +47,7 @@ pub(crate) fn generate_mut_trait_impl(acc: &mut Assists, ctx: &AssistContext<'_>
     let impl_def = ctx.find_node_at_offset::<ast::Impl>()?.clone_for_update();
 
     let trait_ = impl_def.trait_()?;
-    if let ast::Type::PathType(trait_path) = trait_.clone() {
+    if let ast::Type::PathType(trait_path) = trait_ {
         let trait_type = ctx.sema.resolve_trait(&trait_path.path()?)?;
         let scope = ctx.sema.scope(trait_path.syntax())?;
         if trait_type != FamousDefs(&ctx.sema, scope.krate()).core_convert_Index()? {
diff --git a/crates/ide-db/src/items_locator.rs b/crates/ide-db/src/items_locator.rs
@@ -55,7 +55,7 @@ pub fn items_with_name<'a>(
             local_query.fuzzy();
             local_query.assoc_search_mode(assoc_item_search);
 
-            let mut external_query = import_map::Query::new(fuzzy_search_string.clone())
+            let mut external_query = import_map::Query::new(fuzzy_search_string)
                 .fuzzy()
                 .assoc_search_mode(assoc_item_search);
 
diff --git a/crates/ide-db/src/path_transform.rs b/crates/ide-db/src/path_transform.rs
@@ -159,7 +159,7 @@ impl<'a> PathTransform<'a> {
             .for_each(|(k, v)| match (k.split(db), v) {
                 (Either::Right(k), Some(TypeOrConst::Either(v))) => {
                     if let Some(ty) = v.ty() {
-                        type_substs.insert(k, ty.clone());
+                        type_substs.insert(k, ty);
                     }
                 }
                 (Either::Right(k), None) => {
diff --git a/crates/ide-db/src/search.rs b/crates/ide-db/src/search.rs
@@ -539,7 +539,7 @@ impl<'a> FindUsages<'a> {
                 tree.token_at_offset(offset).into_iter().for_each(|token| {
                     let Some(str_token) = ast::String::cast(token.clone()) else { return };
                     if let Some((range, nameres)) =
-                        sema.check_for_format_args_template(token.clone(), offset)
+                        sema.check_for_format_args_template(token, offset)
                     {
                         if self.found_format_args_ref(file_id, range, str_token, nameres, sink) {
                             return;
diff --git a/crates/ide-db/src/source_change.rs b/crates/ide-db/src/source_change.rs
@@ -341,13 +341,13 @@ impl SourceChangeBuilder {
     /// Adds a tabstop snippet to place the cursor before `token`
     pub fn add_tabstop_before_token(&mut self, _cap: SnippetCap, token: SyntaxToken) {
         assert!(token.parent().is_some());
-        self.add_snippet(PlaceSnippet::Before(token.clone().into()));
+        self.add_snippet(PlaceSnippet::Before(token.into()));
     }
 
     /// Adds a tabstop snippet to place the cursor after `token`
     pub fn add_tabstop_after_token(&mut self, _cap: SnippetCap, token: SyntaxToken) {
         assert!(token.parent().is_some());
-        self.add_snippet(PlaceSnippet::After(token.clone().into()));
+        self.add_snippet(PlaceSnippet::After(token.into()));
     }
 
     /// Adds a snippet to move the cursor selected over `node`
diff --git a/crates/ide-diagnostics/src/handlers/unresolved_method.rs b/crates/ide-diagnostics/src/handlers/unresolved_method.rs
@@ -160,7 +160,7 @@ fn assoc_func_fix(ctx: &DiagnosticsContext<'_>, d: &hir::UnresolvedMethodCall) -
         // if receiver should be pass as first arg in the assoc func,
         // we could omit generic parameters cause compiler can deduce it automatically
         if !need_to_take_receiver_as_first_arg && !generic_parameters.is_empty() {
-            let generic_parameters = generic_parameters.join(", ").to_string();
+            let generic_parameters = generic_parameters.join(", ");
             receiver_type_adt_name =
                 format!("{}::<{}>", receiver_type_adt_name, generic_parameters);
         }
diff --git a/crates/project-model/src/cargo_workspace.rs b/crates/project-model/src/cargo_workspace.rs
@@ -274,7 +274,7 @@ impl CargoWorkspace {
             other_options.append(
                 &mut targets
                     .into_iter()
-                    .flat_map(|target| ["--filter-platform".to_owned().to_string(), target])
+                    .flat_map(|target| ["--filter-platform".to_owned(), target])
                     .collect(),
             );
         }

Original file line number	Diff line number	Diff line change
`@@ -1610,7 +1610,7 @@ impl ExprCollector<'_> {`
`1610`	`1610`	`\|name\| self.alloc_expr_desugared(Expr::Path(Path::from(name))),`
`1611`	`1611`	`\|name, span\| {`
`1612`	`1612`	`if let Some(span) = span {`
`1613`		`- mappings.push((span, name.clone()))`
	`1613`	`+ mappings.push((span, name))`
`1614`	`1614`	`}`
`1615`	`1615`	`},`
`1616`	`1616`	`),`
Original file line number	Diff line number	Diff line change
`@@ -1397,7 +1397,7 @@ impl DefCollector<'_> {`
`1397`	`1397`	`always!(krate == loc.def.krate);`
`1398`	`1398`	`DefDiagnostic::unresolved_proc_macro(module_id, loc.kind.clone(), loc.def.krate)`
`1399`	`1399`	`}`
`1400`		`- _ => DefDiagnostic::macro_error(module_id, loc.kind.clone(), err.to_string()),`
	`1400`	`+ _ => DefDiagnostic::macro_error(module_id, loc.kind, err.to_string()),`
`1401`	`1401`	`};`
`1402`	`1402`
`1403`	`1403`	`self.def_map.diagnostics.push(diag);`
Original file line number	Diff line number	Diff line change
`@@ -609,7 +609,7 @@ fn render_const_scalar(`
`609`	`609`	`}`
`610`	`610`	`hir_def::AdtId::EnumId(e) => {`
`611`	`611`	`let Some((var_id, var_layout)) =`
`612`		`- detect_variant_from_bytes(&layout, f.db, trait_env.clone(), b, e)`
	`612`	`+ detect_variant_from_bytes(&layout, f.db, trait_env, b, e)`
`613`	`613`	`else {`
`614`	`614`	`return f.write_str("<failed-to-detect-variant>");`
`615`	`615`	`};`
Original file line number	Diff line number	Diff line change
`@@ -738,7 +738,7 @@ impl<'a> InferenceContext<'a> {`
`738`	`738`	`result.tuple_field_access_types = tuple_field_accesses_rev`
`739`	`739`	`.into_iter()`
`740`	`740`	`.enumerate()`
`741`		`- .map(\|(idx, subst)\| (TupleId(idx as u32), table.resolve_completely(subst.clone())))`
	`741`	`+ .map(\|(idx, subst)\| (TupleId(idx as u32), table.resolve_completely(subst)))`
`742`	`742`	`.collect();`
`743`	`743`	`result`
`744`	`744`	`}`
Original file line number	Diff line number	Diff line change
`@@ -978,7 +978,7 @@ impl InferenceContext<'_> {`
`978`	`978`	`.push(callee_ty.clone())`
`979`	`979`	`.push(TyBuilder::tuple_with(params.iter().cloned()))`
`980`	`980`	`.build();`
`981`		`- self.write_method_resolution(tgt_expr, func, subst.clone());`
	`981`	`+ self.write_method_resolution(tgt_expr, func, subst);`
`982`	`982`	`}`
`983`	`983`	`}`
`984`	`984`
Original file line number	Diff line number	Diff line change
`@@ -336,7 +336,7 @@ impl InferenceContext<'_> {`
`336`	`336`	`&Pat::Lit(expr) => {`
`337`	`337`	`// Don't emit type mismatches again, the expression lowering already did that.`
`338`	`338`	`let ty = self.infer_lit_pat(expr, &expected);`
`339`		`- self.write_pat_ty(pat, ty.clone());`
	`339`	`+ self.write_pat_ty(pat, ty);`
`340`	`340`	`return self.pat_ty_after_adjustment(pat);`
`341`	`341`	`}`
`342`	`342`	`Pat::Box { inner } => match self.resolve_boxed_box() {`
Original file line number	Diff line number	Diff line change
`@@ -1533,7 +1533,7 @@ impl Evaluator<'_> {`
`1533`	`1533`	`}`
`1534`	`1534`	`},`
`1535`	`1535`	`TyKind::Dyn(_) => {`
`1536`		`- let vtable = self.vtable_map.id(current_ty.clone());`
	`1536`	`+ let vtable = self.vtable_map.id(current_ty);`
`1537`	`1537`	`let mut r = Vec::with_capacity(16);`
`1538`	`1538`	`let addr = addr.get(self)?;`
`1539`	`1539`	`r.extend(addr.iter().copied());`
Original file line number	Diff line number	Diff line change
`@@ -432,7 +432,7 @@ fn get_fn_target(`
`432`	`432`	`}`
`433`	`433`	`None => next_space_for_fn_after_call_site(ast::CallableExpr::Call(call))?,`
`434`	`434`	`};`
`435`		`- Some((target.clone(), file))`
	`435`	`+ Some((target, file))`
`436`	`436`	`}`
`437`	`437`
`438`	`438`	`fn get_method_target(`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ impl<'a> PathTransform<'a> {`
`159`	`159`	`.for_each(\|(k, v)\| match (k.split(db), v) {`
`160`	`160`	`(Either::Right(k), Some(TypeOrConst::Either(v))) => {`
`161`	`161`	`if let Some(ty) = v.ty() {`
`162`		`- type_substs.insert(k, ty.clone());`
	`162`	`+ type_substs.insert(k, ty);`
`163`	`163`	`}`
`164`	`164`	`}`
`165`	`165`	`(Either::Right(k), None) => {`
Original file line number	Diff line number	Diff line change
`@@ -539,7 +539,7 @@ impl<'a> FindUsages<'a> {`
`539`	`539`	`tree.token_at_offset(offset).into_iter().for_each(\|token\| {`
`540`	`540`	`let Some(str_token) = ast::String::cast(token.clone()) else { return };`
`541`	`541`	`if let Some((range, nameres)) =`
`542`		`- sema.check_for_format_args_template(token.clone(), offset)`
	`542`	`+ sema.check_for_format_args_template(token, offset)`
`543`	`543`	`{`
`544`	`544`	`if self.found_format_args_ref(file_id, range, str_token, nameres, sink) {`
`545`	`545`	`return;`