fix most clippy lints

This commit is contained in:
Alexandru Macovei 2019-01-26 03:13:16 +02:00 committed by David Peter
parent 6aa87f3423
commit fe53af064b
5 changed files with 11 additions and 11 deletions

View file

@ -219,7 +219,7 @@ pub fn build_app() -> App<'static, 'static> {
) )
} }
#[cfg_attr(rustfmt, rustfmt_skip)] #[rustfmt::skip]
fn usage() -> HashMap<&'static str, Help> { fn usage() -> HashMap<&'static str, Help> {
let mut h = HashMap::new(); let mut h = HashMap::new();
doc!(h, "hidden" doc!(h, "hidden"

View file

@ -24,7 +24,7 @@ const GIBI: u64 = MEBI * 1024;
const TEBI: u64 = GIBI * 1024; const TEBI: u64 = GIBI * 1024;
impl SizeFilter { impl SizeFilter {
pub fn from_string<'a>(s: &str) -> Option<Self> { pub fn from_string(s: &str) -> Option<Self> {
if !SIZE_CAPTURES.is_match(s) { if !SIZE_CAPTURES.is_match(s) {
return None; return None;
} }
@ -56,9 +56,9 @@ impl SizeFilter {
} }
pub fn is_within(&self, size: u64) -> bool { pub fn is_within(&self, size: u64) -> bool {
match self { match *self {
&SizeFilter::Max(limit) => size <= limit, SizeFilter::Max(limit) => size <= limit,
&SizeFilter::Min(limit) => size >= limit, SizeFilter::Min(limit) => size >= limit,
} }
} }
} }

View file

@ -49,7 +49,7 @@ fn main() {
// Get one or more root directories to search. // Get one or more root directories to search.
let mut dir_vec: Vec<_> = match matches let mut dir_vec: Vec<_> = match matches
.values_of("path") .values_of("path")
.or(matches.values_of("search-path")) .or_else(|| matches.values_of("search-path"))
{ {
Some(paths) => paths Some(paths) => paths
.map(|path| { .map(|path| {

View file

@ -19,7 +19,7 @@ use std::sync::Arc;
use ansi_term; use ansi_term;
/// Remove the `./` prefix from a path. /// Remove the `./` prefix from a path.
fn strip_current_dir<'a>(pathbuf: &'a PathBuf) -> &'a Path { fn strip_current_dir(pathbuf: &PathBuf) -> &Path {
let mut iter = pathbuf.components(); let mut iter = pathbuf.components();
let mut iter_next = iter.clone(); let mut iter_next = iter.clone();
if iter_next.next() == Some(Component::CurDir) { if iter_next.next() == Some(Component::CurDir) {
@ -70,7 +70,7 @@ fn print_entry_colorized(
write!(stdout, "{}", style.paint(component.to_string_lossy()))?; write!(stdout, "{}", style.paint(component.to_string_lossy()))?;
if wants_to_quit.load(Ordering::Relaxed) { if wants_to_quit.load(Ordering::Relaxed) {
write!(stdout, "\n")?; writeln!(stdout)?;
process::exit(ExitCode::KilledBySigint.into()); process::exit(ExitCode::KilledBySigint.into());
} }
} }
@ -78,7 +78,7 @@ fn print_entry_colorized(
if config.null_separator { if config.null_separator {
write!(stdout, "\0") write!(stdout, "\0")
} else { } else {
writeln!(stdout, "") writeln!(stdout)
} }
} }

View file

@ -304,7 +304,7 @@ fn spawn_senders(
// Filter out unwanted extensions. // Filter out unwanted extensions.
if let Some(ref exts_regex) = config.extensions { if let Some(ref exts_regex) = config.extensions {
if let Some(path_str) = entry_path.file_name().map_or(None, |s| s.to_str()) { if let Some(path_str) = entry_path.file_name().and_then(|s| s.to_str()) {
if !exts_regex.is_match(path_str) { if !exts_regex.is_match(path_str) {
return ignore::WalkState::Continue; return ignore::WalkState::Continue;
} }
@ -314,7 +314,7 @@ fn spawn_senders(
} }
// Filter out unwanted sizes if it is a file and we have been given size constraints. // Filter out unwanted sizes if it is a file and we have been given size constraints.
if config.size_constraints.len() > 0 { if !config.size_constraints.is_empty() {
if entry_path.is_file() { if entry_path.is_file() {
if let Ok(metadata) = entry_path.metadata() { if let Ok(metadata) = entry_path.metadata() {
let file_size = metadata.len(); let file_size = metadata.len();