From 0a3a2ca935b7c05bc59b8d0063fc37bd58f9006c Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 5 Jan 2016 20:42:52 +0100 Subject: [PATCH] Fix clippy warnings --- src/uucore/c_types.rs | 4 ++-- src/uucore/fs.rs | 2 +- src/uucore/parse_time.rs | 2 +- src/uucore/signals.rs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/uucore/c_types.rs b/src/uucore/c_types.rs index cdc8b3649..477927ba0 100644 --- a/src/uucore/c_types.rs +++ b/src/uucore/c_types.rs @@ -109,7 +109,7 @@ extern { pub fn getgroupcount(name: *const c_char, gid: gid_t) -> int32_t; } -pub fn get_pw_from_args(free: &Vec) -> Option { +pub fn get_pw_from_args(free: &[String]) -> Option { if free.len() == 1 { let username = &free[0][..]; @@ -219,7 +219,7 @@ pub fn group(possible_pw: Option, nflag: bool) { Err(errno) => crash!(1, "failed to get group list (errno={})", errno), Ok(groups) => { - for &g in groups.iter() { + for &g in &groups { if nflag { let group = unsafe { getgrgid(g) }; if !group.is_null() { diff --git a/src/uucore/fs.rs b/src/uucore/fs.rs index 682abe00c..19a77e109 100644 --- a/src/uucore/fs.rs +++ b/src/uucore/fs.rs @@ -82,7 +82,7 @@ pub fn canonicalize>(original: P, can_mode: CanonicalizeMode) -> } // Resolve the symlinks where possible - if parts.len() > 0 { + if !parts.is_empty() { for part in parts[..parts.len()-1].iter() { result.push(part); diff --git a/src/uucore/parse_time.rs b/src/uucore/parse_time.rs index 608601fe1..2315edb98 100644 --- a/src/uucore/parse_time.rs +++ b/src/uucore/parse_time.rs @@ -10,7 +10,7 @@ pub fn from_str(string: &str) -> Result { let len = string.len(); if len == 0 { - return Err("empty string".to_string()) + return Err("empty string".to_owned()) } let slice = &string[..len - 1]; let (numstr, times) = match string.chars().next_back().unwrap() { diff --git a/src/uucore/signals.rs b/src/uucore/signals.rs index 62db82f1b..db360975a 100644 --- a/src/uucore/signals.rs +++ b/src/uucore/signals.rs @@ -141,7 +141,7 @@ pub fn signal_by_name_or_value(signal_name_or_value: &str) -> Option { if signal_name_or_value == "0" { return Some(0); } - for signal in ALL_SIGNALS.iter() { + for signal in &ALL_SIGNALS { let long_name = format!("SIG{}", signal.name); if signal.name == signal_name_or_value || (signal_name_or_value == signal.value.to_string()) || (long_name == signal_name_or_value) { return Some(signal.value);