From 8a3ec443f176218384db8c8610bbada9c43a6ea5 Mon Sep 17 00:00:00 2001 From: Pascal Kuthe Date: Thu, 9 Feb 2023 23:27:08 +0100 Subject: [PATCH] Fix new clippy lints (#5892) --- helix-core/src/comment.rs | 2 +- helix-core/src/increment/integer.rs | 4 ++-- helix-core/src/indent.rs | 4 ++-- helix-core/src/syntax.rs | 2 +- helix-lsp/src/client.rs | 2 +- helix-term/src/commands.rs | 8 +++++--- helix-term/src/lib.rs | 2 +- helix-term/src/ui/document.rs | 12 ++++++------ helix-term/src/ui/editor.rs | 9 ++------- helix-term/src/ui/fuzzy_match.rs | 2 +- helix-vcs/src/git/test.rs | 2 +- helix-view/src/base64.rs | 2 +- helix-view/src/clipboard.rs | 2 +- helix-view/src/document.rs | 2 +- helix-view/src/gutter.rs | 8 +++----- helix-view/src/input.rs | 2 +- helix-view/src/view.rs | 2 +- xtask/src/themelint.rs | 2 +- 18 files changed, 32 insertions(+), 37 deletions(-) diff --git a/helix-core/src/comment.rs b/helix-core/src/comment.rs index ec5d7a45..6241f7fd 100644 --- a/helix-core/src/comment.rs +++ b/helix-core/src/comment.rs @@ -68,7 +68,7 @@ pub fn toggle_line_comments(doc: &Rope, selection: &Selection, token: Option<&st let mut min_next_line = 0; for selection in selection { let (start, end) = selection.line_range(text); - let start = start.max(min_next_line).min(text.len_lines()); + let start = start.clamp(min_next_line, text.len_lines()); let end = (end + 1).min(text.len_lines()); lines.extend(start..end); diff --git a/helix-core/src/increment/integer.rs b/helix-core/src/increment/integer.rs index 30803e17..0dfabc0d 100644 --- a/helix-core/src/increment/integer.rs +++ b/helix-core/src/increment/integer.rs @@ -69,8 +69,8 @@ pub fn increment(selected_text: &str, amount: i64) -> Option { let (lower_count, upper_count): (usize, usize) = number.chars().fold((0, 0), |(lower, upper), c| { ( - lower + c.is_ascii_lowercase().then(|| 1).unwrap_or(0), - upper + c.is_ascii_uppercase().then(|| 1).unwrap_or(0), + lower + c.is_ascii_lowercase() as usize, + upper + c.is_ascii_uppercase() as usize, ) }); if upper_count > lower_count { diff --git a/helix-core/src/indent.rs b/helix-core/src/indent.rs index d6aa5edb..3aa59fa3 100644 --- a/helix-core/src/indent.rs +++ b/helix-core/src/indent.rs @@ -604,7 +604,7 @@ pub fn treesitter_indent_for_pos( &mut cursor, text, query_range, - new_line.then(|| (line, byte_pos)), + new_line.then_some((line, byte_pos)), ); ts_parser.cursors.push(cursor); (query_result, deepest_preceding) @@ -624,7 +624,7 @@ pub fn treesitter_indent_for_pos( tab_width, ); } - let mut first_in_line = get_first_in_line(node, new_line.then(|| byte_pos)); + let mut first_in_line = get_first_in_line(node, new_line.then_some(byte_pos)); let mut result = Indentation::default(); // We always keep track of all the indent changes on one line, in order to only indent once diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs index ca4da3dc..1b6c1b1d 100644 --- a/helix-core/src/syntax.rs +++ b/helix-core/src/syntax.rs @@ -427,7 +427,7 @@ impl TextObjectQuery { let nodes: Vec<_> = mat .captures .iter() - .filter_map(|cap| (cap.index == capture_idx).then(|| cap.node)) + .filter_map(|cap| (cap.index == capture_idx).then_some(cap.node)) .collect(); if nodes.len() > 1 { diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs index 365c6990..cb6e5d81 100644 --- a/helix-lsp/src/client.rs +++ b/helix-lsp/src/client.rs @@ -628,7 +628,7 @@ impl Client { Some(self.notify::( lsp::DidSaveTextDocumentParams { text_document, - text: include_text.then(|| text.into()), + text: include_text.then_some(text.into()), }, )) } diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs index d7d87b5a..84daaef4 100644 --- a/helix-term/src/commands.rs +++ b/helix-term/src/commands.rs @@ -959,9 +959,11 @@ fn goto_window(cx: &mut Context, align: Align) { Align::Bottom => { view.offset.vertical_offset + last_visual_line.saturating_sub(scrolloff + count) } - } - .max(view.offset.vertical_offset + scrolloff) - .min(view.offset.vertical_offset + last_visual_line.saturating_sub(scrolloff)); + }; + let visual_line = visual_line.clamp( + view.offset.vertical_offset + scrolloff, + view.offset.vertical_offset + last_visual_line.saturating_sub(scrolloff), + ); let pos = view .pos_at_visual_coords(doc, visual_line as u16, 0, false) diff --git a/helix-term/src/lib.rs b/helix-term/src/lib.rs index f0bc9129..2f6ec12b 100644 --- a/helix-term/src/lib.rs +++ b/helix-term/src/lib.rs @@ -42,7 +42,7 @@ fn filter_picker_entry(entry: &DirEntry, root: &Path, dedup_symlinks: bool) -> b .path() .canonicalize() .ok() - .map_or(false, |path| !path.starts_with(&root)); + .map_or(false, |path| !path.starts_with(root)); } true diff --git a/helix-term/src/ui/document.rs b/helix-term/src/ui/document.rs index ddbb2cf3..ed4b1de9 100644 --- a/helix-term/src/ui/document.rs +++ b/helix-term/src/ui/document.rs @@ -402,7 +402,7 @@ impl<'a> TextRenderer<'a> { is_in_indent_area: &mut bool, position: Position, ) { - let cut_off_start = self.col_offset.saturating_sub(position.col as usize); + let cut_off_start = self.col_offset.saturating_sub(position.col); let is_whitespace = grapheme.is_whitespace(); // TODO is it correct to apply the whitspace style to all unicode white spaces? @@ -413,7 +413,7 @@ impl<'a> TextRenderer<'a> { let width = grapheme.width(); let grapheme = match grapheme { Grapheme::Tab { width } => { - let grapheme_tab_width = char_to_byte_idx(&self.tab, width as usize); + let grapheme_tab_width = char_to_byte_idx(&self.tab, width); &self.tab[..grapheme_tab_width] } // TODO special rendering for other whitespaces? @@ -423,8 +423,8 @@ impl<'a> TextRenderer<'a> { Grapheme::Newline => &self.newline, }; - let in_bounds = self.col_offset <= (position.col as usize) - && (position.col as usize) < self.viewport.width as usize + self.col_offset; + let in_bounds = self.col_offset <= position.col + && position.col < self.viewport.width as usize + self.col_offset; if in_bounds { self.surface.set_string( @@ -433,10 +433,10 @@ impl<'a> TextRenderer<'a> { grapheme, style, ); - } else if cut_off_start != 0 && cut_off_start < width as usize { + } else if cut_off_start != 0 && cut_off_start < width { // partially on screen let rect = Rect::new( - self.viewport.x as u16, + self.viewport.x, self.viewport.y + position.row as u16, (width - cut_off_start) as u16, 1, diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs index 493f8d50..59f371bd 100644 --- a/helix-term/src/ui/editor.rs +++ b/helix-term/src/ui/editor.rs @@ -206,7 +206,7 @@ impl EditorView { highlights, theme, &mut line_decorations, - &mut *translated_positions, + &mut translated_positions, ); Self::render_rulers(editor, doc, view, inner, surface, theme); @@ -723,12 +723,7 @@ impl EditorView { let viewport = view.area; let line_decoration = move |renderer: &mut TextRenderer, pos: LinePos| { - let area = Rect::new( - viewport.x, - viewport.y + pos.visual_line as u16, - viewport.width, - 1, - ); + let area = Rect::new(viewport.x, viewport.y + pos.visual_line, viewport.width, 1); if primary_line == pos.doc_line { renderer.surface.set_style(area, primary_style); } else if secondary_lines.binary_search(&pos.doc_line).is_ok() { diff --git a/helix-term/src/ui/fuzzy_match.rs b/helix-term/src/ui/fuzzy_match.rs index e6a3f03a..b406702f 100644 --- a/helix-term/src/ui/fuzzy_match.rs +++ b/helix-term/src/ui/fuzzy_match.rs @@ -25,7 +25,7 @@ impl QueryAtom { _ => QueryAtomKind::Fuzzy, }; - if atom.starts_with(&['^', '\'']) { + if atom.starts_with(['^', '\'']) { atom.remove(0); } diff --git a/helix-vcs/src/git/test.rs b/helix-vcs/src/git/test.rs index d6e9af08..6b1aba7f 100644 --- a/helix-vcs/src/git/test.rs +++ b/helix-vcs/src/git/test.rs @@ -89,7 +89,7 @@ fn directory() { std::fs::create_dir(&dir).expect(""); let file = dir.join("file.txt"); let contents = b"foo".as_slice(); - File::create(&file).unwrap().write_all(contents).unwrap(); + File::create(file).unwrap().write_all(contents).unwrap(); create_commit(temp_git.path(), true); diff --git a/helix-view/src/base64.rs b/helix-view/src/base64.rs index a0dc167f..13ee919d 100644 --- a/helix-view/src/base64.rs +++ b/helix-view/src/base64.rs @@ -36,7 +36,7 @@ const LOW_SIX_BITS: u32 = 0x3F; pub fn encode(input: &[u8]) -> String { let rem = input.len() % 3; let complete_chunks = input.len() / 3; - let remainder_chunk = if rem == 0 { 0 } else { 1 }; + let remainder_chunk = usize::from(rem != 0); let encoded_size = (complete_chunks + remainder_chunk) * 4; let mut output = vec![0; encoded_size]; diff --git a/helix-view/src/clipboard.rs b/helix-view/src/clipboard.rs index 96c87d3f..d43d632a 100644 --- a/helix-view/src/clipboard.rs +++ b/helix-view/src/clipboard.rs @@ -258,7 +258,7 @@ pub mod provider { .args(args) .output() .ok() - .and_then(|out| out.status.success().then(|| ())) // TODO: use then_some when stabilized + .and_then(|out| out.status.success().then_some(())) .is_some() } diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs index d308d013..11a0dbf8 100644 --- a/helix-view/src/document.rs +++ b/helix-view/src/document.rs @@ -1096,7 +1096,7 @@ impl Document { /// Language server if it has been initialized. pub fn language_server(&self) -> Option<&helix_lsp::Client> { let server = self.language_server.as_deref()?; - server.is_initialized().then(|| server) + server.is_initialized().then_some(server) } pub fn diff_handle(&self) -> Option<&DiffHandle> { diff --git a/helix-view/src/gutter.rs b/helix-view/src/gutter.rs index 90c94d55..cb9e4333 100644 --- a/helix-view/src/gutter.rs +++ b/helix-view/src/gutter.rs @@ -7,9 +7,8 @@ use crate::{ }; fn count_digits(n: usize) -> usize { - // NOTE: if int_log gets standardized in stdlib, can use checked_log10 - // (https://github.com/rust-lang/rust/issues/70887#issue) - std::iter::successors(Some(n), |&n| (n >= 10).then(|| n / 10)).count() + // TODO: use checked_log10 when MSRV reaches 1.67 + std::iter::successors(Some(n), |&n| (n >= 10).then_some(n / 10)).count() } pub type GutterFn<'doc> = Box Option