Applied all suggestions by Clippy

Author: tjunier

crates/termal-alignment/src/alignment.rs

@@ -184,7 +184,7 @@ impl Alignment {
         match spec {
             // Note: the rank in a RefSpec is 0-based. The conversion from user-land is done in
             // app.rs.
-            RefSpec::Rank(rk) if rk >= self.num_seq() as usize => {
+            RefSpec::Rank(rk) if rk >= self.num_seq() => {
                 return Err(RefSpecError::RefTooLarge(self.num_seq()));
             }
             _ => self.ref_spec = spec,

crates/termal-export/src/lib.rs

@@ -42,7 +42,7 @@ pub fn compute_layout(aln: &Alignment, opts: &ExportOpts) -> Layout {
     Layout {
         grid_width: hdr_txt_width + aln.aln_len() as f32 * opts.cell_width,
         grid_height: aln.num_seq() as f32 * opts.cell_height,
-        hdr_txt_width: hdr_txt_width,
+        hdr_txt_width,
     }
 }
 
@@ -57,7 +57,7 @@ impl Default for ExportOpts {
             residue_font_size: 14,
             ascent_corr: 12.0,
             char_width: 8.0,
-            colormap: colormap,
+            colormap,
             margin_x: 10.0,
             margin_y: 10.0,
             cell_frames: false,

crates/termal-export/src/main.rs

@@ -132,7 +132,7 @@ fn main() -> Result<()> {
         cell_width: args.cell_width,
         cell_height: args.cell_height,
         residue_font_size: args.residue_font_size,
-        colormap: colormap,
+        colormap,
         ascent_corr: args.ascent_corr,
         margin_x: args.margin_x,
         margin_y: args.margin_y,

crates/termal/src/app.rs

@@ -352,8 +352,8 @@ impl App {
     }
 
     fn next_match_expect(
-        reverse_ordering: &Vec<usize>,
-        ordering: &Vec<usize>,
+        reverse_ordering: &[usize],
+        ordering: &[usize],
         num_seq: usize,
         matches_by_rank: &HashMap<usize, Vec<MatchPosition>>,
         cur_match: (usize, usize),
@@ -376,8 +376,8 @@ impl App {
     }
 
     fn previous_match_expect(
-        reverse_ordering: &Vec<usize>,
-        ordering: &Vec<usize>,
+        reverse_ordering: &[usize],
+        ordering: &[usize],
         num_seq: usize,
         matches_by_rank: &HashMap<usize, Vec<MatchPosition>>,
         cur_match: (usize, usize),
@@ -500,7 +500,7 @@ impl App {
                     if let Some((rank, match_ndx)) = seq_state.current {
                         let mut current_match_num = 0;
                         for cur_rank in &self.ordering {
-                            if let Some(matches) = seq_state.matches_by_rank.get(&cur_rank) {
+                            if let Some(matches) = seq_state.matches_by_rank.get(cur_rank) {
                                 if *cur_rank != rank {
                                     current_match_num += matches.len();
                                 } else {
@@ -595,7 +595,7 @@ impl App {
         }
     }
 
-    fn ordered_hdr_matches(&self, match_ranks: &Vec<usize>) -> Vec<usize> {
+    fn ordered_hdr_matches(&self, match_ranks: &[usize]) -> Vec<usize> {
         let mut screenlines: Vec<usize> = match_ranks
             .iter()
             .map(|r| self.reverse_ordering[*r])
@@ -724,7 +724,7 @@ impl App {
                     // -1 <= user is 1-based
                     self.alignment.set_ref_spec(RefSpec::Rank(rank - 1))
                 }
-                Ok(rank) if rank == 0 => {
+                Ok(0) => {
                     Err(RefSpecError::ZeroRef)
                 }
                 // usize cannot be < 0

crates/termal/src/runner.rs

@@ -177,7 +177,7 @@ pub fn run() -> Result<(), TermalError> {
         let mut user_ordering = match cli.user_order {
             Some(ref fname) => {
                 // TODO: should be called from_path()
-                let get_ord_vec = read_user_ordering(&fname);
+                let get_ord_vec = read_user_ordering(fname);
                 match get_ord_vec {
                     Ok(ord_vec) => Some(ord_vec),
                     Err(_) => {

crates/termal/src/ui/key_handling.rs

@@ -132,7 +132,7 @@ fn handle_label_search(ui: &mut UI, key_event: KeyEvent, pattern: &str) {
         KeyCode::Enter => {
             ui.app.regex_search_labels(pattern);
             ui.input_mode = InputMode::Normal;
-            if let Some(_) = &ui.app.search_state {
+            if ui.app.search_state.is_some() {
                 ui.jump_to_next_match(0);
             }
         }
@@ -348,7 +348,7 @@ fn dispatch_command(ui: &mut UI, key_event: KeyEvent, count_arg: Option<usize>)
 
         // To search matches
         KeyCode::Char('n') => ui.jump_to_next_match(count as i16),
-        KeyCode::Char('p') => ui.jump_to_next_match(-1 * count as i16),
+        KeyCode::Char('p') => ui.jump_to_next_match(-(count as i16)),
         KeyCode::Enter => ui.jump_to_current_match(),
 
         // Left Pane width

crates/termal/src/ui/render.rs

@@ -259,7 +259,7 @@ fn make_layout(f: &Frame, ui: &UI) -> Panes {
     let lbl_pane = Layout::new(
         Direction::Horizontal,
         vec![
-            Constraint::Length(lbl_num_pane_num_cols.try_into().unwrap()),
+            Constraint::Length(lbl_num_pane_num_cols),
             Constraint::Fill(1),
             Constraint::Length(3),
         ],
@@ -405,12 +405,12 @@ fn render_alignment_pane(f: &mut Frame, aln_chunk: Rect, ui: &UI) {
 
     f.render_widget(aln_block, aln_chunk);
 
-    let style_lut = build_style_lut(&ui);
+    let style_lut = build_style_lut(ui);
 
     match ui.zoom_level {
         ZoomLevel::ZoomedIn => {
             let pane = SeqPane {
-                app: &ui.app,
+                app: ui.app,
                 sequences: &ui.app.alignment.sequences,
                 ordering: &ui.app.ordering,
                 top_i: ui.top_line as usize,
@@ -423,7 +423,7 @@ fn render_alignment_pane(f: &mut Frame, aln_chunk: Rect, ui: &UI) {
         ZoomLevel::ZoomedOut | ZoomLevel::ZoomedOutAR => {
             let zoombox_color = ui.get_zoombox_color();
             let pane = SeqPaneZoomedOut {
-                app: &ui.app,
+                app: ui.app,
                 sequences: &ui.app.alignment.sequences,
                 ordering: &ui.app.ordering,
                 retained_rows: &retained_seq_ndx(ui),