diff options
| author | Sebastian Thiel <sebastian.thiel@icloud.com> | 2023-05-06 16:42:33 +0200 |
|---|---|---|
| committer | Sebastian Thiel <sebastian.thiel@icloud.com> | 2023-05-06 17:16:42 +0200 |
| commit | b7fd4dedecb015681fe5a5162b0591c17a462550 (patch) | |
| tree | 842636199dc23193d715b48436b47b71c0e2cee4 | |
| parent | 4ea325ef3dc7a62b18fbc09c1e3f4d04e06533c8 (diff) | |
thanks clippy
| -rw-r--r-- | src/common.rs | 2 | ||||
| -rw-r--r-- | src/interactive/app/handlers.rs | 2 | ||||
| -rw-r--r-- | src/interactive/app/tests/utils.rs | 2 | ||||
| -rw-r--r-- | src/traverse.rs | 16 |
4 files changed, 11 insertions, 11 deletions
diff --git a/src/common.rs b/src/common.rs index 3535e63..5ee6358 100644 --- a/src/common.rs +++ b/src/common.rs @@ -311,7 +311,7 @@ mod moonwalk { p.clear(); p.extend(parents); p.push(dent.file_name()); - self.opts.ignore_dirs.contains(&p) + self.opts.ignore_dirs.contains(p) }; if is_ignored { diff --git a/src/interactive/app/handlers.rs b/src/interactive/app/handlers.rs index a7c193c..8039900 100644 --- a/src/interactive/app/handlers.rs +++ b/src/interactive/app/handlers.rs @@ -322,7 +322,7 @@ impl AppState { traversal.entries_traversed = traversal.entries_traversed.saturating_sub(1); entries_deleted += 1; } - self.entries = sorted_entries(&tree, self.root, self.sorting, traversal.is_done()); + self.entries = sorted_entries(tree, self.root, self.sorting, traversal.is_done()); parent_idx }; if traversal.tree.lock().node_weight(self.root).is_none() { diff --git a/src/interactive/app/tests/utils.rs b/src/interactive/app/tests/utils.rs index bd6788f..ae219fb 100644 --- a/src/interactive/app/tests/utils.rs +++ b/src/interactive/app/tests/utils.rs @@ -50,7 +50,7 @@ pub fn index_by_name_and_size( let name = name.as_ref(); let t: Vec<_> = tree .node_indices() - .map(|idx| (idx, node_by_index(&tree, idx))) + .map(|idx| (idx, node_by_index(tree, idx))) .filter_map(|(idx, e)| { if e.name == name && size.map(|s| s == e.size).unwrap_or(true) { Some(idx) diff --git a/src/traverse.rs b/src/traverse.rs index 3501682..1d42e53 100644 --- a/src/traverse.rs +++ b/src/traverse.rs @@ -112,8 +112,10 @@ impl Traversal { Ok(dent) => { let (parent_idx, parent_size) = parents.next().expect("always the root node"); - let mut data = EntryData::default(); - data.name = dent.file_name().into(); + let mut data = EntryData { + name: dent.file_name().into(), + ..Default::default() + }; let file_size = match dent.metadata() { Ok(m) => compute_file_size( @@ -146,12 +148,10 @@ impl Traversal { if self.results.send(()).is_err() { WalkState::Quit + } else if dent.file_type().is_dir() { + WalkState::Continue((node_idx, Default::default())) } else { - if dent.file_type().is_dir() { - WalkState::Continue((node_idx, Default::default())) - } else { - WalkState::Skip - } + WalkState::Skip } } Err(_err) => { @@ -329,7 +329,7 @@ mod moonwalk { p.clear(); p.extend(parents.clone().map(|t| &t.0)); p.push(dent.file_name()); - self.opts.ignore_dirs.contains(&p) + self.opts.ignore_dirs.contains(p) }; if is_ignored { |