diff options
author | Canop <cano.petrole@gmail.com> | 2023-01-03 19:47:06 +0100 |
---|---|---|
committer | Canop <cano.petrole@gmail.com> | 2023-01-03 19:47:06 +0100 |
commit | c641b27f7f47d9e66c6426fa605cb79841494c7b (patch) | |
tree | b35aadfd8be88a807d3ab70f1c08c982dfe8470a /src | |
parent | 428205c11213b3c830984b58ab8cc9f7aa41a7d8 (diff) |
version 1.19.0v1.19.0
Diffstat (limited to 'src')
-rw-r--r-- | src/browser/browser_state.rs | 6 | ||||
-rw-r--r-- | src/display/displayable_tree.rs | 2 | ||||
-rw-r--r-- | src/file_sum/sum_computation.rs | 2 | ||||
-rw-r--r-- | src/filesystems/filesystems_state.rs | 4 | ||||
-rw-r--r-- | src/help/help_state.rs | 2 | ||||
-rw-r--r-- | src/pattern/fuzzy_pattern.rs | 2 | ||||
-rw-r--r-- | src/syntactic/syntactic_view.rs | 2 | ||||
-rw-r--r-- | src/verb/internal_select.rs | 2 |
8 files changed, 11 insertions, 11 deletions
diff --git a/src/browser/browser_state.rs b/src/browser/browser_state.rs index efa3192..8d6a455 100644 --- a/src/browser/browser_state.rs +++ b/src/browser/browser_state.rs @@ -56,7 +56,7 @@ impl BrowserState { let builder = TreeBuilder::from( path, options, - BrowserState::page_height(screen) as usize, + BrowserState::page_height(screen), con, )?; let tree = builder.build_tree(false, dam)?; @@ -656,7 +656,7 @@ impl PanelState for BrowserState { let mut options = self.tree.options.clone(); options.pattern = pattern; let root = self.tree.root().clone(); - let page_height = BrowserState::page_height(screen) as usize; + let page_height = BrowserState::page_height(screen); let builder = TreeBuilder::from(root, options, page_height, con)?; let filtered_tree = time!( Info, @@ -718,7 +718,7 @@ impl PanelState for BrowserState { } fn refresh(&mut self, screen: Screen, con: &AppContext) -> Command { - let page_height = BrowserState::page_height(screen) as usize; + let page_height = BrowserState::page_height(screen); // refresh the base tree if let Err(e) = self.tree.refresh(page_height, con) { warn!("refreshing base tree failed : {:?}", e); diff --git a/src/display/displayable_tree.rs b/src/display/displayable_tree.rs index f4f4974..1a92f4b 100644 --- a/src/display/displayable_tree.rs +++ b/src/display/displayable_tree.rs @@ -511,7 +511,7 @@ impl<'a, 's, 't> DisplayableTree<'a, 's, 't> { } let mut line_index = y as usize; if line_index > 0 { - line_index += tree.scroll as usize; + line_index += tree.scroll; } let mut selected = false; let mut cw = CropWriter::new(f, self.area.width as usize); diff --git a/src/file_sum/sum_computation.rs b/src/file_sum/sum_computation.rs index c997375..344f4a7 100644 --- a/src/file_sum/sum_computation.rs +++ b/src/file_sum/sum_computation.rs @@ -181,7 +181,7 @@ impl DirSummer { loop { let o = dirs_receiver.recv(); if let Ok(Some(open_dir)) = o { - if let Ok(entries) = fs::read_dir(&open_dir) { + if let Ok(entries) = fs::read_dir(open_dir) { for e in entries.flatten() { if let Ok(md) = e.metadata() { if md.is_dir() { diff --git a/src/filesystems/filesystems_state.rs b/src/filesystems/filesystems_state.rs index 553d742..b125268 100644 --- a/src/filesystems/filesystems_state.rs +++ b/src/filesystems/filesystems_state.rs @@ -125,7 +125,7 @@ impl FilesystemState { cycle: bool, ) -> CmdResult { let count = get_arg(input_invocation, internal_exec, 1); - let dir = dir * count as i32; + let dir = dir * count; if let Some(f) = self.filtered.as_mut() { f.selection_idx = move_sel(f.selection_idx, f.mounts.len(), dir, cycle); } else { @@ -353,7 +353,7 @@ impl PanelState for FilesystemState { cw.queue_g_string(border_style, format!("{:─>width$}", '┼', width = w_free+1))?; cw.fill(border_style, &BRANCH_FILLING)?; //- content - let mut idx = self.scroll as usize; + let mut idx = self.scroll; for y in 2..area.height { w.queue(cursor::MoveTo(area.left, y + area.top))?; let selected = selection_idx == idx; diff --git a/src/help/help_state.rs b/src/help/help_state.rs index 0021ae3..d37941f 100644 --- a/src/help/help_state.rs +++ b/src/help/help_state.rs @@ -232,7 +232,7 @@ impl PanelState for HelpState { }; CmdResult::Keep } - open_stay => match opener::open(&Conf::default_location()) { + open_stay => match opener::open(Conf::default_location()) { Ok(exit_status) => { info!("open returned with exit_status {:?}", exit_status); CmdResult::Keep diff --git a/src/pattern/fuzzy_pattern.rs b/src/pattern/fuzzy_pattern.rs index 457b5bc..d38036c 100644 --- a/src/pattern/fuzzy_pattern.rs +++ b/src/pattern/fuzzy_pattern.rs @@ -146,7 +146,7 @@ impl FuzzyPattern { let match_len = 1 + cand_idx - pos[0]; let mut score = BONUS_MATCH; score += BONUS_CANDIDATE_LENGTH * (cand_chars.len() as i32); - score += BONUS_SINGLED_CHAR * (nb_singled_chars as i32); + score += BONUS_SINGLED_CHAR * nb_singled_chars; score += BONUS_NB_HOLES * (nb_holes as i32); score += match_len as i32 * BONUS_MATCH_LENGTH; if pos[0] == 0 { diff --git a/src/syntactic/syntactic_view.rs b/src/syntactic/syntactic_view.rs index 098d9fb..ad42fa6 100644 --- a/src/syntactic/syntactic_view.rs +++ b/src/syntactic/syntactic_view.rs @@ -332,7 +332,7 @@ impl SyntacticView { for y in 0..line_count { w.queue(cursor::MoveTo(area.left, y as u16 + area.top))?; let mut cw = CropWriter::new(w, code_width); - let line_idx = self.scroll as usize + y; + let line_idx = self.scroll + y; let selected = self.selection_idx == Some(line_idx); let bg = if selected { selection_bg } else { normal_bg }; let mut op_mmap: Option<Mmap> = None; diff --git a/src/verb/internal_select.rs b/src/verb/internal_select.rs index ae1b2f7..4dd195b 100644 --- a/src/verb/internal_select.rs +++ b/src/verb/internal_select.rs @@ -139,7 +139,7 @@ pub fn on_path( warn!("bang in :select isn't supported yet"); } if tree.try_select_path(&path) { - tree.make_selection_visible(BrowserState::page_height(screen) as usize); + tree.make_selection_visible(BrowserState::page_height(screen)); } CmdResult::Keep } |