summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2019-05-30 09:30:40 +0200
committerMatthias Beyer <mail@beyermatthias.de>2019-05-30 09:30:40 +0200
commitb1330c9916453073a32d429346bd3c0125dd6a45 (patch)
tree6d5c448f701b740b5d9d303b3802c588151b9d8a
parentb4e25df98a0c0625fc0721fa72fbbef6cf3176cf (diff)
parenta7d53e47d1fe15ed7163d5612fef2976c9be9098 (diff)
downloadimag-b1330c9916453073a32d429346bd3c0125dd6a45.zip
imag-b1330c9916453073a32d429346bd3c0125dd6a45.tar.gz
Merge branch 'update-toml-dependencies'
-rw-r--r--bin/core/imag-annotate/Cargo.toml4
-rw-r--r--bin/core/imag-category/Cargo.toml4
-rw-r--r--bin/core/imag-diagnostics/Cargo.toml4
-rw-r--r--bin/core/imag-edit/Cargo.toml4
-rw-r--r--bin/core/imag-git/Cargo.toml4
-rw-r--r--bin/core/imag-gps/Cargo.toml4
-rw-r--r--bin/core/imag-header/Cargo.toml4
-rw-r--r--bin/core/imag-ids/Cargo.toml4
-rw-r--r--bin/core/imag-init/Cargo.toml2
-rw-r--r--bin/core/imag-link/Cargo.toml4
-rw-r--r--bin/core/imag-store/Cargo.toml4
-rw-r--r--bin/core/imag-store/src/util.rs6
-rw-r--r--bin/core/imag-tag/Cargo.toml4
-rw-r--r--bin/core/imag-view/Cargo.toml4
-rw-r--r--bin/core/imag/Cargo.toml4
-rw-r--r--bin/domain/imag-bookmark/Cargo.toml4
-rw-r--r--bin/domain/imag-contact/Cargo.toml6
-rw-r--r--bin/domain/imag-diary/Cargo.toml4
-rw-r--r--bin/domain/imag-habit/Cargo.toml4
-rw-r--r--bin/domain/imag-log/Cargo.toml4
-rw-r--r--bin/domain/imag-mail/Cargo.toml2
-rw-r--r--bin/domain/imag-todo/Cargo.toml4
-rw-r--r--bin/domain/imag-wiki/Cargo.toml4
-rw-r--r--lib/core/libimagrt/Cargo.toml4
-rw-r--r--lib/core/libimagstore/Cargo.toml4
-rw-r--r--lib/core/libimagstore/src/store.rs29
-rw-r--r--lib/domain/libimagcontact/Cargo.toml4
-rw-r--r--lib/domain/libimagdiary/Cargo.toml4
-rw-r--r--lib/domain/libimaghabit/Cargo.toml4
-rw-r--r--lib/domain/libimaglog/Cargo.toml4
-rw-r--r--lib/domain/libimagmail/Cargo.toml4
-rw-r--r--lib/domain/libimagnotes/Cargo.toml4
-rw-r--r--lib/domain/libimagtimetrack/Cargo.toml4
-rw-r--r--lib/domain/libimagtodo/Cargo.toml4
-rw-r--r--lib/domain/libimagtodo/src/taskstore.rs4
-rw-r--r--lib/domain/libimagwiki/Cargo.toml4
-rw-r--r--lib/entry/libimagentryannotation/Cargo.toml4
-rw-r--r--lib/entry/libimagentrycategory/Cargo.toml4
-rw-r--r--lib/entry/libimagentrydatetime/Cargo.toml4
-rw-r--r--lib/entry/libimagentryedit/Cargo.toml2
-rw-r--r--lib/entry/libimagentryfilter/Cargo.toml4
-rw-r--r--lib/entry/libimagentrygps/Cargo.toml4
-rw-r--r--lib/entry/libimagentrygps/src/types.rs8
-rw-r--r--lib/entry/libimagentrylink/Cargo.toml4
-rw-r--r--lib/entry/libimagentrylink/src/external.rs6
-rw-r--r--lib/entry/libimagentrylink/src/internal.rs5
-rw-r--r--lib/entry/libimagentryref/Cargo.toml6
-rw-r--r--lib/entry/libimagentryref/src/reference.rs9
-rw-r--r--lib/entry/libimagentrytag/Cargo.toml4
-rw-r--r--lib/entry/libimagentryutil/Cargo.toml4
-rw-r--r--lib/entry/libimagentryview/Cargo.toml2
-rw-r--r--lib/etc/libimaginteraction/Cargo.toml2
52 files changed, 119 insertions, 122 deletions
diff --git a/bin/core/imag-annotate/Cargo.toml b/bin/core/imag-annotate/Cargo.toml
index ae736ae..11825ea 100644
--- a/bin/core/imag-annotate/Cargo.toml
+++ b/bin/core/imag-annotate/Cargo.toml
@@ -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" }
diff --git a/bin/core/imag-category/Cargo.toml b/bin/core/imag-category/Cargo.toml
index 5970ba6..ebdf469 100644
--- a/bin/core/imag-category/Cargo.toml
+++ b/bin/core/imag-category/Cargo.toml
@@ -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" }
diff --git a/bin/core/imag-diagnostics/Cargo.toml b/bin/core/imag-diagnostics/Cargo.toml
index c308d64..d210fcb 100644
--- a/bin/core/imag-diagnostics/Cargo.toml
+++ b/bin/core/imag-diagnostics/Cargo.toml
@@ -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"
diff --git a/bin/core/imag-edit/Cargo.toml b/bin/core/imag-edit/Cargo.toml
index af118f8..447e031 100644
--- a/bin/core/imag-edit/Cargo.toml
+++ b/bin/core/imag-edit/Cargo.toml
@@ -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" }
diff --git a/bin/core/imag-git/Cargo.toml b/bin/core/imag-git/Cargo.toml
index f6c5bc8..d16fc8a 100644
--- a/bin/core/imag-git/Cargo.toml
+++ b/bin/core/imag-git/Cargo.toml
@@ -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" }
diff --git a/bin/core/imag-gps/Cargo.toml b/bin/core/imag-gps/Cargo.toml
index 08f68aa..7e0ea09 100644
--- a/bin/core/imag-gps/Cargo.toml
+++ b/bin/core/imag-gps/Cargo.toml
@@ -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" }
diff --git a/bin/core/imag-header/Cargo.toml b/bin/core/imag-header/Cargo.toml
index 4786075..87829a2 100644
--- a/bin/core/imag-header/Cargo.toml
+++ b/bin/core/imag-header/Cargo.toml
@@ -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"
diff --git a/bin/core/imag-ids/Cargo.toml b/bin/core/imag-ids/Cargo.toml
index 17c4687..3eb2fed 100644
--- a/bin/core/imag-ids/Cargo.toml
+++ b/bin/core/imag-ids/Cargo.toml
@@ -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"
diff --git a/bin/core/imag-init/Cargo.toml b/bin/core/imag-init/Cargo.toml
index b6d4a94..705668f 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 3ee1356..e2caf2f 100644
--- a/bin/core/imag-link/Cargo.toml
+++ b/bin/core/imag-link/Cargo.toml
@@ -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"
diff --git a/bin/core/imag-store/Cargo.toml b/bin/core/imag-store/Cargo.toml
index 31a4973..46ea30d 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"] }
@@ -50,5 +50,5 @@ default-features = false
features = ["testing"]
[dev-dependencies.toml-query]
-version = "0.8"
+version = "0.9"
diff --git a/bin/core/imag-store/src/util.rs b/bin/core/imag-store/src/util.rs
index 72c4729..62f1912 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 6f0c174..6f3f613 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" }
@@ -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]
diff --git a/bin/core/imag-view/Cargo.toml b/bin/core/imag-view/Cargo.toml
index 5c6ec77..568183c 100644
--- a/bin/core/imag-view/Cargo.toml
+++ b/bin/core/imag-view/Cargo.toml
@@ -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"
diff --git a/bin/core/imag/Cargo.toml b/bin/core/imag/Cargo.toml
index a5d1865..66126ac 100644
--- a/bin/core/imag/Cargo.toml
+++ b/bin/core/imag/Cargo.toml
@@ -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" }
diff --git a/bin/domain/imag-bookmark/Cargo.toml b/bin/domain/imag-bookmark/Cargo.toml
index c5b3ff2..2130fab 100644
--- a/bin/domain/imag-bookmark/Cargo.toml
+++ b/bin/domain/imag-bookmark/Cargo.toml
@@ -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" }
diff --git a/bin/domain/imag-contact/Cargo.toml b/bin/domain/imag-contact/Cargo.toml
index e79e5b6..9ab4d7e 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"
@@ -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"
diff --git a/bin/domain/imag-diary/Cargo.toml b/bin/domain/imag-diary/Cargo.toml
index cf42198..de5ce75 100644
--- a/bin/domain/imag-diary/Cargo.toml
+++ b/bin/domain/imag-diary/Cargo.toml
@@ -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"
diff --git a/bin/domain/imag-habit/Cargo.toml b/bin/domain/imag-habit/Cargo.toml
index 09aa7b7..907e75f 100644
--- a/bin/domain/imag-habit/Cargo.toml
+++ b/bin/domain/imag-habit/Cargo.toml
@@ -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"
diff --git a/bin/domain/imag-log/Cargo.toml b/bin/domain/imag-log/Cargo.toml
index b87cd56..7381c4b 100644
--- a/bin/domain/imag-log/Cargo.toml
+++ b/bin/domain/imag-log/Cargo.toml
@@ -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"
diff --git a/bin/domain/imag-mail/Cargo.toml b/bin/domain/imag-mail/Cargo.toml
index 98ffb30..ee1e6d1 100644
--- a/bin/domain/imag-mail/Cargo.toml
+++ b/bin/domain/imag-mail/Cargo.toml
@@ -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"]
diff --git a/bin/domain/imag-todo/Cargo.toml b/bin/domain/imag-todo/Cargo.toml
index 947285e..2c1a733 100644
--- a/bin/domain/imag-todo/Cargo.toml
+++ b/bin/domain/imag-todo/Cargo.toml
@@ -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"
diff --git a/bin/domain/imag-wiki/Cargo.toml b/bin/domain/imag-wiki/Cargo.toml
index d0dde18..8c3fad7 100644
--- a/bin/domain/imag-wiki/Cargo.toml
+++ b/bin/domain/imag-wiki/Cargo.toml
@@ -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"
diff --git a/lib/core/libimagrt/Cargo.toml b/lib/core/libimagrt/Cargo.toml
index f0c0972..63e97ee 100644
--- a/lib/core/libimagrt/Cargo.toml
+++ b/lib/core/libimagrt/Cargo.toml
@@ -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"
diff --git a/lib/core/libimagstore/Cargo.toml b/lib/core/libimagstore/Cargo.toml
index 6127935..0738d0c 100644
--- a/lib/core/libimagstore/Cargo.toml
+++ b/lib/core/libimagstore/Cargo.toml
@@ -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" }
diff --git a/lib/core/libimagstore/src/store.rs b/lib/core/libimagstore/src/store.rs
index 8c45fa4..13fbf24 100644
--- a/lib/core/libimagstore/src/store.rs
+++ b/lib/core/libimagstore/src/store.rs
@@ -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));
diff --git a/lib/domain/libimagcontact/Cargo.toml b/lib/domain/libimagcontact/Cargo.toml
index b63b22f..7617eb2 100644
--- a/lib/domain/libimagcontact/Cargo.toml
+++ b/lib/domain/libimagcontact/Cargo.toml
@@ -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"
diff --git a/lib/domain/libimagdiary/Cargo.toml b/lib/domain/libimagdiary/Cargo.toml
index 1087de4..8f00b2f 100644
--- a/lib/domain/libimagdiary/Cargo.toml
+++ b/lib/domain/libimagdiary/Cargo.toml
@@ -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"
diff --git a/lib/domain/libimaghabit/Cargo.toml b/lib/domain/libimaghabit/Cargo.toml
index 020f907..8b48422 100644
--- a/lib/domain/libimaghabit/Cargo.toml
+++ b/lib/domain/libimaghabit/Cargo.toml
@@ -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"
diff --git a/lib/domain/libimaglog/Cargo.toml b/lib/domain/libimaglog/Cargo.toml
index af74dbb..c4bab1f 100644
--- a/lib/domain/libimaglog/Cargo.toml
+++ b/lib/domain/libimaglog/Cargo.toml
@@ -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" }
diff --git a/lib/domain/libimagmail/Cargo.toml b/lib/domain/libimagmail/Cargo.toml
index 09825f1..f66c3b0 100644
--- a/lib/domain/libimagmail/Cargo.toml
+++ b/lib/domain/libimagmail/Cargo.toml
@@ -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"
diff --git a/lib/domain/libimagnotes/Cargo.toml b/lib/domain/libimagnotes/Cargo.toml
index 3d3112b..4d38276 100644
--- a/lib/domain/libimagnotes/Cargo.toml
+++ b/lib/domain/libimagnotes/Cargo.toml
@@ -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" }
diff --git a/lib/domain/libimagtimetrack/Cargo.toml b/lib/domain/libimagtimetrack/Cargo.toml
index 7b920da..a24263a 100644
--- a/lib/domain/libimagtimetrack/Cargo.toml
+++ b/lib/domain/libimagtimetrack/Cargo.toml
@@ -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"
diff --git a/lib/domain/libimagtodo/Cargo.toml b/lib/domain/libimagtodo/Cargo.toml
index fa47b42..8f4100a 100644
--- a/lib/domain/libimagtodo/Cargo.toml
+++ b/lib/domain/libimagtodo/Cargo.toml
@@ -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"
diff --git a/lib/domain/libimagtodo/src/taskstore.rs b/lib/domain/libimagtodo/src/taskstore.rs
index c0e1cdc..e9229dc 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 17b06a6..8051ada 100644
--- a/lib/domain/libimagwiki/Cargo.toml
+++ b/lib/domain/libimagwiki/Cargo.toml
@@ -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"
diff --git a/lib/entry/libimagentryannotation/Cargo.toml b/lib/entry/libimagentryannotation/Cargo.toml
index 166eef9..b529531 100644
--- a/lib/entry/libimagentryannotation/Cargo.toml
+++ b/lib/entry/libimagentryannotation/Cargo.toml
@@ -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"] }
diff --git a/lib/entry/libimagentrycategory/Cargo.toml b/lib/entry/libimagentrycategory/Cargo.toml
index 0fc53de..b931cfc 100644
--- a/lib/entry/libimagentrycategory/Cargo.toml
+++ b/lib/entry/libimagentrycategory/Cargo.toml
@@ -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" }
diff --git a/lib/entry/libimagentrydatetime/Cargo.toml b/lib/entry/libimagentrydatetime/Cargo.toml
index b318503..e8524f4 100644
--- a/lib/entry/libimagentrydatetime/Cargo.toml
+++ b/lib/entry/libimagentrydatetime/Cargo.toml
@@ -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" }
diff --git a/lib/entry/libimagentryedit/Cargo.toml b/lib/entry/libimagentryedit/Cargo.toml
index eaff5b2..a320fb9 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 fdf63e0..44c9e8d 100644
--- a/lib/entry/libimagentryfilter/Cargo.toml
+++ b/lib/entry/libimagentryfilter/Cargo.toml
@@ -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"
diff --git a/lib/entry/libimagentrygps/Cargo.toml b/lib/entry/libimagentrygps/Cargo.toml
index 8e17293..68b16ac 100644
--- a/lib/entry/libimagentrygps/Cargo.toml
+++ b/lib/entry/libimagentrygps/Cargo.toml
@@ -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"
diff --git a/lib/entry/libimagentrygps/src/types.rs b/lib/entry/libimagentrygps/src/types.rs
index 8b11c82..8086b1f 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 {
- 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)
diff --git a/lib/entry/libimagentrylink/Cargo.toml b/lib/entry/libimagentrylink/Cargo.toml
index c795a8f..985039c 100644
--- a/lib/entry/libimagentrylink/Cargo.toml
+++ b/lib/entry/libimagentrylink/Cargo.toml
@@ -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"
diff --git a/lib/entry/libimagentrylink/src/external.rs b/lib/entry/libimagentrylink/src/external.rs
index a31871d..9539878 100644
--- a/lib/entry/libimagentrylink/src/external.rs
+++ b/lib/entry/libimagentrylink/src/external.rs
@@ -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());
diff --git a/lib/entry/libimagentrylink/src/internal.rs b/lib/entry/libimagentrylink/src/internal.rs
index 60836a4..ca24201 100644
--- a/lib/entry/libimagentrylink/src/internal.rs
+++ b/lib/entry/libimagentrylink/src/internal.rs
@@ -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()));
diff --git a/lib/entry/libimagentryref/Cargo.toml b/lib/entry/libimagentryref/Cargo.toml
index d2efadc..426aa73 100644
--- a/lib/entry/libimagentryref/Cargo.toml
+++ b/lib/entry/libimagentryref/Cargo.toml
@@ -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"
diff --git a/lib/entry/libimagentryref/src/reference.rs b/lib/entry/libimagentryref/src/reference.rs
index 2f7aa35..f4dde96 100644
--- a/lib/entry/libimagentryref/src/reference.rs
+++ b/lib/entry/libimagentryref/src/reference.rs
@@ -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)?;
}
diff --git a/lib/entry/libimagentrytag/Cargo.toml b/lib/entry/libimagentrytag/Cargo.toml
index 1db12d2..2b4fca2 100644
--- a/lib/entry/libimagentrytag/Cargo.toml
+++ b/lib/entry/libimagentrytag/Cargo.toml
@@ -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" }
diff --git a/lib/entry/libimagentryutil/Cargo.toml b/lib/entry/libimagentryutil/Cargo.toml
index 7e13f6d..29af27c 100644
--- a/lib/entry/libimagentryutil/Cargo.toml
+++ b/lib/entry/libimagentryutil/Cargo.toml
@@ -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"
diff --git a/lib/entry/libimagentryview/Cargo.toml b/lib/entry/libimagentryview/Cargo.toml
index 9fd4458..ab2b4a3 100644
--- a/lib/entry/libimagentryview/Cargo.toml
+++ b/lib/entry/libimagentryview/Cargo.toml
@@ -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"
diff --git a/lib/etc/libimaginteraction/Cargo.toml b/lib/etc/libimaginteraction/Cargo.toml
index 83c6cc9..513e3db 100644
--- a/lib/etc/libimaginteraction/Cargo.toml
+++ b/lib/etc/libimaginteraction/Cargo.toml
@@ -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"