~matthiasbeyer/imag

b1330c9916453073a32d429346bd3c0125dd6a45 — Matthias Beyer 1 year, 10 months ago b4e25df + a7d53e4
Merge branch 'update-toml-dependencies'
52 files changed, 119 insertions(+), 122 deletions(-)

M bin/core/imag-annotate/Cargo.toml
M bin/core/imag-category/Cargo.toml
M bin/core/imag-diagnostics/Cargo.toml
M bin/core/imag-edit/Cargo.toml
M bin/core/imag-git/Cargo.toml
M bin/core/imag-gps/Cargo.toml
M bin/core/imag-header/Cargo.toml
M bin/core/imag-ids/Cargo.toml
M bin/core/imag-init/Cargo.toml
M bin/core/imag-link/Cargo.toml
M bin/core/imag-store/Cargo.toml
M bin/core/imag-store/src/util.rs
M bin/core/imag-tag/Cargo.toml
M bin/core/imag-view/Cargo.toml
M bin/core/imag/Cargo.toml
M bin/domain/imag-bookmark/Cargo.toml
M bin/domain/imag-contact/Cargo.toml
M bin/domain/imag-diary/Cargo.toml
M bin/domain/imag-habit/Cargo.toml
M bin/domain/imag-log/Cargo.toml
M bin/domain/imag-mail/Cargo.toml
M bin/domain/imag-todo/Cargo.toml
M bin/domain/imag-wiki/Cargo.toml
M lib/core/libimagrt/Cargo.toml
M lib/core/libimagstore/Cargo.toml
M lib/core/libimagstore/src/store.rs
M lib/domain/libimagcontact/Cargo.toml
M lib/domain/libimagdiary/Cargo.toml
M lib/domain/libimaghabit/Cargo.toml
M lib/domain/libimaglog/Cargo.toml
M lib/domain/libimagmail/Cargo.toml
M lib/domain/libimagnotes/Cargo.toml
M lib/domain/libimagtimetrack/Cargo.toml
M lib/domain/libimagtodo/Cargo.toml
M lib/domain/libimagtodo/src/taskstore.rs
M lib/domain/libimagwiki/Cargo.toml
M lib/entry/libimagentryannotation/Cargo.toml
M lib/entry/libimagentrycategory/Cargo.toml
M lib/entry/libimagentrydatetime/Cargo.toml
M lib/entry/libimagentryedit/Cargo.toml
M lib/entry/libimagentryfilter/Cargo.toml
M lib/entry/libimagentrygps/Cargo.toml
M lib/entry/libimagentrygps/src/types.rs
M lib/entry/libimagentrylink/Cargo.toml
M lib/entry/libimagentrylink/src/external.rs
M lib/entry/libimagentrylink/src/internal.rs
M lib/entry/libimagentryref/Cargo.toml
M lib/entry/libimagentryref/src/reference.rs
M lib/entry/libimagentrytag/Cargo.toml
M lib/entry/libimagentryutil/Cargo.toml
M lib/entry/libimagentryview/Cargo.toml
M lib/etc/libimaginteraction/Cargo.toml
M bin/core/imag-annotate/Cargo.toml => bin/core/imag-annotate/Cargo.toml +2 -2
@@ 22,8 22,8 @@ maintenance                       = { status     = "actively-developed" }
[dependencies]
log = "0.4.0"
url = "1.2"
toml = "0.4"
toml-query = "0.8"
toml = "0.5"
toml-query = "0.9"
failure = "0.1"

libimagstore           = { version = "0.10.0", path = "../../../lib/core/libimagstore" }

M bin/core/imag-category/Cargo.toml => bin/core/imag-category/Cargo.toml +2 -2
@@ 21,8 21,8 @@ maintenance                       = { status     = "actively-developed" }

[dependencies]
log = "0.4.0"
toml = "0.4"
toml-query = "0.8"
toml = "0.5"
toml-query = "0.9"
failure = "0.1"

libimagstore           = { version = "0.10.0", path = "../../../lib/core/libimagstore" }

M bin/core/imag-diagnostics/Cargo.toml => bin/core/imag-diagnostics/Cargo.toml +2 -2
@@ 15,8 15,8 @@ homepage      = "http://imag-pim.org"

[dependencies]
log  = "0.4"
toml = "0.4"
toml-query = "0.8"
toml = "0.5"
toml-query = "0.9"
indicatif  = "0.9"
failure    = "0.1"


M bin/core/imag-edit/Cargo.toml => bin/core/imag-edit/Cargo.toml +2 -2
@@ 22,8 22,8 @@ maintenance                       = { status     = "actively-developed" }
[dependencies]
log          =  "0.4"
version      =  "3"
toml         =  "0.4"
toml-query   =  "0.8"
toml         =  "0.5"
toml-query   =  "0.9"
failure      =  "0.1"

libimagstore     = { version = "0.10.0", path = "../../../lib/core/libimagstore" }

M bin/core/imag-git/Cargo.toml => bin/core/imag-git/Cargo.toml +2 -2
@@ 21,8 21,8 @@ maintenance                       = { status     = "actively-developed" }

[dependencies]
log        = "0.4"
toml       = "0.4"
toml-query = "0.8"
toml       = "0.5"
toml-query = "0.9"

libimagrt    = { version = "0.10.0", path = "../../../lib/core/libimagrt" }
libimagerror = { version = "0.10.0", path = "../../../lib/core/libimagerror" }

M bin/core/imag-gps/Cargo.toml => bin/core/imag-gps/Cargo.toml +2 -2
@@ 22,8 22,8 @@ maintenance                       = { status     = "actively-developed" }
[dependencies]
log = "0.4.0"
url = "1.2"
toml = "0.4"
toml-query = "0.8"
toml = "0.5"
toml-query = "0.9"
failure = "0.1"

libimagstore     = { version = "0.10.0", path = "../../../lib/core/libimagstore" }

M bin/core/imag-header/Cargo.toml => bin/core/imag-header/Cargo.toml +2 -2
@@ 22,8 22,8 @@ maintenance                       = { status     = "actively-developed" }
[dependencies]
log          =  "0.4"
version      =  "2.0.1"
toml         =  "0.4"
toml-query   =  "0.8"
toml         =  "0.5"
toml-query   =  "0.9"
filters      =  "0.3"
failure      = "0.1"


M bin/core/imag-ids/Cargo.toml => bin/core/imag-ids/Cargo.toml +2 -2
@@ 23,8 23,8 @@ maintenance                       = { status     = "actively-developed" }
filters    = "0.3"
nom        = "3.2"
log        = "0.4"
toml       = "0.4"
toml-query = "0.8"
toml       = "0.5"
toml-query = "0.9"
is-match   = "0.1"
failure    = "0.1"


M bin/core/imag-init/Cargo.toml => bin/core/imag-init/Cargo.toml +1 -1
@@ 29,5 29,5 @@ default-features = false
features = ["color", "suggestions", "wrap_help"]

[dev-dependencies]
toml = "0.4"
toml = "0.5"


M bin/core/imag-link/Cargo.toml => bin/core/imag-link/Cargo.toml +2 -2
@@ 22,8 22,8 @@ maintenance                       = { status     = "actively-developed" }
[dependencies]
log = "0.4.0"
url = "1.5"
toml = "0.4"
toml-query = "0.8"
toml = "0.5"
toml-query = "0.9"
prettytable-rs = "0.8"
failure        = "0.1"


M bin/core/imag-store/Cargo.toml => bin/core/imag-store/Cargo.toml +2 -2
@@ 21,7 21,7 @@ maintenance                       = { status     = "actively-developed" }

[dependencies]
log = "0.4.0"
toml = "0.4"
toml = "0.5"
failure = "0.1"

libimagstore = { version = "0.10.0", path = "../../../lib/core/libimagstore", features = ["verify"] }


@@ 50,5 50,5 @@ default-features = false
features         = ["testing"]

[dev-dependencies.toml-query]
version          = "0.8"
version          = "0.9"


M bin/core/imag-store/src/util.rs => bin/core/imag-store/src/util.rs +3 -3
@@ 18,11 18,11 @@
//

use std::borrow::Cow;
use std::collections::btree_map::{BTreeMap, Entry};
use std::str::Split;

use clap::ArgMatches;
use toml::Value;
use toml::map::{Map, Entry};

use libimagutil::key_value_split::IntoKeyValue;



@@ 55,7 55,7 @@ pub fn build_toml_header(matches: &ArgMatches, mut header: Value) -> Value {
fn insert_key_into<'a>(current: String,
                   rest_path: &mut Split<char>,
                   value: Cow<'a, str>,
                   map: &mut BTreeMap<String, Value>) {
                   map: &mut Map<String, Value>) {
    let next = rest_path.next();

    if next.is_none() {


@@ 73,7 73,7 @@ fn insert_key_into<'a>(current: String,
                }
            },
            Entry::Vacant(v) => { v.insert(Value::Table( {
                let mut submap = BTreeMap::new();
                let mut submap = Map::new();
                insert_key_into(String::from(next.unwrap()), rest_path, value, &mut submap);
                debug!("Inserting submap = {:?}", submap);
                submap }));

M bin/core/imag-tag/Cargo.toml => bin/core/imag-tag/Cargo.toml +2 -2
@@ 21,7 21,7 @@ maintenance                       = { status     = "actively-developed" }

[dependencies]
log = "0.4.0"
toml = "0.4"
toml = "0.5"
failure = "0.1"

libimagstore    = { version = "0.10.0", path = "../../../lib/core/libimagstore" }


@@ 36,7 36,7 @@ default-features = false
features = ["color", "suggestions", "wrap_help"]

[dev-dependencies]
toml-query = "0.8"
toml-query = "0.9"
env_logger = "0.5"

[dev-dependencies.libimagutil]

M bin/core/imag-view/Cargo.toml => bin/core/imag-view/Cargo.toml +2 -2
@@ 21,8 21,8 @@ maintenance                       = { status     = "actively-developed" }

[dependencies]
log = "0.4.0"
toml = "0.4"
toml-query = "0.8"
toml = "0.5"
toml-query = "0.9"
handlebars = "1.0"
tempfile = "3"
failure = "0.1"

M bin/core/imag/Cargo.toml => bin/core/imag/Cargo.toml +2 -2
@@ 32,8 32,8 @@ maintenance                       = { status     = "actively-developed" }
[dependencies]
walkdir = "2"
log = "0.4.0"
toml = "0.4"
toml-query = "0.8"
toml = "0.5"
toml-query = "0.9"

libimagerror = { version = "0.10.0", path = "../../../lib/core/libimagerror" }
libimagstore = { version = "0.10.0", path = "../../../lib/core/libimagstore" }

M bin/domain/imag-bookmark/Cargo.toml => bin/domain/imag-bookmark/Cargo.toml +2 -2
@@ 21,8 21,8 @@ maintenance                       = { status     = "actively-developed" }

[dependencies]
log = "0.4.0"
toml = "0.4"
toml-query = "0.8"
toml = "0.5"
toml-query = "0.9"
failure = "0.1"

libimagrt        = { version = "0.10.0", path = "../../../lib/core/libimagrt" }

M bin/domain/imag-contact/Cargo.toml => bin/domain/imag-contact/Cargo.toml +2 -4
@@ 21,7 21,7 @@ maintenance                       = { status     = "actively-developed" }

[dependencies]
log = "0.4.0"
toml = "0.4"
toml = "0.5"
vobject    = "0.7"
handlebars = "1.0"
walkdir = "2"


@@ 44,8 44,6 @@ default-features = false
features = ["color", "suggestions", "wrap_help"]

[dependencies.toml-query]
#version          = "0.8"
version          = "0.9"
default-features = false
features         = ["typed"]
git              = "https://github.com/matthiasbeyer/toml-query"
branch           = "master"

M bin/domain/imag-diary/Cargo.toml => bin/domain/imag-diary/Cargo.toml +2 -2
@@ 22,8 22,8 @@ maintenance                       = { status     = "actively-developed" }
[dependencies]
chrono = "0.4"
log = "0.4.0"
toml = "0.4"
toml-query = "0.8"
toml = "0.5"
toml-query = "0.9"
itertools = "0.7"
failure = "0.1"


M bin/domain/imag-habit/Cargo.toml => bin/domain/imag-habit/Cargo.toml +2 -2
@@ 22,8 22,8 @@ maintenance                       = { status     = "actively-developed" }
[dependencies]
chrono = "0.4"
log = "0.4"
toml = "0.4"
toml-query = "0.8"
toml = "0.5"
toml-query = "0.9"
kairos = "0.3"
prettytable-rs = "0.8"
failure = "0.1"

M bin/domain/imag-log/Cargo.toml => bin/domain/imag-log/Cargo.toml +2 -2
@@ 21,8 21,8 @@ maintenance                       = { status     = "actively-developed" }

[dependencies]
log = "0.4"
toml = "0.4"
toml-query = "0.8"
toml = "0.5"
toml-query = "0.9"
is-match = "0.1"
itertools = "0.7"
failure = "0.1"

M bin/domain/imag-mail/Cargo.toml => bin/domain/imag-mail/Cargo.toml +1 -1
@@ 37,7 37,7 @@ default-features = false
features = ["color", "suggestions", "wrap_help"]

[dependencies.toml-query]
version = "0.8"
version = "0.9"
default-features = false
features = ["typed"]


M bin/domain/imag-todo/Cargo.toml => bin/domain/imag-todo/Cargo.toml +2 -2
@@ 21,8 21,8 @@ maintenance                       = { status     = "actively-developed" }

[dependencies]
log = "0.4.0"
toml = "0.4"
toml-query = "0.8"
toml = "0.5"
toml-query = "0.9"
is-match = "0.1"
failure  = "0.1"


M bin/domain/imag-wiki/Cargo.toml => bin/domain/imag-wiki/Cargo.toml +2 -2
@@ 16,8 16,8 @@ homepage      = "http://imag-pim.org"
[dependencies]
clap = ">=2.17"
log = "0.4"
toml = "0.4"
toml-query = "0.8"
toml = "0.5"
toml-query = "0.9"
is-match = "0.1"
regex = "1"
filters = "0.3"

M lib/core/libimagrt/Cargo.toml => lib/core/libimagrt/Cargo.toml +2 -2
@@ 21,11 21,11 @@ maintenance                       = { status     = "actively-developed" }

[dependencies]
env_logger = "0.5"
toml = "0.4"
toml = "0.5"
xdg-basedir = "1.0"
itertools = "0.7"
ansi_term = "0.11"
toml-query = "0.8"
toml-query = "0.9"
atty = "0.2"
failure        = "0.1"
failure_derive = "0.1"

M lib/core/libimagstore/Cargo.toml => lib/core/libimagstore/Cargo.toml +2 -2
@@ 24,12 24,12 @@ glob = "0.2.11"
log = "0.4.0"
regex = "1"
semver = "0.9"
toml = "0.4"
toml = "0.5"
walkdir = "2"
is-match = "0.1"
serde = "1"
serde_json = "1"
toml-query = "0.8"
toml-query = "0.9"
failure    = "0.1"

libimagerror = { version = "0.10.0", path = "../../../lib/core/libimagerror" }

M lib/core/libimagstore/src/store.rs => lib/core/libimagstore/src/store.rs +15 -14
@@ 18,7 18,6 @@
//

use std::collections::HashMap;
use std::collections::BTreeMap;
use std::ops::Drop;
use std::path::PathBuf;
use std::result::Result as RResult;


@@ 774,11 773,13 @@ impl Entry {
    ///
    /// This function should be used to get a new Header, as the default header may change. Via
    /// this function, compatibility is ensured.
    pub fn default_header() -> Value { // BTreeMap<String, Value>
        let mut m = BTreeMap::new();
    pub fn default_header() -> Value { // Map<String, Value>
        use toml::map::Map;

        let mut m = Map::new();

        m.insert(String::from("imag"), {
            let mut imag_map = BTreeMap::<String, Value>::new();
            let mut imag_map = Map::new();

            imag_map.insert(String::from("version"),
                Value::String(String::from(env!("CARGO_PKG_VERSION"))));


@@ 930,12 931,12 @@ fn has_imag_version_in_main_section(t: &Value) -> Result<bool> {
mod test {
    extern crate env_logger;

    use std::collections::BTreeMap;
    use crate::storeid::StoreId;
    use crate::store::has_main_section;
    use crate::store::has_imag_version_in_main_section;

    use toml::Value;
    use toml::map::Map;

    fn setup_logging() {
        let _ = env_logger::try_init();


@@ 943,15 944,15 @@ mod test {

    #[test]
    fn test_imag_section() {
        let mut map = BTreeMap::new();
        map.insert("imag".into(), Value::Table(BTreeMap::new()));
        let mut map = Map::new();
        map.insert("imag".into(), Value::Table(Map::new()));

        assert!(has_main_section(&Value::Table(map)).unwrap());
    }

    #[test]
    fn test_imag_abscent_main_section() {
        let mut map = BTreeMap::new();
        let mut map = Map::new();
        map.insert("not_imag".into(), Value::Boolean(false));

        assert!(has_main_section(&Value::Table(map)).is_err());


@@ 959,16 960,16 @@ mod test {

    #[test]
    fn test_main_section_without_version() {
        let mut map = BTreeMap::new();
        map.insert("imag".into(), Value::Table(BTreeMap::new()));
        let mut map = Map::new();
        map.insert("imag".into(), Value::Table(Map::new()));

        assert!(has_imag_version_in_main_section(&Value::Table(map)).is_err());
    }

    #[test]
    fn test_main_section_with_version() {
        let mut map = BTreeMap::new();
        let mut sub = BTreeMap::new();
        let mut map = Map::new();
        let mut sub = Map::new();
        sub.insert("version".into(), Value::String("0.0.0".into()));
        map.insert("imag".into(), Value::Table(sub));



@@ 977,8 978,8 @@ mod test {

    #[test]
    fn test_main_section_with_version_in_wrong_type() {
        let mut map = BTreeMap::new();
        let mut sub = BTreeMap::new();
        let mut map = Map::new();
        let mut sub = Map::new();
        sub.insert("version".into(), Value::Boolean(false));
        map.insert("imag".into(), Value::Table(sub));


M lib/domain/libimagcontact/Cargo.toml => lib/domain/libimagcontact/Cargo.toml +2 -2
@@ 22,8 22,8 @@ maintenance                       = { status     = "actively-developed" }
[dependencies]
failure      = "0.1"
log          = "0.4"
toml         = "0.4"
toml-query   = "0.8"
toml         = "0.5"
toml-query   = "0.9"
vobject      = "0.7"
uuid         = "0.7"
serde        = "1"

M lib/domain/libimagdiary/Cargo.toml => lib/domain/libimagdiary/Cargo.toml +2 -2
@@ 22,8 22,8 @@ maintenance                       = { status     = "actively-developed" }
[dependencies]
chrono = "0.4"
log = "0.4.0"
toml = "0.4"
toml-query = "0.8"
toml = "0.5"
toml-query = "0.9"
itertools = "0.7"
failure = "0.1"
filters = "0.3"

M lib/domain/libimaghabit/Cargo.toml => lib/domain/libimaghabit/Cargo.toml +2 -2
@@ 22,8 22,8 @@ maintenance                       = { status     = "actively-developed" }
[dependencies]
chrono = "0.4"
log = "0.4"
toml = "0.4"
toml-query = "0.8"
toml = "0.5"
toml-query = "0.9"
kairos     = "0.3"
failure    = "0.1"


M lib/domain/libimaglog/Cargo.toml => lib/domain/libimaglog/Cargo.toml +2 -2
@@ 20,8 20,8 @@ is-it-maintained-open-issues      = { repository = "matthiasbeyer/imag" }
maintenance                       = { status     = "actively-developed" }

[dependencies]
toml       = "0.4"
toml-query = "0.8"
toml       = "0.5"
toml-query = "0.9"
failure    = "0.1"

libimagstore     = { version = "0.10.0", path = "../../../lib/core/libimagstore" }

M lib/domain/libimagmail/Cargo.toml => lib/domain/libimagmail/Cargo.toml +2 -2
@@ 21,8 21,8 @@ maintenance                       = { status     = "actively-developed" }

[dependencies]
log = "0.4.0"
toml = "0.4"
toml-query = "0.8"
toml = "0.5"
toml-query = "0.9"
mailparse = "0.6.5"
filters = "0.3"
failure = "0.1"

M lib/domain/libimagnotes/Cargo.toml => lib/domain/libimagnotes/Cargo.toml +2 -2
@@ 21,8 21,8 @@ maintenance                       = { status     = "actively-developed" }

[dependencies]
log = "0.4.0"
toml = "0.4"
toml-query = "0.8"
toml = "0.5"
toml-query = "0.9"
failure = "0.1"

libimagstore     = { version = "0.10.0", path = "../../../lib/core/libimagstore" }

M lib/domain/libimagtimetrack/Cargo.toml => lib/domain/libimagtimetrack/Cargo.toml +2 -2
@@ 22,8 22,8 @@ maintenance                       = { status     = "actively-developed" }
[dependencies]
filters = "0.3"
chrono = "0.4"
toml = "0.4"
toml-query = "0.8"
toml = "0.5"
toml-query = "0.9"
lazy_static = "1.2"
is-match = "0.1"
failure  = "0.1"

M lib/domain/libimagtodo/Cargo.toml => lib/domain/libimagtodo/Cargo.toml +2 -2
@@ 22,8 22,8 @@ maintenance                       = { status     = "actively-developed" }
[dependencies]
task-hookrs = "0.6.0"
uuid = "0.7"
toml = "0.4"
toml-query = "0.8"
toml = "0.5"
toml-query = "0.9"
log = "0.4.0"
serde_json = "1"
failure = "0.1"

M lib/domain/libimagtodo/src/taskstore.rs => lib/domain/libimagtodo/src/taskstore.rs +2 -2
@@ 17,11 17,11 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
//

use std::collections::BTreeMap;
use std::io::BufRead;
use std::result::Result as RResult;

use toml::Value;
use toml::map::Map;
use uuid::Uuid;

use task_hookrs::task::Task as TTask;


@@ 167,7 167,7 @@ impl<'a> TaskStore<'a> for Store {
                {
                    let hdr = fle.get_header_mut();
                    if hdr.read("todo")?.is_none() {
                        hdr.set("todo", Value::Table(BTreeMap::new()))?;
                        hdr.set("todo", Value::Table(Map::new()))?;
                    }

                    hdr.set("todo.uuid", Value::String(format!("{}",uuid)))?;

M lib/domain/libimagwiki/Cargo.toml => lib/domain/libimagwiki/Cargo.toml +2 -2
@@ 21,8 21,8 @@ maintenance                       = { status     = "actively-developed" }

[dependencies]
log         = "0.4"
toml        = "0.4"
toml-query  = "0.8"
toml        = "0.5"
toml-query  = "0.9"
filters     = "0.3"
failure     = "0.1"


M lib/entry/libimagentryannotation/Cargo.toml => lib/entry/libimagentryannotation/Cargo.toml +2 -2
@@ 21,8 21,8 @@ maintenance                       = { status     = "actively-developed" }

[dependencies]
lazy_static = "1.2"
toml = "0.4"
toml-query = "0.8"
toml = "0.5"
toml-query = "0.9"
failure        = "0.1"
failure_derive = "0.1"
uuid           = { version = "0.7", features = ["v4"] }

M lib/entry/libimagentrycategory/Cargo.toml => lib/entry/libimagentrycategory/Cargo.toml +2 -2
@@ 21,8 21,8 @@ maintenance                       = { status     = "actively-developed" }

[dependencies]
log        = "0.4.0"
toml       = "0.4"
toml-query = "0.8"
toml       = "0.5"
toml-query = "0.9"
failure    = "0.1"

libimagerror     = { version = "0.10.0", path = "../../../lib/core/libimagerror" }

M lib/entry/libimagentrydatetime/Cargo.toml => lib/entry/libimagentrydatetime/Cargo.toml +2 -2
@@ 21,8 21,8 @@ maintenance                       = { status     = "actively-developed" }

[dependencies]
chrono = "0.4"
toml-query = "0.8"
toml = "0.4"
toml-query = "0.9"
toml = "0.5"
failure = "0.1"

libimagerror = { version = "0.10.0", path = "../../../lib/core/libimagerror" }

M lib/entry/libimagentryedit/Cargo.toml => lib/entry/libimagentryedit/Cargo.toml +1 -1
@@ 21,7 21,7 @@ maintenance                       = { status     = "actively-developed" }

[dependencies]
error-chain = "0.12"
toml        = "0.4"
toml        = "0.5"
failure     = "0.1"

libimagerror = { version = "0.10.0", path = "../../../lib/core/libimagerror" }

M lib/entry/libimagentryfilter/Cargo.toml => lib/entry/libimagentryfilter/Cargo.toml +2 -2
@@ 25,8 25,8 @@ itertools = "0.7"
log = "0.4.0"
regex = "1"
semver = "0.9"
toml = "0.4"
toml-query = "0.8"
toml = "0.5"
toml-query = "0.9"
failure        = "0.1"
failure_derive = "0.1"


M lib/entry/libimagentrygps/Cargo.toml => lib/entry/libimagentrygps/Cargo.toml +2 -2
@@ 20,8 20,8 @@ is-it-maintained-open-issues      = { repository = "matthiasbeyer/imag" }
maintenance                       = { status     = "actively-developed" }

[dependencies]
toml = "0.4"
toml-query = "0.8"
toml = "0.5"
toml-query = "0.9"
serde_derive = "1"
serde = "1"
failure        = "0.1"

M lib/entry/libimagentrygps/src/types.rs => lib/entry/libimagentrygps/src/types.rs +4 -4
@@ 17,12 17,12 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
//

use std::collections::BTreeMap;
use std::fmt::Display;
use std::fmt::Formatter;
use std::fmt::Result as FmtResult;

use toml::Value;
use toml::map::Map;
use failure::Fallible as Result;
use failure::err_msg;
use failure::Error;


@@ 68,7 68,7 @@ impl GPSValue {
impl Into<Value> for GPSValue {

    fn into(self) -> Value {
        let mut map = BTreeMap::new();
        let mut map = Map::new();
        let _ = map.insert("degree".to_owned(),  Value::Integer(self.degree));
        let _ = map.insert("minutes".to_owned(), Value::Integer(self.minutes));
        let _ = map.insert("seconds".to_owned(), Value::Integer(self.seconds));


@@ 141,7 141,7 @@ impl Coordinates {
impl Into<Value> for Coordinates {

    fn into(self) -> Value {
        let mut map = BTreeMap::new();
        let mut map = Map::new();
        let _ = map.insert("longitude".to_owned(), self.longitude.into());
        let _ = map.insert("latitude".to_owned(), self.latitude.into());
        Value::Table(map)


@@ 154,7 154,7 @@ impl FromValue for Coordinates {
        v.as_table()
            .ok_or_else(|| Error::from(EM::EntryHeaderTypeError))
            .and_then(|t| {
                let get = |m: &BTreeMap<_, _>, what: &'static str, ek| -> Result<GPSValue> {
                let get = |m: &Map<_, _>, what: &'static str, ek| -> Result<GPSValue> {
                    m.get(what)
                        .ok_or_else(|| Error::from(err_msg(ek)))
                        .and_then(GPSValue::from_value)

M lib/entry/libimagentrylink/Cargo.toml => lib/entry/libimagentrylink/Cargo.toml +2 -2
@@ 22,12 22,12 @@ maintenance                       = { status     = "actively-developed" }
[dependencies]
itertools = "0.7"
log = "0.4.0"
toml = "0.4"
toml = "0.5"
url = "1.5"
sha-1 = "0.7"
hex = "0.3"
is-match = "0.1"
toml-query = "0.8"
toml-query = "0.9"
failure        = "0.1"
failure_derive = "0.1"


M lib/entry/libimagentrylink/src/external.rs => lib/entry/libimagentrylink/src/external.rs +3 -3
@@ 31,7 31,6 @@
///

use std::ops::DerefMut;
use std::collections::BTreeMap;
use std::fmt::Debug;

use libimagstore::store::Entry;


@@ 43,6 42,7 @@ use libimagerror::errors::ErrorMsg as EM;
use toml_query::read::TomlValueReadExt;
use toml_query::read::TomlValueReadTypeExt;
use toml_query::insert::TomlValueInsertExt;
use toml::map::Map;
use failure::Error;
use failure::Fallible as Result;
use failure::ResultExt;


@@ 366,9 366,9 @@ impl ExternalLinker for Entry {
                    Some(_) => {
                        warn!("There is a value at 'links.external.content' which is not a table.");
                        warn!("Going to override this value");
                        BTreeMap::new()
                        Map::new()
                    },
                    None => BTreeMap::new(),
                    None => Map::new(),
                };

                let v = Value::String(link.into_string());

M lib/entry/libimagentrylink/src/internal.rs => lib/entry/libimagentrylink/src/internal.rs +2 -3
@@ 17,8 17,6 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
//

use std::collections::BTreeMap;

use libimagstore::storeid::StoreId;
use libimagstore::storeid::IntoStoreId;
use libimagstore::store::Entry;


@@ 27,6 25,7 @@ use libimagerror::errors::ErrorMsg as EM;

use toml_query::read::TomlValueReadExt;
use toml_query::insert::TomlValueInsertExt;
use toml::map::Map;
use failure::ResultExt;
use failure::Fallible as Result;
use failure::Error;


@@ 99,7 98,7 @@ impl Link {
                    .context(EM::ConversionError)
                    .map_err(Error::from)
                    .map(|link| {
                        let mut tab = BTreeMap::new();
                        let mut tab = Map::new();

                        tab.insert("link".to_owned(),       link);
                        tab.insert("annotation".to_owned(), Value::String(anno.clone()));

M lib/entry/libimagentryref/Cargo.toml => lib/entry/libimagentryref/Cargo.toml +2 -4
@@ 24,7 24,7 @@ itertools    = "0.7"
log          = "0.4.0"
failure      = "0.1"
sha-1        = "0.8"
toml         = "0.4"
toml         = "0.5"
serde        = "1"
serde_derive = "1"



@@ 34,11 34,9 @@ libimagrt        = { version = "0.10.0", path = "../../../lib/core/libimagrt" }
libimagentryutil = { version = "0.10.0", path = "../../../lib/entry/libimagentryutil" }

[dependencies.toml-query]
#version          = "0.8"
version          = "0.9"
default-features = false
features         = ["typed"]
git              = "https://github.com/matthiasbeyer/toml-query"
branch           = "master"

[dev-dependencies]
env_logger = "0.5"

M lib/entry/libimagentryref/src/reference.rs => lib/entry/libimagentryref/src/reference.rs +5 -4
@@ 17,9 17,9 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
//

use std::collections::BTreeMap;
use std::path::Path;
use std::path::PathBuf;
use std::collections::BTreeMap;
use std::ops::Deref;

use libimagentryutil::isa::Is;


@@ 27,6 27,7 @@ use libimagentryutil::isa::IsKindHeaderPathProvider;
use libimagerror::errors::ErrorMsg as EM;

use toml::Value;
use toml::map::Map;
use toml_query::read::TomlValueReadExt;
use toml_query::read::TomlValueReadTypeExt;
use toml_query::read::Partial;


@@ 288,7 289,7 @@ impl<'a, H> MutRef for MutRefWithHasher<'a, H>

            if let Some(hash_tbl) = header.read_mut("ref.hash")? {
                match hash_tbl {
                    Value::Table(ref mut tbl) => *tbl = BTreeMap::new(),
                    Value::Table(ref mut tbl) => *tbl = Map::new(),
                    _ => {
                        // should not happen
                    }


@@ 382,7 383,7 @@ pub(crate) fn make_header_section<P, C, H>(hash: String, hashname: H, relpath: P
          C: AsRef<str>,
          H: AsRef<str>,
{
    let mut header_section = Value::Table(BTreeMap::new());
    let mut header_section = Value::Table(Map::new());
    {
        let relpath = relpath
            .as_ref()


@@ 397,7 398,7 @@ pub(crate) fn make_header_section<P, C, H>(hash: String, hashname: H, relpath: P
    }

    {
        let mut hash_table = Value::Table(BTreeMap::new());
        let mut hash_table = Value::Table(Map::new());
        let _ = hash_table.insert(hashname.as_ref(), Value::String(hash))?;
        let _ = header_section.insert("hash", hash_table)?;
    }

M lib/entry/libimagentrytag/Cargo.toml => lib/entry/libimagentrytag/Cargo.toml +2 -2
@@ 22,11 22,11 @@ maintenance                       = { status     = "actively-developed" }
[dependencies]
log = "0.4.0"
regex = "1"
toml = "0.4"
toml = "0.5"
itertools = "0.7"
is-match = "0.1"
filters = "0.3"
toml-query = "0.8"
toml-query = "0.9"
failure    = "0.1"

libimagstore = { version = "0.10.0", path = "../../../lib/core/libimagstore" }

M lib/entry/libimagentryutil/Cargo.toml => lib/entry/libimagentryutil/Cargo.toml +2 -2
@@ 20,8 20,8 @@ is-it-maintained-open-issues      = { repository = "matthiasbeyer/imag" }
maintenance                       = { status     = "actively-developed" }

[dependencies]
toml = "0.4"
toml-query = "0.8"
toml = "0.5"
toml-query = "0.9"
filters = "0.3"
failure = "0.1"
log = "0.4"

M lib/entry/libimagentryview/Cargo.toml => lib/entry/libimagentryview/Cargo.toml +1 -1
@@ 21,7 21,7 @@ maintenance                       = { status     = "actively-developed" }

[dependencies]
log = "0.4.0"
toml = "0.4"
toml = "0.5"
failure  = "0.1"
textwrap = "0.10"


M lib/etc/libimaginteraction/Cargo.toml => lib/etc/libimaginteraction/Cargo.toml +1 -1
@@ 25,7 25,7 @@ interactor = "0.1"
lazy_static = "1.2"
log = "0.4.0"
regex = "1"
toml = "0.4"
toml = "0.5"
handlebars = "1.0"
serde_json = "1"
failure        = "0.1"