matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Simplify implementation of remove_tag()

Browse source 
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
This commit is contained in:
Matthias Beyer 2019-06-26 20:15:31 +02:00
parent e95a4cd15d
commit 87bfb422dc
1 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -100,20 +100,11 @@ impl Tagable for Value {
}
fn remove_tag(&mut self, t: Tag) -> Result<()> {
if !is_tag_str(&t).map(|_| true)
.map_err(|s| format_err!("{}", s))
.context(err_msg("Not a tag"))?
{
debug!("Not a tag: '{}'", t);
return Err(format_err!("Not a tag: '{}'", t));
}
let _ = is_tag_str(&t)?;
self.get_tags()
.map(|mut tags| {
tags.retain(|tag| tag.clone() != t);
self.set_tags(&tags[..])
})
.map(|_| ())
let mut tags = self.get_tags()?;
tags.retain(|tag| *tag != t);
self.set_tags(&tags)
}
fn has_tag(&self, t: TagSlice) -> Result<bool> {