From c9b4ac5be4daaabc062ab1ee663eba8594750003 Mon Sep 17 00:00:00 2001 From: Maan2003 Date: Sun, 13 Jun 2021 09:24:16 +0530 Subject: clippy::redudant_borrow --- crates/ide/src/diagnostics.rs | 6 +++--- crates/ide/src/diagnostics/fixes/create_field.rs | 2 +- .../ide/src/diagnostics/fixes/fill_missing_fields.rs | 4 ++-- crates/ide/src/doc_links.rs | 20 ++++++++++---------- crates/ide/src/extend_selection.rs | 2 +- crates/ide/src/goto_definition.rs | 2 +- crates/ide/src/hover.rs | 8 ++++---- crates/ide/src/inlay_hints.rs | 6 +++--- crates/ide/src/join_lines.rs | 2 +- crates/ide/src/lib.rs | 12 ++++++------ crates/ide/src/references.rs | 2 +- crates/ide/src/references/rename.rs | 8 ++++---- crates/ide/src/runnables.rs | 8 ++++---- crates/ide/src/syntax_highlighting.rs | 4 ++-- crates/ide/src/syntax_highlighting/highlight.rs | 4 ++-- crates/ide/src/syntax_highlighting/html.rs | 2 +- crates/ide/src/syntax_highlighting/inject.rs | 4 ++-- crates/ide/src/typing/on_enter.rs | 6 +++--- 18 files changed, 51 insertions(+), 51 deletions(-) (limited to 'crates/ide') diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs index 4193aabf5..31d5cfedc 100644 --- a/crates/ide/src/diagnostics.rs +++ b/crates/ide/src/diagnostics.rs @@ -208,7 +208,7 @@ pub(crate) fn diagnostics( match sema.to_module_def(file_id) { Some(m) => m.diagnostics(db, &mut sink, internal_diagnostics), None => { - sink.push(UnlinkedFile { file_id, node: SyntaxNodePtr::new(&parse.tree().syntax()) }); + sink.push(UnlinkedFile { file_id, node: SyntaxNodePtr::new(parse.tree().syntax()) }); } } @@ -222,7 +222,7 @@ fn diagnostic_with_fix( resolve: &AssistResolveStrategy, ) -> Diagnostic { Diagnostic::error(sema.diagnostics_display_range(d.display_source()).range, d.message()) - .with_fixes(d.fixes(&sema, resolve)) + .with_fixes(d.fixes(sema, resolve)) .with_code(Some(d.code())) } @@ -232,7 +232,7 @@ fn warning_with_fix( resolve: &AssistResolveStrategy, ) -> Diagnostic { Diagnostic::hint(sema.diagnostics_display_range(d.display_source()).range, d.message()) - .with_fixes(d.fixes(&sema, resolve)) + .with_fixes(d.fixes(sema, resolve)) .with_code(Some(d.code())) } diff --git a/crates/ide/src/diagnostics/fixes/create_field.rs b/crates/ide/src/diagnostics/fixes/create_field.rs index a5f457dce..f6e45967a 100644 --- a/crates/ide/src/diagnostics/fixes/create_field.rs +++ b/crates/ide/src/diagnostics/fixes/create_field.rs @@ -18,7 +18,7 @@ impl DiagnosticWithFixes for NoSuchField { ) -> Option> { let root = sema.db.parse_or_expand(self.file)?; missing_record_expr_field_fixes( - &sema, + sema, self.file.original_file(sema.db), &self.field.to_node(&root), ) diff --git a/crates/ide/src/diagnostics/fixes/fill_missing_fields.rs b/crates/ide/src/diagnostics/fixes/fill_missing_fields.rs index b5dd64c08..c76f6008a 100644 --- a/crates/ide/src/diagnostics/fixes/fill_missing_fields.rs +++ b/crates/ide/src/diagnostics/fixes/fill_missing_fields.rs @@ -37,7 +37,7 @@ impl DiagnosticWithFixes for MissingFields { let edit = { let mut builder = TextEdit::builder(); - algo::diff(&old_field_list.syntax(), &new_field_list.syntax()) + algo::diff(old_field_list.syntax(), new_field_list.syntax()) .into_text_edit(&mut builder); builder.finish() }; @@ -45,7 +45,7 @@ impl DiagnosticWithFixes for MissingFields { "fill_missing_fields", "Fill struct fields", SourceChange::from_text_edit(self.file.original_file(sema.db), edit), - sema.original_range(&field_list_parent.syntax()).range, + sema.original_range(field_list_parent.syntax()).range, )]) } } diff --git a/crates/ide/src/doc_links.rs b/crates/ide/src/doc_links.rs index ec3828ab2..774952d96 100644 --- a/crates/ide/src/doc_links.rs +++ b/crates/ide/src/doc_links.rs @@ -151,18 +151,18 @@ pub(crate) fn resolve_doc_path_for_def( ) -> Option { match def { Definition::ModuleDef(def) => match def { - hir::ModuleDef::Module(it) => it.resolve_doc_path(db, &link, ns), - hir::ModuleDef::Function(it) => it.resolve_doc_path(db, &link, ns), - hir::ModuleDef::Adt(it) => it.resolve_doc_path(db, &link, ns), - hir::ModuleDef::Variant(it) => it.resolve_doc_path(db, &link, ns), - hir::ModuleDef::Const(it) => it.resolve_doc_path(db, &link, ns), - hir::ModuleDef::Static(it) => it.resolve_doc_path(db, &link, ns), - hir::ModuleDef::Trait(it) => it.resolve_doc_path(db, &link, ns), - hir::ModuleDef::TypeAlias(it) => it.resolve_doc_path(db, &link, ns), + hir::ModuleDef::Module(it) => it.resolve_doc_path(db, link, ns), + hir::ModuleDef::Function(it) => it.resolve_doc_path(db, link, ns), + hir::ModuleDef::Adt(it) => it.resolve_doc_path(db, link, ns), + hir::ModuleDef::Variant(it) => it.resolve_doc_path(db, link, ns), + hir::ModuleDef::Const(it) => it.resolve_doc_path(db, link, ns), + hir::ModuleDef::Static(it) => it.resolve_doc_path(db, link, ns), + hir::ModuleDef::Trait(it) => it.resolve_doc_path(db, link, ns), + hir::ModuleDef::TypeAlias(it) => it.resolve_doc_path(db, link, ns), hir::ModuleDef::BuiltinType(_) => None, }, - Definition::Macro(it) => it.resolve_doc_path(db, &link, ns), - Definition::Field(it) => it.resolve_doc_path(db, &link, ns), + Definition::Macro(it) => it.resolve_doc_path(db, link, ns), + Definition::Field(it) => it.resolve_doc_path(db, link, ns), Definition::SelfType(_) | Definition::Local(_) | Definition::GenericParam(_) diff --git a/crates/ide/src/extend_selection.rs b/crates/ide/src/extend_selection.rs index 7032889ac..c7ec87edf 100644 --- a/crates/ide/src/extend_selection.rs +++ b/crates/ide/src/extend_selection.rs @@ -328,7 +328,7 @@ mod tests { use super::*; fn do_check(before: &str, afters: &[&str]) { - let (analysis, position) = fixture::position(&before); + let (analysis, position) = fixture::position(before); let before = analysis.file_text(position.file_id).unwrap(); let range = TextRange::empty(position.offset); let mut frange = FileRange { file_id: position.file_id, range }; diff --git a/crates/ide/src/goto_definition.rs b/crates/ide/src/goto_definition.rs index 2d36c34e9..27a292d83 100644 --- a/crates/ide/src/goto_definition.rs +++ b/crates/ide/src/goto_definition.rs @@ -57,7 +57,7 @@ pub(crate) fn goto_definition( }, ast::Name(name) => { let def = NameClass::classify(&sema, &name)?.referenced_or_defined(sema.db); - try_find_trait_item_definition(&sema.db, &def) + try_find_trait_item_definition(sema.db, &def) .or_else(|| def.try_to_nav(sema.db)) }, ast::Lifetime(lt) => if let Some(name_class) = NameClass::classify_lifetime(&sema, <) { diff --git a/crates/ide/src/hover.rs b/crates/ide/src/hover.rs index 1c6d36939..b4b3b45b5 100644 --- a/crates/ide/src/hover.rs +++ b/crates/ide/src/hover.rs @@ -288,7 +288,7 @@ fn runnable_action( ) -> Option { match def { Definition::ModuleDef(it) => match it { - ModuleDef::Module(it) => runnable_mod(&sema, it).map(|it| HoverAction::Runnable(it)), + ModuleDef::Module(it) => runnable_mod(sema, it).map(|it| HoverAction::Runnable(it)), ModuleDef::Function(func) => { let src = func.source(sema.db)?; if src.file_id != file_id.into() { @@ -297,7 +297,7 @@ fn runnable_action( return None; } - runnable_fn(&sema, func).map(HoverAction::Runnable) + runnable_fn(sema, func).map(HoverAction::Runnable) } _ => None, }, @@ -432,7 +432,7 @@ fn hover_for_definition( return match def { Definition::Macro(it) => match &it.source(db)?.value { Either::Left(mac) => { - let label = macro_label(&mac); + let label = macro_label(mac); from_def_source_labeled(db, it, Some(label), mod_path) } Either::Right(_) => { @@ -516,7 +516,7 @@ fn hover_for_keyword( if !token.kind().is_keyword() { return None; } - let famous_defs = FamousDefs(&sema, sema.scope(&token.parent()?).krate()); + let famous_defs = FamousDefs(sema, sema.scope(&token.parent()?).krate()); // std exposes {}_keyword modules with docstrings on the root to document keywords let keyword_mod = format!("{}_keyword", token.text()); let doc_owner = find_std_module(&famous_defs, &keyword_mod)?; diff --git a/crates/ide/src/inlay_hints.rs b/crates/ide/src/inlay_hints.rs index 821c61403..9cd33d0e4 100644 --- a/crates/ide/src/inlay_hints.rs +++ b/crates/ide/src/inlay_hints.rs @@ -96,7 +96,7 @@ fn get_chaining_hints( } let krate = sema.scope(expr.syntax()).module().map(|it| it.krate()); - let famous_defs = FamousDefs(&sema, krate); + let famous_defs = FamousDefs(sema, krate); let mut tokens = expr .syntax() @@ -165,7 +165,7 @@ fn get_param_name_hints( }; Some((param_name, arg)) }) - .filter(|(param_name, arg)| !should_hide_param_name_hint(sema, &callable, param_name, &arg)) + .filter(|(param_name, arg)| !should_hide_param_name_hint(sema, &callable, param_name, arg)) .map(|(param_name, arg)| InlayHint { range: arg.syntax().text_range(), kind: InlayKind::ParameterHint, @@ -187,7 +187,7 @@ fn get_bind_pat_hints( } let krate = sema.scope(pat.syntax()).module().map(|it| it.krate()); - let famous_defs = FamousDefs(&sema, krate); + let famous_defs = FamousDefs(sema, krate); let ty = sema.type_of_pat(&pat.clone().into())?; diff --git a/crates/ide/src/join_lines.rs b/crates/ide/src/join_lines.rs index c67ccd1a9..93d3760bf 100644 --- a/crates/ide/src/join_lines.rs +++ b/crates/ide/src/join_lines.rs @@ -60,7 +60,7 @@ fn remove_newlines(edit: &mut TextEditBuilder, token: &SyntaxToken, range: TextR let pos: TextSize = (pos as u32).into(); let offset = token.text_range().start() + range.start() + pos; if !edit.invalidates_offset(offset) { - remove_newline(edit, &token, offset); + remove_newline(edit, token, offset); } } } diff --git a/crates/ide/src/lib.rs b/crates/ide/src/lib.rs index 97c9e5d2b..0511efae3 100644 --- a/crates/ide/src/lib.rs +++ b/crates/ide/src/lib.rs @@ -282,20 +282,20 @@ impl Analysis { file_id: FileId, text_range: Option, ) -> Cancellable { - self.with_db(|db| syntax_tree::syntax_tree(&db, file_id, text_range)) + self.with_db(|db| syntax_tree::syntax_tree(db, file_id, text_range)) } pub fn view_hir(&self, position: FilePosition) -> Cancellable { - self.with_db(|db| view_hir::view_hir(&db, position)) + self.with_db(|db| view_hir::view_hir(db, position)) } pub fn view_item_tree(&self, file_id: FileId) -> Cancellable { - self.with_db(|db| view_item_tree::view_item_tree(&db, file_id)) + self.with_db(|db| view_item_tree::view_item_tree(db, file_id)) } /// Renders the crate graph to GraphViz "dot" syntax. pub fn view_crate_graph(&self) -> Cancellable> { - self.with_db(|db| view_crate_graph::view_crate_graph(&db)) + self.with_db(|db| view_crate_graph::view_crate_graph(db)) } pub fn expand_macro(&self, position: FilePosition) -> Cancellable> { @@ -315,7 +315,7 @@ impl Analysis { /// up minor stuff like continuing the comment. /// The edit will be a snippet (with `$0`). pub fn on_enter(&self, position: FilePosition) -> Cancellable> { - self.with_db(|db| typing::on_enter(&db, position)) + self.with_db(|db| typing::on_enter(db, position)) } /// Returns an edit which should be applied after a character was typed. @@ -331,7 +331,7 @@ impl Analysis { if !typing::TRIGGER_CHARS.contains(char_typed) { return Ok(None); } - self.with_db(|db| typing::on_char_typed(&db, position, char_typed)) + self.with_db(|db| typing::on_char_typed(db, position, char_typed)) } /// Returns a tree representation of symbols in the file. Useful to draw a diff --git a/crates/ide/src/references.rs b/crates/ide/src/references.rs index f8b64a669..a0fdead2c 100644 --- a/crates/ide/src/references.rs +++ b/crates/ide/src/references.rs @@ -62,7 +62,7 @@ pub(crate) fn find_all_refs( if let Some(name) = get_name_of_item_declaration(&syntax, position) { (NameClass::classify(sema, &name)?.referenced_or_defined(sema.db), true) } else { - (find_def(&sema, &syntax, position)?, false) + (find_def(sema, &syntax, position)?, false) }; let mut usages = def.usages(sema).set_scope(search_scope).include_self_refs().all(); diff --git a/crates/ide/src/references/rename.rs b/crates/ide/src/references/rename.rs index 7dfc5043e..02b171bda 100644 --- a/crates/ide/src/references/rename.rs +++ b/crates/ide/src/references/rename.rs @@ -64,7 +64,7 @@ pub(crate) fn prepare_rename( } }; let name_like = sema - .find_node_at_offset_with_descend(&syntax, position.offset) + .find_node_at_offset_with_descend(syntax, position.offset) .ok_or_else(|| format_err!("No references found at position"))?; let node = match &name_like { ast::NameLike::Name(it) => it.syntax(), @@ -104,7 +104,7 @@ pub(crate) fn rename_with_semantics( let def = find_definition(sema, syntax, position)?; match def { - Definition::ModuleDef(ModuleDef::Module(module)) => rename_mod(&sema, module, new_name), + Definition::ModuleDef(ModuleDef::Module(module)) => rename_mod(sema, module, new_name), Definition::SelfType(_) => bail!("Cannot rename `Self`"), Definition::ModuleDef(ModuleDef::BuiltinType(_)) => bail!("Cannot rename builtin type"), def => rename_reference(sema, def, new_name), @@ -323,7 +323,7 @@ fn rename_reference( } let mut source_change = SourceChange::default(); source_change.extend(usages.iter().map(|(&file_id, references)| { - (file_id, source_edit_from_references(&references, def, new_name)) + (file_id, source_edit_from_references(references, def, new_name)) })); let (file_id, edit) = source_edit_from_def(sema, def, new_name)?; @@ -413,7 +413,7 @@ fn rename_self_to_param( let mut source_change = SourceChange::default(); source_change.insert_source_edit(file_id.original_file(sema.db), edit); source_change.extend(usages.iter().map(|(&file_id, references)| { - (file_id, source_edit_from_references(&references, def, new_name)) + (file_id, source_edit_from_references(references, def, new_name)) })); Ok(source_change) } diff --git a/crates/ide/src/runnables.rs b/crates/ide/src/runnables.rs index 552054951..03faabadc 100644 --- a/crates/ide/src/runnables.rs +++ b/crates/ide/src/runnables.rs @@ -158,7 +158,7 @@ fn find_related_tests( search_scope: Option, tests: &mut FxHashSet, ) { - if let Some(refs) = references::find_all_refs(&sema, position, search_scope) { + if let Some(refs) = references::find_all_refs(sema, position, search_scope) { for (file_id, refs) in refs.references { let file = sema.parse(file_id); let file = file.syntax(); @@ -169,10 +169,10 @@ fn find_related_tests( }); for fn_def in functions { - if let Some(runnable) = as_test_runnable(&sema, &fn_def) { + if let Some(runnable) = as_test_runnable(sema, &fn_def) { // direct test tests.insert(runnable); - } else if let Some(module) = parent_test_module(&sema, &fn_def) { + } else if let Some(module) = parent_test_module(sema, &fn_def) { // indirect test find_related_tests_in_module(sema, &fn_def, &module, tests); } @@ -203,7 +203,7 @@ fn find_related_tests_in_module( } fn as_test_runnable(sema: &Semantics, fn_def: &ast::Fn) -> Option { - if test_related_attribute(&fn_def).is_some() { + if test_related_attribute(fn_def).is_some() { let function = sema.to_def(fn_def)?; runnable_fn(sema, function) } else { diff --git a/crates/ide/src/syntax_highlighting.rs b/crates/ide/src/syntax_highlighting.rs index b03f1c71f..e186b82b7 100644 --- a/crates/ide/src/syntax_highlighting.rs +++ b/crates/ide/src/syntax_highlighting.rs @@ -323,7 +323,7 @@ fn traverse( if let Some(token) = element.as_token().cloned().and_then(ast::String::cast) { if token.is_raw() { let expanded = element_to_highlight.as_token().unwrap().clone(); - if inject::ra_fixture(hl, &sema, token, expanded).is_some() { + if inject::ra_fixture(hl, sema, token, expanded).is_some() { continue; } } @@ -334,7 +334,7 @@ fn traverse( } if let Some((mut highlight, binding_hash)) = highlight::element( - &sema, + sema, krate, &mut bindings_shadow_count, syntactic_name_ref_highlighting, diff --git a/crates/ide/src/syntax_highlighting/highlight.rs b/crates/ide/src/syntax_highlighting/highlight.rs index 84012227d..8c0e553c0 100644 --- a/crates/ide/src/syntax_highlighting/highlight.rs +++ b/crates/ide/src/syntax_highlighting/highlight.rs @@ -449,12 +449,12 @@ fn highlight_method_call( krate: Option, method_call: &ast::MethodCallExpr, ) -> Option { - let func = sema.resolve_method_call(&method_call)?; + let func = sema.resolve_method_call(method_call)?; let mut h = SymbolKind::Function.into(); h |= HlMod::Associated; - if func.is_unsafe(sema.db) || sema.is_unsafe_method_call(&method_call) { + if func.is_unsafe(sema.db) || sema.is_unsafe_method_call(method_call) { h |= HlMod::Unsafe; } if func.is_async(sema.db) { diff --git a/crates/ide/src/syntax_highlighting/html.rs b/crates/ide/src/syntax_highlighting/html.rs index 5327af845..478facfee 100644 --- a/crates/ide/src/syntax_highlighting/html.rs +++ b/crates/ide/src/syntax_highlighting/html.rs @@ -23,7 +23,7 @@ pub(crate) fn highlight_as_html(db: &RootDatabase, file_id: FileId, rainbow: boo let hl_ranges = highlight(db, file_id, None, false); let text = parse.tree().syntax().to_string(); let mut buf = String::new(); - buf.push_str(&STYLE); + buf.push_str(STYLE); buf.push_str("
");
     for r in &hl_ranges {
         let chunk = html_escape(&text[r.range]);
diff --git a/crates/ide/src/syntax_highlighting/inject.rs b/crates/ide/src/syntax_highlighting/inject.rs
index 4269d339e..883252c0e 100644
--- a/crates/ide/src/syntax_highlighting/inject.rs
+++ b/crates/ide/src/syntax_highlighting/inject.rs
@@ -23,7 +23,7 @@ pub(super) fn ra_fixture(
     literal: ast::String,
     expanded: SyntaxToken,
 ) -> Option<()> {
-    let active_parameter = ActiveParameter::at_token(&sema, expanded)?;
+    let active_parameter = ActiveParameter::at_token(sema, expanded)?;
     if !active_parameter.ident().map_or(false, |name| name.text().starts_with("ra_fixture")) {
         return None;
     }
@@ -124,7 +124,7 @@ pub(super) fn doc_comment(
     }
 
     for attr in attributes.by_key("doc").attrs() {
-        let InFile { file_id, value: src } = attrs_source_map.source_of(&attr);
+        let InFile { file_id, value: src } = attrs_source_map.source_of(attr);
         if file_id != node.file_id {
             continue;
         }
diff --git a/crates/ide/src/typing/on_enter.rs b/crates/ide/src/typing/on_enter.rs
index 81c4d95b1..5cba9d11d 100644
--- a/crates/ide/src/typing/on_enter.rs
+++ b/crates/ide/src/typing/on_enter.rs
@@ -88,12 +88,12 @@ fn on_enter_in_comment(
         if comment.text().ends_with(' ') {
             cov_mark::hit!(continues_end_of_line_comment_with_space);
             remove_trailing_whitespace = true;
-        } else if !followed_by_comment(&comment) {
+        } else if !followed_by_comment(comment) {
             return None;
         }
     }
 
-    let indent = node_indent(&file, comment.syntax())?;
+    let indent = node_indent(file, comment.syntax())?;
     let inserted = format!("\n{}{} $0", indent, prefix);
     let delete = if remove_trailing_whitespace {
         let trimmed_len = comment.text().trim_end().len() as u32;
@@ -188,7 +188,7 @@ mod tests {
     use crate::fixture;
 
     fn apply_on_enter(before: &str) -> Option {
-        let (analysis, position) = fixture::position(&before);
+        let (analysis, position) = fixture::position(before);
         let result = analysis.on_enter(position).unwrap()?;
 
         let mut actual = analysis.file_text(position.file_id).unwrap().to_string();
-- 
cgit v1.2.3