gitea-mirror/dust
1
0
Fork 0
mirror of https://github.com/bootandy/dust.git synced 2025-12-12 15:49:58 -08:00
Code Issues Packages Projects Releases Wiki Activity

Clean up clippy warnings

Browse Source
This commit is contained in:
andy.boot
2020-01-19 09:32:35 +00:00
parent d97edba041
commit 842a8ec673
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/utils/mod.rs
View File

@@ -76,7 +76,6 @@ pub fn get_dir_tree(
threads: Option<usize>, threads: Option<usize>,
) -> (bool, HashMap<String, u64>) { ) -> (bool, HashMap<String, u64>) {
let mut permissions = 0; let mut permissions = 0;
let mut inodes: HashSet<(u64, u64)> = HashSet::new();
let mut data: HashMap<String, u64> = HashMap::new(); let mut data: HashMap<String, u64> = HashMap::new();
let restricted_filesystems = if limit_filesystem { let restricted_filesystems = if limit_filesystem {
get_allowed_filesystems(top_level_names) get_allowed_filesystems(top_level_names)
@@ -90,7 +89,6 @@ pub fn get_dir_tree(
apparent_size, apparent_size,
&restricted_filesystems, &restricted_filesystems,
&ignore_directory, &ignore_directory,
&mut inodes,
&mut data, &mut data,
&mut permissions, &mut permissions,
threads, threads,
@@ -121,11 +119,11 @@ fn examine_dir(
apparent_size: bool, apparent_size: bool,
filesystems: &Option<HashSet<u64>>, filesystems: &Option<HashSet<u64>>,
ignore_directory: &Option<&str>, ignore_directory: &Option<&str>,
inodes: &mut HashSet<(u64, u64)>,
data: &mut HashMap<String, u64>, data: &mut HashMap<String, u64>,
file_count_no_permission: &mut u64, file_count_no_permission: &mut u64,
threads: Option<usize>, threads: Option<usize>,
) { ) {
let mut inodes: HashSet<(u64, u64)> = HashSet::new();
let mut iter = WalkDir::new(top_dir) let mut iter = WalkDir::new(top_dir)
.preload_metadata(true) .preload_metadata(true)
.skip_hidden(false); .skip_hidden(false);
@@ -135,18 +133,15 @@ fn examine_dir(
for entry in iter { for entry in iter {
if let Ok(e) = entry { if let Ok(e) = entry {
let maybe_size_and_inode = get_metadata(&e, apparent_size); let maybe_size_and_inode = get_metadata(&e, apparent_size);
match ignore_directory { if let Some(d) = ignore_directory {
Some(d) => { if e.path().to_string_lossy().contains(*d) {
if e.path().to_string_lossy().contains(*d) { continue;
continue;
}
} }
_ => {}
} }
match maybe_size_and_inode { match maybe_size_and_inode {
Some((size, maybe_inode)) => { Some((size, maybe_inode)) => {
if !should_ignore_file(apparent_size, filesystems, inodes, maybe_inode) { if !should_ignore_file(apparent_size, filesystems, &mut inodes, maybe_inode) {
process_file_with_size_and_inode(top_dir, data, e, size) process_file_with_size_and_inode(top_dir, data, e, size)
} }
} }