matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

[No-auto] lib/entry/tag: Fix Clippy warnings

Browse source 
Signed-off-by: flip1995 <hello@philkrones.com>
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
This commit is contained in:
flip1995 2019-08-27 10:28:16 +02:00 committed by Matthias Beyer
parent fae9f82c67
commit c8a7aacf99
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/entry/libimagentrytag/src/tag.rs
View file

@ -29,15 +29,15 @@ pub fn is_tag(s: String) -> Result<(), String> {
is_tag_str(&s).map_err(|_| format!("The string '{}' is not a valid tag", s)) is_tag_str(&s).map_err(|_| format!("The string '{}' is not a valid tag", s))
} }
pub fn is_tag_str(s: &String) -> Result<(), Error> { pub fn is_tag_str(s: &str) -> Result<(), Error> {
use filters::filter::Filter; use filters::filter::Filter;
trace!("Checking whether '{}' is a valid tag", s); trace!("Checking whether '{}' is a valid tag", s);
let is_lower = |s: &String| s.chars().all(|c| c.is_lowercase()); let is_lower = |s: &&str| s.chars().all(|c| c.is_lowercase());
let no_whitespace = |s: &String| s.chars().all(|c| !c.is_whitespace()); let no_whitespace = |s: &&str| s.chars().all(|c| !c.is_whitespace());
let is_alphanum = |s: &String| s.chars().all(|c| c.is_alphanumeric()); let is_alphanum = |s: &&str| 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(()) Ok(())
} else { } else {
Err(format_err!("The string '{}' is not a valid tag", s)) Err(format_err!("The string '{}' is not a valid tag", s))

4
lib/entry/libimagentrytag/src/tagable.rs
View file

@ -62,7 +62,7 @@ impl Tagable for Entry {
.map(|header| { .map(|header| {
header.values header.values
.iter() .iter()
.map(is_tag_str) .map(|val| is_tag_str(val))
.collect::<Result<_>>()?; .collect::<Result<_>>()?;
Ok(header.values) Ok(header.values)
@ -73,7 +73,7 @@ impl Tagable for Entry {
fn set_tags(&mut self, ts: &[Tag]) -> Result<()> { fn set_tags(&mut self, ts: &[Tag]) -> Result<()> {
let _ = ts let _ = ts
.iter() .iter()
.map(is_tag_str) .map(|val| is_tag_str(val))
.collect::<Result<Vec<_>>>()?; .collect::<Result<Vec<_>>>()?;
let header = TagHeader { let header = TagHeader {