From 35e5daacc3bea7624acf18634a6f2bd52a069c3b Mon Sep 17 00:00:00 2001 From: Milo <50248166+Milo123459@users.noreply.github.com> Date: Sat, 16 Oct 2021 12:32:55 +0100 Subject: [PATCH] more clippy fixes --- crates/ide/src/goto_definition.rs | 6 +++--- crates/ide/src/highlight_related.rs | 2 +- crates/ide/src/hover.rs | 10 +++++----- crates/ide/src/inlay_hints.rs | 10 +++++----- crates/ide/src/lib.rs | 2 +- crates/ide/src/move_item.rs | 11 ++++------- crates/ide/src/rename.rs | 9 ++++----- crates/ide/src/static_index.rs | 12 +++++++----- crates/ide/src/syntax_highlighting.rs | 2 +- crates/ide/src/syntax_highlighting/highlight.rs | 4 ++-- crates/ide/src/syntax_highlighting/highlights.rs | 2 +- crates/ide/src/typing.rs | 4 +--- crates/rust-analyzer/src/bin/logger.rs | 2 +- crates/rust-analyzer/src/config.rs | 2 +- crates/rust-analyzer/src/handlers.rs | 9 ++++----- crates/rust-analyzer/src/lsp_utils.rs | 2 +- crates/rust-analyzer/src/main_loop.rs | 3 +-- crates/rust-analyzer/src/reload.rs | 4 ++-- crates/rust-analyzer/tests/slow-tests/tidy.rs | 2 +- 19 files changed, 46 insertions(+), 52 deletions(-) diff --git a/crates/ide/src/goto_definition.rs b/crates/ide/src/goto_definition.rs index 1599878119c..1f0b9aaaa1f 100644 --- a/crates/ide/src/goto_definition.rs +++ b/crates/ide/src/goto_definition.rs @@ -49,13 +49,13 @@ pub(crate) fn goto_definition( let parent = token.parent()?; if let Some(tt) = ast::TokenTree::cast(parent) { if let x @ Some(_) = - try_lookup_include_path(&sema, tt, token.clone(), position.file_id) + try_lookup_include_path(sema, tt, token.clone(), position.file_id) { return x; } } Some( - Definition::from_token(&sema, &token) + Definition::from_token(sema, &token) .into_iter() .flat_map(|def| { try_find_trait_item_definition(sema.db, &def) @@ -145,7 +145,7 @@ mod tests { fn check(ra_fixture: &str) { let (analysis, position, expected) = fixture::annotations(ra_fixture); let navs = analysis.goto_definition(position).unwrap().expect("no definition found").info; - if navs.len() == 0 { + if navs.is_empty() { panic!("unresolved reference") } diff --git a/crates/ide/src/highlight_related.rs b/crates/ide/src/highlight_related.rs index f910edebf11..e452f8c9386 100644 --- a/crates/ide/src/highlight_related.rs +++ b/crates/ide/src/highlight_related.rs @@ -353,7 +353,7 @@ fn check(ra_fixture: &str) { fn check_with_config(ra_fixture: &str, config: HighlightRelatedConfig) { let (analysis, pos, annotations) = fixture::annotations(ra_fixture); - let hls = analysis.highlight_related(config, pos).unwrap().unwrap_or(Vec::default()); + let hls = analysis.highlight_related(config, pos).unwrap().unwrap_or_default(); let mut expected = annotations .into_iter() diff --git a/crates/ide/src/hover.rs b/crates/ide/src/hover.rs index f2c29a66ba4..d4244628787 100644 --- a/crates/ide/src/hover.rs +++ b/crates/ide/src/hover.rs @@ -97,7 +97,7 @@ pub(crate) fn hover( let file = sema.parse(file_id).syntax().clone(); if !range.is_empty() { - return hover_ranged(&file, range, &sema, config); + return hover_ranged(&file, range, sema, config); } let offset = range.start(); @@ -121,7 +121,7 @@ pub(crate) fn hover( // FIXME: Definition should include known lints and the like instead of having this special case here if let Some(res) = descended.iter().find_map(|token| { let attr = token.ancestors().find_map(ast::Attr::cast)?; - render::try_for_lint(&attr, &token) + render::try_for_lint(&attr, token) }) { return Some(RangeInfo::new(original_token.text_range(), res)); } @@ -164,7 +164,7 @@ pub(crate) fn hover_for_definition( ) -> Option { let famous_defs = match &definition { Definition::ModuleDef(hir::ModuleDef::BuiltinType(_)) => { - Some(FamousDefs(&sema, sema.scope(&node).krate())) + Some(FamousDefs(sema, sema.scope(node).krate())) } _ => None, }; @@ -179,7 +179,7 @@ pub(crate) fn hover_for_definition( res.actions.push(action); } - if let Some(action) = runnable_action(&sema, definition, file_id) { + if let Some(action) = runnable_action(sema, definition, file_id) { res.actions.push(action); } @@ -246,7 +246,7 @@ fn hover_type_fallback( } }; - let res = render::type_info(&sema, config, &expr_or_pat)?; + let res = render::type_info(sema, config, &expr_or_pat)?; let range = sema.original_range(&node).range; Some(RangeInfo::new(range, res)) } diff --git a/crates/ide/src/inlay_hints.rs b/crates/ide/src/inlay_hints.rs index 3dcb510ab05..db91e68ff31 100644 --- a/crates/ide/src/inlay_hints.rs +++ b/crates/ide/src/inlay_hints.rs @@ -201,7 +201,7 @@ fn get_bind_pat_hints( let desc_pat = descended.as_ref().unwrap_or(pat); let ty = sema.type_of_pat(&desc_pat.clone().into())?.original; - if should_not_display_type_hint(sema, &pat, &ty) { + if should_not_display_type_hint(sema, pat, &ty) { return None; } @@ -269,7 +269,7 @@ fn is_named_constructor( callable_kind { if let Some(ctor) = path.segment() { - return (&ctor.to_string() == ty_name).then(|| ()); + return (ctor.to_string() == ty_name).then(|| ()); } } @@ -285,7 +285,7 @@ fn is_named_constructor( ast::PathSegmentKind::Type { type_ref: Some(ty), trait_ref: None } => ty.to_string(), _ => return None, }; - (&ctor_name == ty_name).then(|| ()) + (ctor_name == ty_name).then(|| ()) } /// Checks if the type is an Iterator from std::iter and replaces its hint with an `impl Iterator`. @@ -584,7 +584,7 @@ fn check_chains(ra_fixture: &str) { #[track_caller] fn check_with_config(config: InlayHintsConfig, ra_fixture: &str) { - let (analysis, file_id) = fixture::file(&ra_fixture); + let (analysis, file_id) = fixture::file(ra_fixture); let expected = extract_annotations(&*analysis.file_text(file_id).unwrap()); let inlay_hints = analysis.inlay_hints(&config, file_id).unwrap(); let actual = @@ -594,7 +594,7 @@ fn check_with_config(config: InlayHintsConfig, ra_fixture: &str) { #[track_caller] fn check_expect(config: InlayHintsConfig, ra_fixture: &str, expect: Expect) { - let (analysis, file_id) = fixture::file(&ra_fixture); + let (analysis, file_id) = fixture::file(ra_fixture); let inlay_hints = analysis.inlay_hints(&config, file_id).unwrap(); expect.assert_debug_eq(&inlay_hints) } diff --git a/crates/ide/src/lib.rs b/crates/ide/src/lib.rs index 396e893bf93..c2412254ef6 100644 --- a/crates/ide/src/lib.rs +++ b/crates/ide/src/lib.rs @@ -311,7 +311,7 @@ pub fn expand_macro(&self, position: FilePosition) -> Cancellable Cancellable { self.with_db(|db| { let parse = db.parse(frange.file_id); - join_lines::join_lines(&config, &parse.tree(), frange.range) + join_lines::join_lines(config, &parse.tree(), frange.range) }) } diff --git a/crates/ide/src/move_item.rs b/crates/ide/src/move_item.rs index f053580a56b..02e9fb8b5e2 100644 --- a/crates/ide/src/move_item.rs +++ b/crates/ide/src/move_item.rs @@ -120,13 +120,10 @@ fn swap_sibling_in_list>( range: TextRange, direction: Direction, ) -> Option { - let list_lookup = list - .tuple_windows() - .filter(|(l, r)| match direction { - Direction::Up => r.syntax().text_range().contains_range(range), - Direction::Down => l.syntax().text_range().contains_range(range), - }) - .next(); + let list_lookup = list.tuple_windows().find(|(l, r)| match direction { + Direction::Up => r.syntax().text_range().contains_range(range), + Direction::Down => l.syntax().text_range().contains_range(range), + }); if let Some((l, r)) = list_lookup { Some(replace_nodes(range, l.syntax(), r.syntax())) diff --git a/crates/ide/src/rename.rs b/crates/ide/src/rename.rs index e02c0dfd84b..d6f381497bd 100644 --- a/crates/ide/src/rename.rs +++ b/crates/ide/src/rename.rs @@ -107,14 +107,14 @@ fn find_definition( { bail!("Renaming aliases is currently unsupported") } - ast::NameLike::Name(name) => NameClass::classify(sema, &name).map(|class| match class { + ast::NameLike::Name(name) => NameClass::classify(sema, name).map(|class| match class { NameClass::Definition(it) | NameClass::ConstReference(it) => it, NameClass::PatFieldShorthand { local_def, field_ref: _ } => { Definition::Local(local_def) } }), ast::NameLike::NameRef(name_ref) => { - if let Some(def) = NameRefClass::classify(sema, &name_ref).map(|class| match class { + if let Some(def) = NameRefClass::classify(sema, name_ref).map(|class| match class { NameRefClass::Definition(def) => def, NameRefClass::FieldShorthand { local_ref, field_ref: _ } => { Definition::Local(local_ref) @@ -129,13 +129,13 @@ fn find_definition( None } } - ast::NameLike::Lifetime(lifetime) => NameRefClass::classify_lifetime(sema, &lifetime) + ast::NameLike::Lifetime(lifetime) => NameRefClass::classify_lifetime(sema, lifetime) .and_then(|class| match class { NameRefClass::Definition(def) => Some(def), _ => None, }) .or_else(|| { - NameClass::classify_lifetime(sema, &lifetime).and_then(|it| match it { + NameClass::classify_lifetime(sema, lifetime).and_then(|it| match it { NameClass::Definition(it) => Some(it), _ => None, }) @@ -305,7 +305,6 @@ fn check(new_name: &str, ra_fixture_before: &str, ra_fixture_after: &str) { .skip("error:".len()) .collect::(); assert_eq!(error_message.trim(), err.to_string()); - return; } else { panic!("Rename to '{}' failed unexpectedly: {}", new_name, err) } diff --git a/crates/ide/src/static_index.rs b/crates/ide/src/static_index.rs index 5369f9c31fa..5e98ac17567 100644 --- a/crates/ide/src/static_index.rs +++ b/crates/ide/src/static_index.rs @@ -120,9 +120,11 @@ fn add_file(&mut self, file_id: FileId) { }); let hover_config = HoverConfig { links_in_hover: true, documentation: Some(HoverDocFormat::Markdown) }; - let tokens = tokens.filter(|token| match token.kind() { - IDENT | INT_NUMBER | LIFETIME_IDENT | T![self] | T![super] | T![crate] => true, - _ => false, + let tokens = tokens.filter(|token| { + matches!( + token.kind(), + IDENT | INT_NUMBER | LIFETIME_IDENT | T![self] | T![super] | T![crate] + ) }); let mut result = StaticIndexedFile { file_id, inlay_hints, folds, tokens: vec![] }; for token in tokens { @@ -158,7 +160,7 @@ fn add_file(&mut self, file_id: FileId) { self.files.push(result); } - pub fn compute<'a>(analysis: &'a Analysis) -> StaticIndex<'a> { + pub fn compute(analysis: &Analysis) -> StaticIndex { let db = &*analysis.db; let work = all_modules(db).into_iter().filter(|module| { let file_id = module.definition_source(db).file_id.original_file(db); @@ -189,7 +191,7 @@ pub fn compute<'a>(analysis: &'a Analysis) -> StaticIndex<'a> { fn get_definition(sema: &Semantics, token: SyntaxToken) -> Option { for token in sema.descend_into_macros(token) { - let def = Definition::from_token(&sema, &token); + let def = Definition::from_token(sema, &token); if let [x] = def.as_slice() { return Some(*x); } else { diff --git a/crates/ide/src/syntax_highlighting.rs b/crates/ide/src/syntax_highlighting.rs index 6b246ff709e..72ddbc5d169 100644 --- a/crates/ide/src/syntax_highlighting.rs +++ b/crates/ide/src/syntax_highlighting.rs @@ -342,7 +342,7 @@ fn traverse( element_to_highlight.clone(), ) { if inside_attribute { - highlight = highlight | HlMod::Attribute; + highlight |= HlMod::Attribute } hl.add(HlRange { range, highlight, binding_hash }); diff --git a/crates/ide/src/syntax_highlighting/highlight.rs b/crates/ide/src/syntax_highlighting/highlight.rs index 47c0f00c00f..1285c2f8466 100644 --- a/crates/ide/src/syntax_highlighting/highlight.rs +++ b/crates/ide/src/syntax_highlighting/highlight.rs @@ -538,7 +538,7 @@ fn highlight_def( Definition::Label(_) => Highlight::new(HlTag::Symbol(SymbolKind::Label)), }; - let famous_defs = FamousDefs(&sema, krate); + let famous_defs = FamousDefs(sema, krate); let def_crate = def.module(db).map(hir::Module::krate).or_else(|| match def { Definition::ModuleDef(hir::ModuleDef::Module(module)) => Some(module.krate()), _ => None, @@ -591,7 +591,7 @@ fn highlight_method_call( h |= HlMod::Trait; } - let famous_defs = FamousDefs(&sema, krate); + let famous_defs = FamousDefs(sema, krate); let def_crate = func.module(sema.db).krate(); let is_from_other_crate = Some(def_crate) != krate; let is_from_builtin_crate = famous_defs.builtin_crates().any(|it| def_crate == it); diff --git a/crates/ide/src/syntax_highlighting/highlights.rs b/crates/ide/src/syntax_highlighting/highlights.rs index 882a685a567..340290eafed 100644 --- a/crates/ide/src/syntax_highlighting/highlights.rs +++ b/crates/ide/src/syntax_highlighting/highlights.rs @@ -26,7 +26,7 @@ pub(super) fn add(&mut self, hl_range: HlRange) { self.root.add(hl_range); } - pub(super) fn to_vec(self) -> Vec { + pub(super) fn to_vec(&self) -> Vec { let mut res = Vec::new(); self.root.flatten(&mut res); res diff --git a/crates/ide/src/typing.rs b/crates/ide/src/typing.rs index 37ae923509a..2628918b8d1 100644 --- a/crates/ide/src/typing.rs +++ b/crates/ide/src/typing.rs @@ -227,9 +227,7 @@ fn on_arrow_typed(file: &SourceFile, offset: TextSize) -> Option { if file_text.char_at(after_arrow) != Some('{') { return None; } - if find_node_at_offset::(file.syntax(), offset).is_none() { - return None; - } + find_node_at_offset::(file.syntax(), offset)?; Some(TextEdit::insert(after_arrow, " ".to_string())) } diff --git a/crates/rust-analyzer/src/bin/logger.rs b/crates/rust-analyzer/src/bin/logger.rs index 9a31dec7e3f..083ab69587f 100644 --- a/crates/rust-analyzer/src/bin/logger.rs +++ b/crates/rust-analyzer/src/bin/logger.rs @@ -27,7 +27,7 @@ pub(crate) struct Logger { impl Logger { pub(crate) fn new(file: Option, filter: Option<&str>) -> Logger { - let filter = filter.map_or(EnvFilter::default(), |dirs| EnvFilter::new(dirs)); + let filter = filter.map_or(EnvFilter::default(), EnvFilter::new); Logger { filter, file } } diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs index 0d6b1bcbfb0..87c01603eae 100644 --- a/crates/rust-analyzer/src/config.rs +++ b/crates/rust-analyzer/src/config.rs @@ -673,7 +673,7 @@ pub fn files(&self) -> FilesConfig { FilesConfig { watcher: match self.data.files_watcher.as_str() { "notify" => FilesWatcher::Notify, - "client" | _ => FilesWatcher::Client, + _ => FilesWatcher::Client, }, exclude: self.data.files_excludeDirs.iter().map(|it| self.root_path.join(it)).collect(), } diff --git a/crates/rust-analyzer/src/handlers.rs b/crates/rust-analyzer/src/handlers.rs index c8352660bcb..7d46cee2142 100644 --- a/crates/rust-analyzer/src/handlers.rs +++ b/crates/rust-analyzer/src/handlers.rs @@ -367,9 +367,8 @@ fn flatten_document_symbol( let mut tags = Vec::new(); #[allow(deprecated)] - match symbol.deprecated { - Some(true) => tags.push(SymbolTag::Deprecated), - _ => {} + if let Some(true) = symbol.deprecated { + tags.push(SymbolTag::Deprecated) } #[allow(deprecated)] @@ -1094,7 +1093,7 @@ pub(crate) fn handle_code_action_resolve( let _p = profile::span("handle_code_action_resolve"); let params = match code_action.data.take() { Some(it) => it, - None => return Err(invalid_params_error(format!("code action without data")).into()), + None => return Err(invalid_params_error("code action without data".to_string()).into()), }; let file_id = from_proto::file_id(&snap, ¶ms.code_action_params.text_document.uri)?; @@ -1153,7 +1152,7 @@ pub(crate) fn handle_code_action_resolve( fn parse_action_id(action_id: &str) -> Result<(usize, SingleResolve), String> { let id_parts = action_id.split(':').collect_vec(); match id_parts.as_slice() { - &[assist_id_string, assist_kind_string, index_string] => { + [assist_id_string, assist_kind_string, index_string] => { let assist_kind: AssistKind = assist_kind_string.parse()?; let index: usize = match index_string.parse() { Ok(index) => index, diff --git a/crates/rust-analyzer/src/lsp_utils.rs b/crates/rust-analyzer/src/lsp_utils.rs index 09178521b59..9e7c265a80a 100644 --- a/crates/rust-analyzer/src/lsp_utils.rs +++ b/crates/rust-analyzer/src/lsp_utils.rs @@ -77,7 +77,7 @@ pub(crate) fn report_progress( return; } let percentage = fraction.map(|f| { - assert!(0.0 <= f && f <= 1.0); + assert!((0.0..=1.0).contains(&f)); (f * 100.0) as u32 }); let token = lsp_types::ProgressToken::String(format!("rustAnalyzer/{}", title)); diff --git a/crates/rust-analyzer/src/main_loop.rs b/crates/rust-analyzer/src/main_loop.rs index 9e1bac854d5..6dd1c76c2e6 100644 --- a/crates/rust-analyzer/src/main_loop.rs +++ b/crates/rust-analyzer/src/main_loop.rs @@ -166,7 +166,7 @@ fn run(mut self, inbox: Receiver) -> Result<()> { self.handle_event(event)? } - Err("client exited without proper shutdown sequence")? + return Err("client exited without proper shutdown sequence".into()); } fn next_event(&self, inbox: &Receiver) -> Option { @@ -769,7 +769,6 @@ fn update_diagnostics(&mut self) { if !is_cancelled(&*err) { tracing::error!("failed to compute diagnostics: {:?}", err); } - () }) .ok() .map(|diags| (file_id, diags)) diff --git a/crates/rust-analyzer/src/reload.rs b/crates/rust-analyzer/src/reload.rs index f7ec3707c0a..6a6df9c1ddb 100644 --- a/crates/rust-analyzer/src/reload.rs +++ b/crates/rust-analyzer/src/reload.rs @@ -211,7 +211,7 @@ fn eq_ignore_build_data<'a>( if same_workspaces { let (workspaces, build_scripts) = self.fetch_build_data_queue.last_op_result(); - if Arc::ptr_eq(&workspaces, &self.workspaces) { + if Arc::ptr_eq(workspaces, &self.workspaces) { let workspaces = workspaces .iter() .cloned() @@ -417,7 +417,7 @@ fn reload_flycheck(&mut self) { id, Box::new(move |msg| sender.send(msg).unwrap()), config.clone(), - root.to_path_buf().into(), + root.to_path_buf(), ) }) .collect(); diff --git a/crates/rust-analyzer/tests/slow-tests/tidy.rs b/crates/rust-analyzer/tests/slow-tests/tidy.rs index bd34a5fda81..36dd9f7b466 100644 --- a/crates/rust-analyzer/tests/slow-tests/tidy.rs +++ b/crates/rust-analyzer/tests/slow-tests/tidy.rs @@ -91,7 +91,7 @@ fn files_are_tidy() { tidy_marks.finish(); } -fn check_cargo_toml(path: &Path, text: String) -> () { +fn check_cargo_toml(path: &Path, text: String) { let mut section = None; for (line_no, text) in text.lines().enumerate() { let text = text.trim();