matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Pulled out lambda and made "--debug" constant

Browse source
This commit is contained in:
geemili 2016-07-21 17:08:11 -05:00
parent d838a5c6b0
commit d60c558cda
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
bin/src/main.rs
View file

@ -11,6 +11,8 @@ use std::io::ErrorKind;
use walkdir::WalkDir; use walkdir::WalkDir;
use crossbeam::*; use crossbeam::*;
const DBG_FLAG: &'static str = "--debug";
fn help(cmds: Vec<String>) { fn help(cmds: Vec<String>) {
println!(r#" println!(r#"
@ -103,6 +105,10 @@ fn find_flag() -> Option<String> {
env::args().skip(1).filter(|x| x.starts_with("-")).next() env::args().skip(1).filter(|x| x.starts_with("-")).next()
} }
fn is_debug_flag<T: AsRef<str>>(ref s: &T) -> bool {
s.as_ref() == DBG_FLAG
}
fn find_args(command: &str) -> Vec<String> { fn find_args(command: &str) -> Vec<String> {
env::args() env::args()
.skip(1) .skip(1)
@ -125,7 +131,7 @@ fn main() {
}, },
}, },
}; };
let is_debug = env::args().skip(1).filter(|x| x == "--debug").next().is_some(); let is_debug = env::args().skip(1).find(is_debug_flag).is_some();
match &first_arg[..] { match &first_arg[..] {
"--help" | "-h" => { "--help" | "-h" => {
@ -159,8 +165,8 @@ fn main() {
s => { s => {
let mut subcommand_args = find_args(s); let mut subcommand_args = find_args(s);
if is_debug && subcommand_args.iter().find(|x| *x == "--debug").is_none() { if is_debug && subcommand_args.iter().find(is_debug_flag).is_none() {
subcommand_args.push(String::from("--debug")); subcommand_args.push(String::from(DBG_FLAG));
} }
match Command::new(format!("imag-{}", s)) match Command::new(format!("imag-{}", s))
.stdin(Stdio::inherit()) .stdin(Stdio::inherit())