]> git.lizzy.rs Git - rust.git/commitdiff
don't clone types that are copy (clippy::clone_on_copy)
authorMatthias Krüger <matthias.krueger@famsik.de>
Wed, 17 Mar 2021 00:56:31 +0000 (01:56 +0100)
committerMatthias Krüger <matthias.krueger@famsik.de>
Wed, 17 Mar 2021 00:56:31 +0000 (01:56 +0100)
12 files changed:
crates/hir_expand/src/hygiene.rs
crates/ide/src/doc_links.rs
crates/ide/src/goto_definition.rs
crates/ide/src/syntax_highlighting/inject.rs
crates/ide_assists/src/handlers/extract_struct_from_enum_variant.rs
crates/ide_completion/src/completions/pattern.rs
crates/ide_completion/src/render.rs
crates/ide_ssr/src/lib.rs
crates/ide_ssr/src/matching.rs
crates/mbe/src/benchmark.rs
crates/mbe/src/parser.rs
crates/rust-analyzer/src/diagnostics/to_proto.rs

index c8ea8121051913fb02a5f0b6b1c63c6e868d8e74..87cad326d1cbed20373c2fc30b12ae85ef797a45 100644 (file)
@@ -23,7 +23,7 @@ pub struct Hygiene {
 
 impl Hygiene {
     pub fn new(db: &dyn AstDatabase, file_id: HirFileId) -> Hygiene {
-        Hygiene { frames: Some(HygieneFrames::new(db, file_id.clone())) }
+        Hygiene { frames: Some(HygieneFrames::new(db, file_id)) }
     }
 
     pub fn new_unhygienic() -> Hygiene {
@@ -129,10 +129,7 @@ fn map_ident_up(&self, token: TextRange) -> Option<(InFile<TextRange>, Origin)>
             mbe::Origin::Call => (&self.macro_arg.1, self.arg_start),
             mbe::Origin::Def => (
                 &self.macro_def.1,
-                self.def_start
-                    .as_ref()
-                    .expect("`Origin::Def` used with non-`macro_rules!` macro")
-                    .clone(),
+                *self.def_start.as_ref().expect("`Origin::Def` used with non-`macro_rules!` macro"),
             ),
         };
 
index 461e110605df1a47119fb308f6cd145609f3d1d3..5ea9fc4fb3741d9268b9bfe1c17788a5166ea306 100644 (file)
@@ -93,7 +93,7 @@ pub(crate) fn remove_links(markdown: &str) -> String {
 
     let mut cb = |_: BrokenLink| {
         let empty = InlineStr::try_from("").unwrap();
-        Some((CowStr::Inlined(empty.clone()), CowStr::Inlined(empty)))
+        Some((CowStr::Inlined(empty), CowStr::Inlined(empty)))
     };
     let doc = Parser::new_with_broken_link_callback(markdown, opts, Some(&mut cb));
     let doc = doc.filter_map(move |evt| match evt {
@@ -147,7 +147,7 @@ fn get_doc_link(db: &RootDatabase, definition: Definition) -> Option<String> {
         _ => return None,
     };
 
-    let ns = ItemInNs::from(target_def.clone());
+    let ns = ItemInNs::from(target_def);
 
     let module = definition.module(db)?;
     let krate = module.krate();
index 6986477a586f6435987cc3c2ef7e90858f790d30..b71f4917c0c5978f75c02c01be1f0abc41a3611b 100644 (file)
@@ -102,7 +102,7 @@ fn extract_positioned_link_from_comment(
             None => comment_range.end(),
         }
     })?;
-    Some((def_link.to_string(), ns.clone()))
+    Some((def_link.to_string(), *ns))
 }
 
 fn pick_best(tokens: TokenAtOffset<SyntaxToken>) -> Option<SyntaxToken> {
index 8cdc3688f4efacbe927af5a5faf29025bdc20d7f..4f825523c429adb26aa0cc071c4c4784714d98ea 100644 (file)
@@ -56,7 +56,7 @@ pub(super) fn ra_fixture(
         for range in inj.map_range_up(hl_range.range) {
             if let Some(range) = literal.map_range_up(range) {
                 hl_range.range = range;
-                hl.add(hl_range.clone());
+                hl.add(hl_range);
             }
         }
     }
index 335e0ed954ad1d82fd725615dff5bc6ddf09b9b5..596c536a763f21bfba77b475060e5c677675f397 100644 (file)
@@ -145,11 +145,8 @@ fn insert_import(
     variant_hir_name: &Name,
 ) -> Option<()> {
     let db = ctx.db();
-    let mod_path = module.find_use_path_prefixed(
-        db,
-        enum_module_def.clone(),
-        ctx.config.insert_use.prefix_kind,
-    );
+    let mod_path =
+        module.find_use_path_prefixed(db, *enum_module_def, ctx.config.insert_use.prefix_kind);
     if let Some(mut mod_path) = mod_path {
         mod_path.pop_segment();
         mod_path.push_segment(variant_hir_name.clone());
index 46cef58f011a01688c16425298c765aefcc66e86..476eecff0e18edc3bed5c37d240a86f0356cfafe 100644 (file)
@@ -26,11 +26,11 @@ pub(crate) fn complete_pattern(acc: &mut Completions, ctx: &CompletionContext) {
         let add_resolution = match &res {
             hir::ScopeDef::ModuleDef(def) => match def {
                 hir::ModuleDef::Adt(hir::Adt::Struct(strukt)) => {
-                    acc.add_struct_pat(ctx, strukt.clone(), Some(name.clone()));
+                    acc.add_struct_pat(ctx, *strukt, Some(name.clone()));
                     true
                 }
                 hir::ModuleDef::Variant(variant) if !ctx.is_irrefutable_pat_binding => {
-                    acc.add_variant_pat(ctx, variant.clone(), Some(name.clone()));
+                    acc.add_variant_pat(ctx, *variant, Some(name.clone()));
                     true
                 }
                 hir::ModuleDef::Adt(hir::Adt::Enum(..))
index 4e4923e0d8b2ec115ec46e7c5a7faf1f6ccb8d0b..12921e12b794c719620cdbbd1ac562195d7805c4 100644 (file)
@@ -81,7 +81,7 @@ pub(crate) fn new(completion: &'a CompletionContext<'a>) -> RenderContext<'a> {
     }
 
     fn snippet_cap(&self) -> Option<SnippetCap> {
-        self.completion.config.snippet_cap.clone()
+        self.completion.config.snippet_cap
     }
 
     fn db(&self) -> &'a RootDatabase {
index 00585f448c8211b5d89d71d1101af07167e87e35..47434f4af84b6e7ee8f62d8e0a726f0b677bb32c 100644 (file)
@@ -139,11 +139,8 @@ pub fn in_context(
     pub fn at_first_file(db: &'db ide_db::RootDatabase) -> Result<MatchFinder<'db>, SsrError> {
         use ide_db::base_db::SourceDatabaseExt;
         use ide_db::symbol_index::SymbolsDatabase;
-        if let Some(first_file_id) = db
-            .local_roots()
-            .iter()
-            .next()
-            .and_then(|root| db.source_root(root.clone()).iter().next())
+        if let Some(first_file_id) =
+            db.local_roots().iter().next().and_then(|root| db.source_root(*root).iter().next())
         {
             Ok(MatchFinder::in_context(
                 db,
index e1adb381efbd88e667fab5ae62c47a6387a92b69..b3072fb9f43ecfecaee45fd7d5fecd30c134d403 100644 (file)
@@ -127,7 +127,7 @@ fn try_match(
         restrict_range: &Option<FileRange>,
         sema: &'sema Semantics<'db, ide_db::RootDatabase>,
     ) -> Result<Match, MatchFailed> {
-        let match_state = Matcher { sema, restrict_range: restrict_range.clone(), rule };
+        let match_state = Matcher { sema, restrict_range: *restrict_range, rule };
         // First pass at matching, where we check that node types and idents match.
         match_state.attempt_match_node(&mut Phase::First, &rule.pattern.node, code)?;
         match_state.validate_range(&sema.original_range(code))?;
index bd8ea6452c19a978bca43b21d8ec89b528f1cb71..ba814a2e1adac951447307e4b3b7a693c8ebe81c 100644 (file)
@@ -165,7 +165,7 @@ fn collect_from_op(op: &Op, parent: &mut tt::Subtree, seed: &mut usize) {
                                 }
                                 Separator::Puncts(puncts) => {
                                     for it in puncts {
-                                        parent.token_trees.push(tt::Leaf::Punct(it.clone()).into())
+                                        parent.token_trees.push(tt::Leaf::Punct(*it).into())
                                     }
                                 }
                             };
@@ -174,8 +174,7 @@ fn collect_from_op(op: &Op, parent: &mut tt::Subtree, seed: &mut usize) {
                 }
             }
             Op::Subtree { tokens, delimiter } => {
-                let mut subtree =
-                    tt::Subtree { delimiter: delimiter.clone(), token_trees: Vec::new() };
+                let mut subtree = tt::Subtree { delimiter: *delimiter, token_trees: Vec::new() };
                 tokens.iter().for_each(|it| {
                     collect_from_op(it, &mut subtree, seed);
                 });
index 8671322e1fb3190b51f0c46bdebf29e1e63f8f2e..7b5b8ec16495f77aaa7d8905ef882a8b46160b99 100644 (file)
@@ -262,7 +262,7 @@ fn parse_repeat(src: &mut TtIter) -> Result<(Option<Separator>, RepeatKind), Par
                                 if puncts.len() == 3 {
                                     return Err(ParseError::InvalidRepeat);
                                 }
-                                puncts.push(punct.clone())
+                                puncts.push(*punct)
                             }
                             _ => return Err(ParseError::InvalidRepeat),
                         }
index 0ad832c0ee20186922348ff6e29837edf6336531..76994de71d1a314c70b23737909b43292fa4ed99 100644 (file)
@@ -161,7 +161,7 @@ pub(crate) fn map_rust_diagnostic_to_lsp(
         return Vec::new();
     }
 
-    let severity = diagnostic_severity(config, rd.level.clone(), rd.code.clone());
+    let severity = diagnostic_severity(config, rd.level, rd.code.clone());
 
     let mut source = String::from("rustc");
     let mut code = rd.code.as_ref().map(|c| c.code.clone());