diff options
author | Matthias Beyer <mail@beyermatthias.de> | 2019-05-29 12:34:47 +0200 |
---|---|---|
committer | Matthias Beyer <mail@beyermatthias.de> | 2019-05-29 18:39:25 +0200 |
commit | 1482f7032059c6a1df90380b5cc17998afaae93a (patch) | |
tree | 133d90dfe60ca7c6671ab3f1f32dab12130111cc | |
parent | b4e25df98a0c0625fc0721fa72fbbef6cf3176cf (diff) |
Update dependency: toml: 0.4 -> 0.5
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
50 files changed, 63 insertions, 63 deletions
diff --git a/bin/core/imag-annotate/Cargo.toml b/bin/core/imag-annotate/Cargo.toml index ae736ae7..15fcdbbe 100644 --- a/bin/core/imag-annotate/Cargo.toml +++ b/bin/core/imag-annotate/Cargo.toml @@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" } [dependencies] log = "0.4.0" url = "1.2" -toml = "0.4" +toml = "0.5" toml-query = "0.8" failure = "0.1" diff --git a/bin/core/imag-category/Cargo.toml b/bin/core/imag-category/Cargo.toml index 5970ba66..9eb835ea 100644 --- a/bin/core/imag-category/Cargo.toml +++ b/bin/core/imag-category/Cargo.toml @@ -21,7 +21,7 @@ maintenance = { status = "actively-developed" } [dependencies] log = "0.4.0" -toml = "0.4" +toml = "0.5" toml-query = "0.8" failure = "0.1" diff --git a/bin/core/imag-diagnostics/Cargo.toml b/bin/core/imag-diagnostics/Cargo.toml index c308d647..fd81dc8b 100644 --- a/bin/core/imag-diagnostics/Cargo.toml +++ b/bin/core/imag-diagnostics/Cargo.toml @@ -15,7 +15,7 @@ homepage = "http://imag-pim.org" [dependencies] log = "0.4" -toml = "0.4" +toml = "0.5" toml-query = "0.8" indicatif = "0.9" failure = "0.1" diff --git a/bin/core/imag-edit/Cargo.toml b/bin/core/imag-edit/Cargo.toml index af118f84..87779958 100644 --- a/bin/core/imag-edit/Cargo.toml +++ b/bin/core/imag-edit/Cargo.toml @@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" } [dependencies] log = "0.4" version = "3" -toml = "0.4" +toml = "0.5" toml-query = "0.8" failure = "0.1" diff --git a/bin/core/imag-git/Cargo.toml b/bin/core/imag-git/Cargo.toml index f6c5bc8f..1c81ea85 100644 --- a/bin/core/imag-git/Cargo.toml +++ b/bin/core/imag-git/Cargo.toml @@ -21,7 +21,7 @@ maintenance = { status = "actively-developed" } [dependencies] log = "0.4" -toml = "0.4" +toml = "0.5" toml-query = "0.8" libimagrt = { version = "0.10.0", path = "../../../lib/core/libimagrt" } diff --git a/bin/core/imag-gps/Cargo.toml b/bin/core/imag-gps/Cargo.toml index 08f68aab..b5e6c1eb 100644 --- a/bin/core/imag-gps/Cargo.toml +++ b/bin/core/imag-gps/Cargo.toml @@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" } [dependencies] log = "0.4.0" url = "1.2" -toml = "0.4" +toml = "0.5" toml-query = "0.8" failure = "0.1" diff --git a/bin/core/imag-header/Cargo.toml b/bin/core/imag-header/Cargo.toml index 47860753..f351baf4 100644 --- a/bin/core/imag-header/Cargo.toml +++ b/bin/core/imag-header/Cargo.toml @@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" } [dependencies] log = "0.4" version = "2.0.1" -toml = "0.4" +toml = "0.5" toml-query = "0.8" filters = "0.3" failure = "0.1" diff --git a/bin/core/imag-ids/Cargo.toml b/bin/core/imag-ids/Cargo.toml index 17c46876..1d3cd694 100644 --- a/bin/core/imag-ids/Cargo.toml +++ b/bin/core/imag-ids/Cargo.toml @@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" } filters = "0.3" nom = "3.2" log = "0.4" -toml = "0.4" +toml = "0.5" toml-query = "0.8" is-match = "0.1" failure = "0.1" diff --git a/bin/core/imag-init/Cargo.toml b/bin/core/imag-init/Cargo.toml index b6d4a94d..705668ff 100644 --- a/bin/core/imag-init/Cargo.toml +++ b/bin/core/imag-init/Cargo.toml @@ -29,5 +29,5 @@ default-features = false features = ["color", "suggestions", "wrap_help"] [dev-dependencies] -toml = "0.4" +toml = "0.5" diff --git a/bin/core/imag-link/Cargo.toml b/bin/core/imag-link/Cargo.toml index 3ee13569..91482a72 100644 --- a/bin/core/imag-link/Cargo.toml +++ b/bin/core/imag-link/Cargo.toml @@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" } [dependencies] log = "0.4.0" url = "1.5" -toml = "0.4" +toml = "0.5" toml-query = "0.8" prettytable-rs = "0.8" failure = "0.1" diff --git a/bin/core/imag-store/Cargo.toml b/bin/core/imag-store/Cargo.toml index 31a49734..bba5b8e4 100644 --- a/bin/core/imag-store/Cargo.toml +++ b/bin/core/imag-store/Cargo.toml @@ -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"] } diff --git a/bin/core/imag-store/src/util.rs b/bin/core/imag-store/src/util.rs index 72c47298..62f19120 100644 --- a/bin/core/imag-store/src/util.rs +++ b/bin/core/imag-store/src/util.rs @@ -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 })); diff --git a/bin/core/imag-tag/Cargo.toml b/bin/core/imag-tag/Cargo.toml index 6f0c1747..b8917380 100644 --- a/bin/core/imag-tag/Cargo.toml +++ b/bin/core/imag-tag/Cargo.toml @@ -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" } diff --git a/bin/core/imag-view/Cargo.toml b/bin/core/imag-view/Cargo.toml index 5c6ec779..e29ad46a 100644 --- a/bin/core/imag-view/Cargo.toml +++ b/bin/core/imag-view/Cargo.toml @@ -21,7 +21,7 @@ maintenance = { status = "actively-developed" } [dependencies] log = "0.4.0" -toml = "0.4" +toml = "0.5" toml-query = "0.8" handlebars = "1.0" tempfile = "3" diff --git a/bin/core/imag/Cargo.toml b/bin/core/imag/Cargo.toml index a5d18657..29c419c3 100644 --- a/bin/core/imag/Cargo.toml +++ b/bin/core/imag/Cargo.toml @@ -32,7 +32,7 @@ maintenance = { status = "actively-developed" } [dependencies] walkdir = "2" log = "0.4.0" -toml = "0.4" +toml = "0.5" toml-query = "0.8" libimagerror = { version = "0.10.0", path = "../../../lib/core/libimagerror" } diff --git a/bin/domain/imag-bookmark/Cargo.toml b/bin/domain/imag-bookmark/Cargo.toml index c5b3ff23..c2b2bfcb 100644 --- a/bin/domain/imag-bookmark/Cargo.toml +++ b/bin/domain/imag-bookmark/Cargo.toml @@ -21,7 +21,7 @@ maintenance = { status = "actively-developed" } [dependencies] log = "0.4.0" -toml = "0.4" +toml = "0.5" toml-query = "0.8" failure = "0.1" diff --git a/bin/domain/imag-contact/Cargo.toml b/bin/domain/imag-contact/Cargo.toml index e79e5b64..80f39d42 100644 --- a/bin/domain/imag-contact/Cargo.toml +++ b/bin/domain/imag-contact/Cargo.toml @@ -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" diff --git a/bin/domain/imag-diary/Cargo.toml b/bin/domain/imag-diary/Cargo.toml index cf421986..679d79c8 100644 --- a/bin/domain/imag-diary/Cargo.toml +++ b/bin/domain/imag-diary/Cargo.toml @@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" } [dependencies] chrono = "0.4" log = "0.4.0" -toml = "0.4" +toml = "0.5" toml-query = "0.8" itertools = "0.7" failure = "0.1" diff --git a/bin/domain/imag-habit/Cargo.toml b/bin/domain/imag-habit/Cargo.toml index 09aa7b76..7f1480da 100644 --- a/bin/domain/imag-habit/Cargo.toml +++ b/bin/domain/imag-habit/Cargo.toml @@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" } [dependencies] chrono = "0.4" log = "0.4" -toml = "0.4" +toml = "0.5" toml-query = "0.8" kairos = "0.3" prettytable-rs = "0.8" diff --git a/bin/domain/imag-log/Cargo.toml b/bin/domain/imag-log/Cargo.toml index b87cd56c..ccbc67c9 100644 --- a/bin/domain/imag-log/Cargo.toml +++ b/bin/domain/imag-log/Cargo.toml @@ -21,7 +21,7 @@ maintenance = { status = "actively-developed" } [dependencies] log = "0.4" -toml = "0.4" +toml = "0.5" toml-query = "0.8" is-match = "0.1" itertools = "0.7" diff --git a/bin/domain/imag-todo/Cargo.toml b/bin/domain/imag-todo/Cargo.toml index 947285e7..96ded2cb 100644 --- a/bin/domain/imag-todo/Cargo.toml +++ b/bin/domain/imag-todo/Cargo.toml @@ -21,7 +21,7 @@ maintenance = { status = "actively-developed" } [dependencies] log = "0.4.0" -toml = "0.4" +toml = "0.5" toml-query = "0.8" is-match = "0.1" failure = "0.1" diff --git a/bin/domain/imag-wiki/Cargo.toml b/bin/domain/imag-wiki/Cargo.toml index d0dde188..cf71052c 100644 --- a/bin/domain/imag-wiki/Cargo.toml +++ b/bin/domain/imag-wiki/Cargo.toml @@ -16,7 +16,7 @@ homepage = "http://imag-pim.org" [dependencies] clap = ">=2.17" log = "0.4" -toml = "0.4" +toml = "0.5" toml-query = "0.8" is-match = "0.1" regex = "1" diff --git a/lib/core/libimagrt/Cargo.toml b/lib/core/libimagrt/Cargo.toml index f0c09727..c1f07a00 100644 --- a/lib/core/libimagrt/Cargo.toml +++ b/lib/core/libimagrt/Cargo.toml @@ -21,7 +21,7 @@ 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" diff --git a/lib/core/libimagstore/Cargo.toml b/lib/core/libimagstore/Cargo.toml index 61279358..8b18bf9f 100644 --- a/lib/core/libimagstore/Cargo.toml +++ b/lib/core/libimagstore/Cargo.toml @@ -24,7 +24,7 @@ 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" diff --git a/lib/domain/libimagcontact/Cargo.toml b/lib/domain/libimagcontact/Cargo.toml index b63b22fe..6c608b87 100644 --- a/lib/domain/libimagcontact/Cargo.toml +++ b/lib/domain/libimagcontact/Cargo.toml @@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" } [dependencies] failure = "0.1" log = "0.4" -toml = "0.4" +toml = "0.5" toml-query = "0.8" vobject = "0.7" uuid = "0.7" diff --git a/lib/domain/libimagdiary/Cargo.toml b/lib/domain/libimagdiary/Cargo.toml index 1087de44..81f25898 100644 --- a/lib/domain/libimagdiary/Cargo.toml +++ b/lib/domain/libimagdiary/Cargo.toml @@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" } [dependencies] chrono = "0.4" log = "0.4.0" -toml = "0.4" +toml = "0.5" toml-query = "0.8" itertools = "0.7" failure = "0.1" diff --git a/lib/domain/libimaghabit/Cargo.toml b/lib/domain/libimaghabit/Cargo.toml index 020f9078..e61faf3a 100644 --- a/lib/domain/libimaghabit/Cargo.toml +++ b/lib/domain/libimaghabit/Cargo.toml @@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" } [dependencies] chrono = "0.4" log = "0.4" -toml = "0.4" +toml = "0.5" toml-query = "0.8" kairos = "0.3" failure = "0.1" diff --git a/lib/domain/libimaglog/Cargo.toml b/lib/domain/libimaglog/Cargo.toml index af74dbb1..229d0a10 100644 --- a/lib/domain/libimaglog/Cargo.toml +++ b/lib/domain/libimaglog/Cargo.toml @@ -20,7 +20,7 @@ is-it-maintained-open-issues = { repository = "matthiasbeyer/imag" } maintenance = { status = "actively-developed" } [dependencies] -toml = "0.4" +toml = "0.5" toml-query = "0.8" failure = "0.1" diff --git a/lib/domain/libimagmail/Cargo.toml b/lib/domain/libimagmail/Cargo.toml index 09825f1e..04679293 100644 --- a/lib/domain/libimagmail/Cargo.toml +++ b/lib/domain/libimagmail/Cargo.toml @@ -21,7 +21,7 @@ maintenance = { status = "actively-developed" } [dependencies] log = "0.4.0" -toml = "0.4" +toml = "0.5" toml-query = "0.8" mailparse = "0.6.5" filters = "0.3" diff --git a/lib/domain/libimagnotes/Cargo.toml b/lib/domain/libimagnotes/Cargo.toml index 3d3112b1..2625e919 100644 --- a/lib/domain/libimagnotes/Cargo.toml +++ b/lib/domain/libimagnotes/Cargo.toml @@ -21,7 +21,7 @@ maintenance = { status = "actively-developed" } [dependencies] log = "0.4.0" -toml = "0.4" +toml = "0.5" toml-query = "0.8" failure = "0.1" diff --git a/lib/domain/libimagtimetrack/Cargo.toml b/lib/domain/libimagtimetrack/Cargo.toml index 7b920dad..11f18003 100644 --- a/lib/domain/libimagtimetrack/Cargo.toml +++ b/lib/domain/libimagtimetrack/Cargo.toml @@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" } [dependencies] filters = "0.3" chrono = "0.4" -toml = "0.4" +toml = "0.5" toml-query = "0.8" lazy_static = "1.2" is-match = "0.1" diff --git a/lib/domain/libimagtodo/Cargo.toml b/lib/domain/libimagtodo/Cargo.toml index fa47b426..d683f7d6 100644 --- a/lib/domain/libimagtodo/Cargo.toml +++ b/lib/domain/libimagtodo/Cargo.toml @@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" } [dependencies] task-hookrs = "0.6.0" uuid = "0.7" -toml = "0.4" +toml = "0.5" toml-query = "0.8" log = "0.4.0" serde_json = "1" diff --git a/lib/domain/libimagtodo/src/taskstore.rs b/lib/domain/libimagtodo/src/taskstore.rs index c0e1cdc4..e9229dc0 100644 --- a/lib/domain/libimagtodo/src/taskstore.rs +++ b/lib/domain/libimagtodo/src/taskstore.rs @@ -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)))?; diff --git a/lib/domain/libimagwiki/Cargo.toml b/lib/domain/libimagwiki/Cargo.toml index 17b06a6c..956a9eb7 100644 --- a/lib/domain/libimagwiki/Cargo.toml +++ b/lib/domain/libimagwiki/Cargo.toml @@ -21,7 +21,7 @@ maintenance = { status = "actively-developed" } [dependencies] log = "0.4" -toml = "0.4" +toml = "0.5" toml-query = "0.8" filters = "0.3" failure = "0.1" diff --git a/lib/entry/libimagentryannotation/Cargo.toml b/lib/entry/libimagentryannotation/Cargo.toml index 166eef92..fc890091 100644 --- a/lib/entry/libimagentryannotation/Cargo.toml +++ b/lib/entry/libimagentryannotation/Cargo.toml @@ -21,7 +21,7 @@ maintenance = { status = "actively-developed" } [dependencies] lazy_static = "1.2" -toml = "0.4" +toml = "0.5" toml-query = "0.8" failure = "0.1" failure_derive = "0.1" diff --git a/lib/entry/libimagentrycategory/Cargo.toml b/lib/entry/libimagentrycategory/Cargo.toml index 0fc53de0..f571c827 100644 --- a/lib/entry/libimagentrycategory/Cargo.toml +++ b/lib/entry/libimagentrycategory/Cargo.toml @@ -21,7 +21,7 @@ maintenance = { status = "actively-developed" } [dependencies] log = "0.4.0" -toml = "0.4" +toml = "0.5" toml-query = "0.8" failure = "0.1" diff --git a/lib/entry/libimagentrydatetime/Cargo.toml b/lib/entry/libimagentrydatetime/Cargo.toml index b3185036..83d7763b 100644 --- a/lib/entry/libimagentrydatetime/Cargo.toml +++ b/lib/entry/libimagentrydatetime/Cargo.toml @@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" } [dependencies] chrono = "0.4" toml-query = "0.8" -toml = "0.4" +toml = "0.5" failure = "0.1" libimagerror = { version = "0.10.0", path = "../../../lib/core/libimagerror" } diff --git a/lib/entry/libimagentryedit/Cargo.toml b/lib/entry/libimagentryedit/Cargo.toml index eaff5b27..a320fb93 100644 --- a/lib/entry/libimagentryedit/Cargo.toml +++ b/lib/entry/libimagentryedit/Cargo.toml @@ -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" } diff --git a/lib/entry/libimagentryfilter/Cargo.toml b/lib/entry/libimagentryfilter/Cargo.toml index fdf63e01..f4e6565e 100644 --- a/lib/entry/libimagentryfilter/Cargo.toml +++ b/lib/entry/libimagentryfilter/Cargo.toml @@ -25,7 +25,7 @@ itertools = "0.7" log = "0.4.0" regex = "1" semver = "0.9" -toml = "0.4" +toml = "0.5" toml-query = "0.8" failure = "0.1" failure_derive = "0.1" diff --git a/lib/entry/libimagentrygps/Cargo.toml b/lib/entry/libimagentrygps/Cargo.toml index 8e172936..2be3fe87 100644 --- a/lib/entry/libimagentrygps/Cargo.toml +++ b/lib/entry/libimagentrygps/Cargo.toml @@ -20,7 +20,7 @@ is-it-maintained-open-issues = { repository = "matthiasbeyer/imag" } maintenance = { status = "actively-developed" } [dependencies] -toml = "0.4" +toml = "0.5" toml-query = "0.8" serde_derive = "1" serde = "1" diff --git a/lib/entry/libimagentrygps/src/types.rs b/lib/entry/libimagentrygps/src/types.rs index 8b11c82c..8086b1f2 100644 --- a/lib/entry/libimagentrygps/src/types.rs +++ b/lib/entry/libimagentrygps/src/types.rs @@ -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 { |