Mirrors/rip
2
0
Fork 0
mirror of https://github.com/nivekuil/rip synced 2024-11-10 06:04:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Appease clippy

Browse source
This commit is contained in:
nivekuil 2020-09-02 09:39:38 -07:00
parent c11239f3df
commit 0bda339cd6
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main.rs
View file

@ -20,8 +20,8 @@ use errors::*;
include!("util.rs"); include!("util.rs");
const GRAVEYARD: &'static str = "/tmp/graveyard"; const GRAVEYARD: &str = "/tmp/graveyard";
const RECORD: &'static str = ".record"; const RECORD: &str = ".record";
const LINES_TO_INSPECT: usize = 6; const LINES_TO_INSPECT: usize = 6;
const FILES_TO_INSPECT: usize = 6; const FILES_TO_INSPECT: usize = 6;
const BIG_FILE_THRESHOLD: u64 = 500000000; // 500 MB const BIG_FILE_THRESHOLD: u64 = 500000000; // 500 MB

7
src/util.rs
View file

@ -15,7 +15,7 @@ fn symlink_exists<P: AsRef<Path>>(path: P) -> bool {
} }
fn get_user() -> String { fn get_user() -> String {
env::var("USER").unwrap_or(String::from("unknown")) env::var("USER").unwrap_or_else(|_| String::from("unknown"))
} }
/// Prompt for user input, returning True if the first character is 'y' or 'Y' /// Prompt for user input, returning True if the first character is 'y' or 'Y'
@ -29,7 +29,7 @@ fn prompt_yes<T: AsRef<str>>(prompt: T) -> bool {
stdin.bytes().next() stdin.bytes().next()
.and_then(|c| c.ok()) .and_then(|c| c.ok())
.map(|c| c as char) .map(|c| c as char)
.and_then(|c| Some(c == 'y' || c == 'Y')) .map(|c| (c == 'y' || c == 'Y'))
.unwrap_or(false) .unwrap_or(false)
} }
@ -39,8 +39,7 @@ fn rename_grave<G: AsRef<Path>>(grave: G) -> PathBuf {
let name = grave.to_str().expect("Filename must be valid unicode."); let name = grave.to_str().expect("Filename must be valid unicode.");
(1_u64..) (1_u64..)
.map(|i| PathBuf::from(format!("{}~{}", name, i))) .map(|i| PathBuf::from(format!("{}~{}", name, i)))
.skip_while(|p| symlink_exists(p)) .find(|p| !symlink_exists(p))
.next()
.expect("Failed to rename duplicate file or directory") .expect("Failed to rename duplicate file or directory")
} }