Merge pull request #968 from matthiasbeyer/libimagentrytag/validator-helper-enhancement

Add is_tag_str(&str) wrapper for is_tag(String)
This commit is contained in:
Matthias Beyer 2017-06-17 12:54:13 +02:00 committed by GitHub
commit 71e3d3d2d1

View file

@ -22,13 +22,17 @@ pub type TagSlice<'a> = &'a str;
/// validator which can be used by clap to validate that a string is a valid tag
pub fn is_tag(s: String) -> Result<(), String> {
is_tag_str(&s)
}
pub fn is_tag_str(s: &String) -> Result<(), String> {
use filters::filter::Filter;
let is_lower = |s: &String| s.chars().all(|c| c.is_lowercase());
let no_whitespace = |s: &String| s.chars().all(|c| !c.is_whitespace());
let is_alphanum = |s: &String| s.chars().all(|c| c.is_alphanumeric());
if is_lower.and(no_whitespace).and(is_alphanum).filter(&s) {
if is_lower.and(no_whitespace).and(is_alphanum).filter(s) {
Ok(())
} else {
Err(format!("The string '{}' is not a valid tag", s))