twin/ripgrep
1
0
Fork 0
mirror of https://github.com/BurntSushi/ripgrep.git synced 2025-08-20 14:43:47 -07:00
Code Issues Packages Projects Releases Wiki Activity

Remove clap validator + add max-filesize integration tests

Browse Source
This commit is contained in:
Marc Tiehuis
2017-03-01 18:38:06 +13:00
committed by Andrew Gallant
parent 71585f6d47
commit adff43fbb4
5 changed files with 60 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/args.rs
View File

@@ -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"))
}
}