diff options
| author | Matthias Beyer <mail@beyermatthias.de> | 2017-08-26 17:53:08 +0200 |
|---|---|---|
| committer | Matthias Beyer <mail@beyermatthias.de> | 2017-08-28 12:22:37 +0200 |
| commit | c0c62bd1b5c5b9ece1d8289721dc8617987a7885 (patch) | |
| tree | 34b1acf7872eb10db152c0c1a9bf96bf52027e4a /lib/entry/libimagentrytag | |
| parent | 3024fefcb9d338919e0a3b5b1b90fb77d2313330 (diff) | |
Change crates to use toml-query crate
Diffstat (limited to 'lib/entry/libimagentrytag')
| -rw-r--r-- | lib/entry/libimagentrytag/Cargo.toml | 1 | ||||
| -rw-r--r-- | lib/entry/libimagentrytag/src/lib.rs | 1 | ||||
| -rw-r--r-- | lib/entry/libimagentrytag/src/tagable.rs | 10 |
3 files changed, 8 insertions, 4 deletions
diff --git a/lib/entry/libimagentrytag/Cargo.toml b/lib/entry/libimagentrytag/Cargo.toml index a58b33d0..1732fb64 100644 --- a/lib/entry/libimagentrytag/Cargo.toml +++ b/lib/entry/libimagentrytag/Cargo.toml @@ -21,6 +21,7 @@ toml = "^0.4" itertools = "0.5" is-match = "0.1" filters = "0.1" +toml-query = "0.3.0" libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" } libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" } diff --git a/lib/entry/libimagentrytag/src/lib.rs b/lib/entry/libimagentrytag/src/lib.rs index bfc4d461..f50980d8 100644 --- a/lib/entry/libimagentrytag/src/lib.rs +++ b/lib/entry/libimagentrytag/src/lib.rs @@ -36,6 +36,7 @@ extern crate itertools; #[macro_use] extern crate log; extern crate regex; extern crate toml; +extern crate toml_query; #[macro_use] extern crate is_match; extern crate filters; diff --git a/lib/entry/libimagentrytag/src/tagable.rs b/lib/entry/libimagentrytag/src/tagable.rs index bd53a122..1a182e57 100644 --- a/lib/entry/libimagentrytag/src/tagable.rs +++ b/lib/entry/libimagentrytag/src/tagable.rs @@ -21,7 +21,9 @@ use itertools::Itertools; use libimagstore::store::Entry; use libimagerror::into::IntoError; -use libimagstore::toml_ext::TomlValueExt; + +use toml_query::read::TomlValueReadExt; +use toml_query::set::TomlValueSetExt; use error::TagErrorKind; use error::MapErrInto; @@ -50,7 +52,7 @@ impl Tagable for Value { let tags = try!(self.read("imag.tags").map_err_into(TagErrorKind::HeaderReadError)); match tags { - Some(Value::Array(tags)) => { + Some(&Value::Array(ref tags)) => { if !tags.iter().all(|t| is_match!(*t, Value::String(_))) { return Err(TagErrorKind::TagTypeError.into()); } @@ -120,7 +122,7 @@ impl Tagable for Value { fn has_tag(&self, t: TagSlice) -> Result<bool> { let tags = try!(self.read("imag.tags").map_err_into(TagErrorKind::HeaderReadError)); - if !tags.iter().all(|t| is_match!(*t, Value::String(_))) { + if !tags.iter().all(|t| is_match!(*t, &Value::String(_))) { return Err(TagErrorKind::TagTypeError.into()); } @@ -128,7 +130,7 @@ impl Tagable for Value { .iter() .any(|tag| { match *tag { - Value::String(ref s) => { s == t }, + &Value::String(ref s) => { s == t }, _ => unreachable!() } })) |