matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Tagable should not be implemented for Value

Browse source 
Oh my dear, what was I thinking?

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
This commit is contained in:
Matthias Beyer 2019-06-26 20:23:25 +02:00
parent 51dad94cc9
commit c5519da011
1 changed files with 3 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -31,8 +31,6 @@ use failure::Fallible as Result;
use crate::tag::{Tag, TagSlice}; use crate::tag::{Tag, TagSlice};
use crate::tag::is_tag_str; use crate::tag::is_tag_str;
use toml::Value;
pub trait Tagable { pub trait Tagable {
fn get_tags(&self) -> Result<Vec<Tag>>; fn get_tags(&self) -> Result<Vec<Tag>>;
@ -56,10 +54,11 @@ impl<'a> Partial<'a> for TagHeader {
type Output = Self; type Output = Self;
} }
impl Tagable for Value { impl Tagable for Entry {
fn get_tags(&self) -> Result<Vec<Tag>> { fn get_tags(&self) -> Result<Vec<Tag>> {
self.read_partial::<TagHeader>()? self.get_header()
.read_partial::<TagHeader>()?
.map(|header| { .map(|header| {
let _ = header.values let _ = header.values
.iter() .iter()
@ -114,33 +113,6 @@ impl Tagable for Value {
tags.iter().map(|t| self.has_tag(t)).fold(Ok(true), |a, e| a.and_then(|b| Ok(b && e?))) tags.iter().map(|t| self.has_tag(t)).fold(Ok(true), |a, e| a.and_then(|b| Ok(b && e?)))
} }
}
impl Tagable for Entry {
fn get_tags(&self) -> Result<Vec<Tag>> {
self.get_header().get_tags()
}
fn set_tags(&mut self, ts: &[Tag]) -> Result<()> {
self.get_header_mut().set_tags(ts)
}
fn add_tag(&mut self, t: Tag) -> Result<()> {
self.get_header_mut().add_tag(t)
}
fn remove_tag(&mut self, t: Tag) -> Result<()> {
self.get_header_mut().remove_tag(t)
}
fn has_tag(&self, t: TagSlice) -> Result<bool> {
self.get_header().has_tag(t)
}
fn has_tags(&self, ts: &[Tag]) -> Result<bool> {
self.get_header().has_tags(ts)
}
} }