diff options
author | Marc Tiehuis <marctiehuis@gmail.com> | 2017-03-01 18:38:06 +1300 |
---|---|---|
committer | Andrew Gallant <jamslam@gmail.com> | 2017-03-08 10:17:18 -0500 |
commit | adff43fbb4ce7b0663759d445a944286583acaf4 (patch) | |
tree | 6da6a634a90465f129472d004fd1ec09f6188bab /src | |
parent | 71585f6d476265338e9ee4e924b4f43b02f2d233 (diff) |
Remove clap validator + add max-filesize integration tests
Diffstat (limited to 'src')
-rw-r--r-- | src/app.rs | 25 | ||||
-rw-r--r-- | src/args.rs | 16 |
2 files changed, 8 insertions, 33 deletions
@@ -1,7 +1,6 @@ use std::collections::HashMap; use clap::{App, AppSettings, Arg, ArgSettings}; -use regex::Regex; const ABOUT: &'static str = " ripgrep (rg) recursively searches your current directory for a regex pattern. @@ -147,8 +146,7 @@ fn app<F>(next_line_help: bool, doc: F) -> App<'static, 'static> .short("m").value_name("NUM").takes_value(true) .validator(validate_number)) .arg(flag("max-filesize") - .value_name("NUM+SUFFIX?").takes_value(true) - .validator(validate_max_filesize)) + .value_name("NUM+SUFFIX?").takes_value(true)) .arg(flag("maxdepth") .value_name("NUM").takes_value(true) .validator(validate_number)) @@ -502,24 +500,3 @@ lazy_static! { fn validate_number(s: String) -> Result<(), String> { s.parse::<usize>().map(|_|()).map_err(|err| err.to_string()) } - -fn validate_max_filesize(s: String) -> Result<(), String> { - let re = Regex::new(r#"^(\d+)([KMG])?$"#).unwrap(); - let caps = try!(re.captures(&s) - .ok_or("invalid format for max-filesize argument")); - - let value = caps.get(1); - let suffix = caps.get(2).map(|x| x.as_str()); - - match value { - Some(value) => { - try!(value.as_str().parse::<u64>().map_err(|err| err.to_string())); - } - None => () - } - - match suffix { - None | Some("K") | Some("M") | Some("G") => Ok(()), - _ => Err(From::from("invalid suffix for max-filesize argument")) - } -} diff --git a/src/args.rs b/src/args.rs index 5f6d9916..8cf7cd69 100644 --- a/src/args.rs +++ b/src/args.rs @@ -791,20 +791,18 @@ impl<'a> ArgMatches<'a> { None => return Ok(None) }; - let re = Regex::new(r#"^(\d+)([KMG])?$"#).unwrap(); + let re = Regex::new("^([0-9]+)([KMG])?$").unwrap(); let caps = try!(re.captures(&max_filesize) .ok_or("invalid format for max-filesize argument")); - let value = match caps.get(1) { - Some(value) => Some(try!(value.as_str().parse::<u64>())), - None => None - }; + let value = try!(caps[1].parse::<u64>().map_err(|err| err.to_string())); let suffix = caps.get(2).map(|x| x.as_str()); + match suffix { - None => Ok(value), - Some("K") => Ok(value.map(|x| x * 1024)), - Some("M") => Ok(value.map(|x| x * 1024 * 1024)), - Some("G") => Ok(value.map(|x| x * 1024 * 1024 * 1024)), + None => Ok(Some(value)), + Some("K") => Ok(Some(value * 1024)), + Some("M") => Ok(Some(value * 1024 * 1024)), + Some("G") => Ok(Some(value * 1024 * 1024 * 1024)), _ => Err(From::from("invalid suffix for max-filesize argument")) } } |