summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2018-09-27 16:36:49 +0200
committerGitHub <noreply@github.com>2018-09-27 16:36:49 +0200
commit01c562570638600e43e1a0c70da8cea384e235bf (patch)
treeab35755908f0db92d989a14bf67a575177677706
parent9bce68b1bff5e2f77f7c86424de5c16a7e38a2cc (diff)
parent89059bb7da412d6902eceb69047d1e155a4335ba (diff)
downloadimag-01c562570638600e43e1a0c70da8cea384e235bf.zip
imag-01c562570638600e43e1a0c70da8cea384e235bf.tar.gz
Merge pull request #1504 from matthiasbeyer/dependency-update
Dependency update
-rw-r--r--bin/core/imag-annotate/Cargo.toml2
-rw-r--r--bin/core/imag-category/Cargo.toml2
-rw-r--r--bin/core/imag-diagnostics/Cargo.toml4
-rw-r--r--bin/core/imag-edit/Cargo.toml2
-rw-r--r--bin/core/imag-git/Cargo.toml2
-rw-r--r--bin/core/imag-gps/Cargo.toml2
-rw-r--r--bin/core/imag-ids/Cargo.toml2
-rw-r--r--bin/core/imag-link/Cargo.toml2
-rw-r--r--bin/core/imag-store/Cargo.toml4
-rw-r--r--bin/core/imag-tag/Cargo.toml2
-rw-r--r--bin/core/imag-view/Cargo.toml4
-rw-r--r--bin/core/imag/Cargo.toml2
-rw-r--r--bin/domain/imag-bookmark/Cargo.toml2
-rw-r--r--bin/domain/imag-contact/Cargo.toml6
-rw-r--r--bin/domain/imag-contact/src/create.rs6
-rw-r--r--bin/domain/imag-diary/Cargo.toml2
-rw-r--r--bin/domain/imag-habit/Cargo.toml6
-rw-r--r--bin/domain/imag-log/Cargo.toml4
-rw-r--r--bin/domain/imag-timetrack/Cargo.toml2
-rw-r--r--bin/domain/imag-todo/Cargo.toml2
-rw-r--r--bin/domain/imag-wiki/Cargo.toml4
-rw-r--r--lib/core/libimagerror/Cargo.toml2
-rw-r--r--lib/core/libimagrt/Cargo.toml6
-rw-r--r--lib/core/libimagstore/Cargo.toml4
-rw-r--r--lib/domain/libimagbookmark/Cargo.toml2
-rw-r--r--lib/domain/libimagcontact/Cargo.toml6
-rw-r--r--lib/domain/libimagdiary/Cargo.toml4
-rw-r--r--lib/domain/libimaghabit/Cargo.toml8
-rw-r--r--lib/domain/libimaglog/Cargo.toml4
-rw-r--r--lib/domain/libimagmail/Cargo.toml2
-rw-r--r--lib/domain/libimagnotes/Cargo.toml4
-rw-r--r--lib/domain/libimagtimetrack/Cargo.toml6
-rw-r--r--lib/domain/libimagtodo/Cargo.toml4
-rw-r--r--lib/domain/libimagwiki/Cargo.toml4
-rw-r--r--lib/entry/libimagentryannotation/Cargo.toml6
-rw-r--r--lib/entry/libimagentrycategory/Cargo.toml4
-rw-r--r--lib/entry/libimagentrydatetime/Cargo.toml6
-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/libimagentrylink/Cargo.toml4
-rw-r--r--lib/entry/libimagentrymarkdown/Cargo.toml2
-rw-r--r--lib/entry/libimagentryref/Cargo.toml4
-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.toml6
-rw-r--r--lib/etc/libimaginteraction/src/format.rs76
-rw-r--r--lib/etc/libimagnotification/Cargo.toml2
-rw-r--r--lib/etc/libimagtimeui/Cargo.toml2
-rw-r--r--lib/etc/libimagutil/Cargo.toml2
51 files changed, 128 insertions, 126 deletions
diff --git a/bin/core/imag-annotate/Cargo.toml b/bin/core/imag-annotate/Cargo.toml
index 21561bb..6819ea2 100644
--- a/bin/core/imag-annotate/Cargo.toml
+++ b/bin/core/imag-annotate/Cargo.toml
@@ -25,7 +25,7 @@ maintenance = { status = "actively-developed" }
log = "0.4.0"
url = "1.2"
toml = "0.4"
-toml-query = "0.6"
+toml-query = "0.7"
libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" }
libimagrt = { version = "0.9.0", path = "../../../lib/core/libimagrt" }
diff --git a/bin/core/imag-category/Cargo.toml b/bin/core/imag-category/Cargo.toml
index 1327230..509db07 100644
--- a/bin/core/imag-category/Cargo.toml
+++ b/bin/core/imag-category/Cargo.toml
@@ -24,7 +24,7 @@ maintenance = { status = "actively-developed" }
[dependencies]
log = "0.4.0"
toml = "0.4"
-toml-query = "0.6"
+toml-query = "0.7"
libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" }
libimagrt = { version = "0.9.0", path = "../../../lib/core/libimagrt" }
diff --git a/bin/core/imag-diagnostics/Cargo.toml b/bin/core/imag-diagnostics/Cargo.toml
index a6a12d9..5865824 100644
--- a/bin/core/imag-diagnostics/Cargo.toml
+++ b/bin/core/imag-diagnostics/Cargo.toml
@@ -18,8 +18,8 @@ build = "../../../build.rs"
[dependencies]
log = "0.4"
toml = "0.4"
-toml-query = "0.6"
-indicatif = "0.9"
+toml-query = "0.7"
+indicatif = "0.9"
libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" }
libimagrt = { version = "0.9.0", path = "../../../lib/core/libimagrt" }
diff --git a/bin/core/imag-edit/Cargo.toml b/bin/core/imag-edit/Cargo.toml
index 230250f..74a29bc 100644
--- a/bin/core/imag-edit/Cargo.toml
+++ b/bin/core/imag-edit/Cargo.toml
@@ -25,7 +25,7 @@ maintenance = { status = "actively-developed" }
log = "0.3"
version = "2.0.1"
toml = "0.4"
-toml-query = "0.6"
+toml-query = "0.7"
libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" }
libimagrt = { version = "0.9.0", path = "../../../lib/core/libimagrt" }
diff --git a/bin/core/imag-git/Cargo.toml b/bin/core/imag-git/Cargo.toml
index 295c1aa..3938494 100644
--- a/bin/core/imag-git/Cargo.toml
+++ b/bin/core/imag-git/Cargo.toml
@@ -24,7 +24,7 @@ maintenance = { status = "actively-developed" }
[dependencies]
log = "0.3"
toml = "0.4"
-toml-query = "0.6"
+toml-query = "0.7"
libimagrt = { version = "0.9.0", path = "../../../lib/core/libimagrt" }
libimagerror = { version = "0.9.0", path = "../../../lib/core/libimagerror" }
diff --git a/bin/core/imag-gps/Cargo.toml b/bin/core/imag-gps/Cargo.toml
index 92b90d7..85822c6 100644
--- a/bin/core/imag-gps/Cargo.toml
+++ b/bin/core/imag-gps/Cargo.toml
@@ -25,7 +25,7 @@ maintenance = { status = "actively-developed" }
log = "0.4.0"
url = "1.2"
toml = "0.4"
-toml-query = "0.6"
+toml-query = "0.7"
libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" }
libimagrt = { version = "0.9.0", path = "../../../lib/core/libimagrt" }
diff --git a/bin/core/imag-ids/Cargo.toml b/bin/core/imag-ids/Cargo.toml
index 43cf798..da33533 100644
--- a/bin/core/imag-ids/Cargo.toml
+++ b/bin/core/imag-ids/Cargo.toml
@@ -26,7 +26,7 @@ filters = "0.3"
nom = "3.2"
log = "0.4"
toml = "0.4"
-toml-query = "0.6"
+toml-query = "0.7"
is-match = "0.1"
libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" }
diff --git a/bin/core/imag-link/Cargo.toml b/bin/core/imag-link/Cargo.toml
index eef2aac..1c1db54 100644
--- a/bin/core/imag-link/Cargo.toml
+++ b/bin/core/imag-link/Cargo.toml
@@ -25,7 +25,7 @@ maintenance = { status = "actively-developed" }
log = "0.4.0"
url = "1.5"
toml = "0.4"
-toml-query = "0.6"
+toml-query = "0.7"
prettytable-rs = "0.6"
libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" }
diff --git a/bin/core/imag-store/Cargo.toml b/bin/core/imag-store/Cargo.toml
index 8a16ad2..9bc96a4 100644
--- a/bin/core/imag-store/Cargo.toml
+++ b/bin/core/imag-store/Cargo.toml
@@ -24,7 +24,7 @@ maintenance = { status = "actively-developed" }
[dependencies]
log = "0.4.0"
toml = "0.4"
-error-chain = "0.11"
+error-chain = "0.12"
libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore", features = ["verify"] }
libimagrt = { version = "0.9.0", path = "../../../lib/core/libimagrt" }
@@ -52,5 +52,5 @@ default-features = false
features = ["testing"]
[dev-dependencies.toml-query]
-version = "0.4"
+version = "0.7"
diff --git a/bin/core/imag-tag/Cargo.toml b/bin/core/imag-tag/Cargo.toml
index 02ef200..fb30659 100644
--- a/bin/core/imag-tag/Cargo.toml
+++ b/bin/core/imag-tag/Cargo.toml
@@ -37,7 +37,7 @@ default-features = false
features = ["color", "suggestions", "wrap_help"]
[dev-dependencies]
-toml-query = "0.6"
+toml-query = "0.7"
env_logger = "0.5"
[dev-dependencies.libimagutil]
diff --git a/bin/core/imag-view/Cargo.toml b/bin/core/imag-view/Cargo.toml
index a54f284..a0d3023 100644
--- a/bin/core/imag-view/Cargo.toml
+++ b/bin/core/imag-view/Cargo.toml
@@ -24,8 +24,8 @@ maintenance = { status = "actively-developed" }
[dependencies]
log = "0.4.0"
toml = "0.4"
-toml-query = "0.6"
-handlebars = "0.29.0"
+toml-query = "0.7"
+handlebars = "1.0"
tempfile = "2.1"
libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" }
diff --git a/bin/core/imag/Cargo.toml b/bin/core/imag/Cargo.toml
index 07ac705..ca0d379 100644
--- a/bin/core/imag/Cargo.toml
+++ b/bin/core/imag/Cargo.toml
@@ -31,7 +31,7 @@ maintenance = { status = "actively-developed" }
walkdir = "1"
log = "0.4.0"
toml = "0.4"
-toml-query = "0.6"
+toml-query = "0.7"
is-match = "0.1"
libimagrt = { version = "0.9.0", path = "../../../lib/core/libimagrt" }
diff --git a/bin/domain/imag-bookmark/Cargo.toml b/bin/domain/imag-bookmark/Cargo.toml
index a7b206b..ecc0a25 100644
--- a/bin/domain/imag-bookmark/Cargo.toml
+++ b/bin/domain/imag-bookmark/Cargo.toml
@@ -24,7 +24,7 @@ maintenance = { status = "actively-developed" }
[dependencies]
log = "0.4.0"
toml = "0.4"
-toml-query = "0.6"
+toml-query = "0.7"
libimagrt = { version = "0.9.0", path = "../../../lib/core/libimagrt" }
libimagerror = { version = "0.9.0", path = "../../../lib/core/libimagerror" }
diff --git a/bin/domain/imag-contact/Cargo.toml b/bin/domain/imag-contact/Cargo.toml
index 3070e2a..3c95afb 100644
--- a/bin/domain/imag-contact/Cargo.toml
+++ b/bin/domain/imag-contact/Cargo.toml
@@ -24,9 +24,9 @@ maintenance = { status = "actively-developed" }
[dependencies]
log = "0.4.0"
toml = "0.4"
-toml-query = "0.6"
-handlebars = "0.29"
-vobject = "0.4"
+toml-query = "0.7"
+vobject = { git = "https://github.com/matthiasbeyer/rust-vobject", branch = "update-errorchain" }
+handlebars = "1.0"
walkdir = "1"
uuid = { version = "0.6", features = ["v4"] }
serde_json = "1"
diff --git a/bin/domain/imag-contact/src/create.rs b/bin/domain/imag-contact/src/create.rs
index d5ae413..18de82c 100644
--- a/bin/domain/imag-contact/src/create.rs
+++ b/bin/domain/imag-contact/src/create.rs
@@ -39,6 +39,7 @@ use std::path::PathBuf;
use std::fs::OpenOptions;
use vobject::vcard::Vcard;
+use vobject::vcard::VcardBuilder;
use vobject::write_component;
use toml_query::read::TomlValueReadExt;
use toml::Value;
@@ -208,7 +209,7 @@ pub fn create(rt: &Runtime) {
}
fn parse_toml_into_vcard(toml: Value, uuid: String) -> Option<Vcard> {
- let mut vcard = Vcard::default().with_uid(uuid);
+ let mut vcard = VcardBuilder::new().with_uid(uuid);
{ // parse name
debug!("Parsing name");
@@ -448,6 +449,9 @@ fn parse_toml_into_vcard(toml: Value, uuid: String) -> Option<Vcard> {
}
+ let vcard = vcard
+ .build()
+ .unwrap(); // TODO: This unwrap does not fail with rust-vobject, why is there a Result<> returned?
Some(vcard)
}
diff --git a/bin/domain/imag-diary/Cargo.toml b/bin/domain/imag-diary/Cargo.toml
index 223cdf5..1e65676 100644
--- a/bin/domain/imag-diary/Cargo.toml
+++ b/bin/domain/imag-diary/Cargo.toml
@@ -25,7 +25,7 @@ maintenance = { status = "actively-developed" }
chrono = "0.4"
log = "0.4.0"
toml = "0.4"
-toml-query = "0.6"
+toml-query = "0.7"
itertools = "0.7"
libimagerror = { version = "0.9.0", path = "../../../lib/core/libimagerror" }
diff --git a/bin/domain/imag-habit/Cargo.toml b/bin/domain/imag-habit/Cargo.toml
index bee3fba..b7f1b5d 100644
--- a/bin/domain/imag-habit/Cargo.toml
+++ b/bin/domain/imag-habit/Cargo.toml
@@ -23,10 +23,10 @@ maintenance = { status = "actively-developed" }
[dependencies]
chrono = "0.4"
-log = "0.3"
+log = "0.4"
toml = "0.4"
-toml-query = "0.6"
-kairos = "0.1.0"
+toml-query = "0.7"
+kairos = { git = "https://github.com/matthiasbeyer/kairos", branch = "master" }
prettytable-rs = "0.6"
libimagerror = { version = "0.9.0", path = "../../../lib/core/libimagerror" }
diff --git a/bin/domain/imag-log/Cargo.toml b/bin/domain/imag-log/Cargo.toml
index 3c22c70..98283c1 100644
--- a/bin/domain/imag-log/Cargo.toml
+++ b/bin/domain/imag-log/Cargo.toml
@@ -22,9 +22,9 @@ is-it-maintained-open-issues = { repository = "matthiasbeyer/imag" }
maintenance = { status = "actively-developed" }
[dependencies]
-log = "0.3"
+log = "0.4"
toml = "0.4"
-toml-query = "0.6"
+toml-query = "0.7"
is-match = "0.1"
itertools = "0.7"
diff --git a/bin/domain/imag-timetrack/Cargo.toml b/bin/domain/imag-timetrack/Cargo.toml
index 8266313..328a038 100644
--- a/bin/domain/imag-timetrack/Cargo.toml
+++ b/bin/domain/imag-timetrack/Cargo.toml
@@ -27,7 +27,7 @@ chrono = "0.4"
filters = "0.3"
itertools = "0.7"
prettytable-rs = "0.6"
-kairos = "0.1"
+kairos = { git = "https://github.com/matthiasbeyer/kairos", branch = "master" }
libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" }
libimagrt = { version = "0.9.0", path = "../../../lib/core/libimagrt" }
diff --git a/bin/domain/imag-todo/Cargo.toml b/bin/domain/imag-todo/Cargo.toml
index 9ababa2..4d6ca1f 100644
--- a/bin/domain/imag-todo/Cargo.toml
+++ b/bin/domain/imag-todo/Cargo.toml
@@ -24,7 +24,7 @@ maintenance = { status = "actively-developed" }
[dependencies]
log = "0.4.0"
toml = "0.4"
-toml-query = "0.6"
+toml-query = "0.7"
is-match = "0.1"
libimagrt = { version = "0.9.0", path = "../../../lib/core/libimagrt" }
diff --git a/bin/domain/imag-wiki/Cargo.toml b/bin/domain/imag-wiki/Cargo.toml
index d222cb4..44ac560 100644
--- a/bin/domain/imag-wiki/Cargo.toml
+++ b/bin/domain/imag-wiki/Cargo.toml
@@ -17,9 +17,9 @@ build = "../../../build.rs"
[dependencies]
clap = ">=2.17"
-log = "0.3"
+log = "0.4"
toml = "0.4"
-toml-query = "0.6"
+toml-query = "0.7"
is-match = "0.1"
regex = "0.2"
filters = "0.3"
diff --git a/lib/core/libimagerror/Cargo.toml b/lib/core/libimagerror/Cargo.toml
index aaa9210..fe4550a 100644
--- a/lib/core/libimagerror/Cargo.toml
+++ b/lib/core/libimagerror/Cargo.toml
@@ -22,4 +22,4 @@ maintenance = { status = "actively-developed" }
[dependencies]
log = "0.4"
ansi_term = "0.10"
-error-chain = "0.11"
+error-chain = "0.12"
diff --git a/lib/core/libimagrt/Cargo.toml b/lib/core/libimagrt/Cargo.toml
index a44b0c1..3907de9 100644
--- a/lib/core/libimagrt/Cargo.toml
+++ b/lib/core/libimagrt/Cargo.toml
@@ -26,9 +26,9 @@ xdg-basedir = "1.0"
itertools = "0.7"
ansi_term = "0.10"
is-match = "0.1"
-toml-query = "0.6"
-error-chain = "0.11"
-handlebars = "0.29.0"
+toml-query = "0.7"
+error-chain = "0.12"
+handlebars = "1.0"
atty = "0.2"
libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" }
diff --git a/lib/core/libimagstore/Cargo.toml b/lib/core/libimagstore/Cargo.toml
index 7bb4e9b..864d2b5 100644
--- a/lib/core/libimagstore/Cargo.toml
+++ b/lib/core/libimagstore/Cargo.toml
@@ -29,8 +29,8 @@ walkdir = "1"
is-match = "0.1"
serde = "1"
serde_json = "1"
-error-chain = "0.11"
-toml-query = "0.6"
+error-chain = "0.12"
+toml-query = "0.7"
libimagerror = { version = "0.9.0", path = "../../../lib/core/libimagerror" }
libimagutil = { version = "0.9.0", path = "../../../lib/etc/libimagutil" }
diff --git a/lib/domain/libimagbookmark/Cargo.toml b/lib/domain/libimagbookmark/Cargo.toml
index 9c9587e..09fc306 100644
--- a/lib/domain/libimagbookmark/Cargo.toml
+++ b/lib/domain/libimagbookmark/Cargo.toml
@@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" }
[dependencies]
url = "1.5"
regex = "0.2"
-error-chain = "0.11"
+error-chain = "0.12"
libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" }
libimagerror = { version = "0.9.0", path = "../../../lib/core/libimagerror" }
diff --git a/lib/domain/libimagcontact/Cargo.toml b/lib/domain/libimagcontact/Cargo.toml
index 3d76490..e361bf5 100644
--- a/lib/domain/libimagcontact/Cargo.toml
+++ b/lib/domain/libimagcontact/Cargo.toml
@@ -20,11 +20,11 @@ is-it-maintained-open-issues = { repository = "matthiasbeyer/imag" }
maintenance = { status = "actively-developed" }
[dependencies]
-error-chain = "0.11"
+error-chain = "0.12"
log = "0.3"
toml = "0.4"
-toml-query = "0.6"
-vobject = "0.5"
+toml-query = "0.7"
+vobject = { git = "https://github.com/matthiasbeyer/rust-vobject", branch = "update-errorchain" }
uuid = "0.6"
serde = "1"
serde_derive = "1"
diff --git a/lib/domain/libimagdiary/Cargo.toml b/lib/domain/libimagdiary/Cargo.toml
index d2d4ba3..218a223 100644
--- a/lib/domain/libimagdiary/Cargo.toml
+++ b/lib/domain/libimagdiary/Cargo.toml
@@ -23,9 +23,9 @@ maintenance = { status = "actively-developed" }
chrono = "0.4"
log = "0.4.0"
toml = "0.4"
-toml-query = "0.6"
+toml-query = "0.7"
itertools = "0.7"
-error-chain = "0.11"
+error-chain = "0.12"
filters = "0.3"
libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" }
diff --git a/lib/domain/libimaghabit/Cargo.toml b/lib/domain/libimaghabit/Cargo.toml
index 266e52f..5e4eb9b 100644
--- a/lib/domain/libimaghabit/Cargo.toml
+++ b/lib/domain/libimaghabit/Cargo.toml
@@ -21,11 +21,11 @@ maintenance = { status = "actively-developed" }
[dependencies]
chrono = "0.4"
-log = "0.3"
+log = "0.4"
toml = "0.4"
-toml-query = "0.6"
-error-chain = "0.11"
-kairos = "0.1.0"
+toml-query = "0.7"
+error-chain = "0.12"
+kairos = { git = "https://github.com/matthiasbeyer/kairos", branch = "master" }
libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" }
libimagerror = { version = "0.9.0", path = "../../../lib/core/libimagerror" }
diff --git a/lib/domain/libimaglog/Cargo.toml b/lib/domain/libimaglog/Cargo.toml
index eaf7b0e..764345f 100644
--- a/lib/domain/libimaglog/Cargo.toml
+++ b/lib/domain/libimaglog/Cargo.toml
@@ -21,8 +21,8 @@ maintenance = { status = "actively-developed" }
[dependencies]
toml = "0.4"
-toml-query = "0.6"
-error-chain = "0.11"
+toml-query = "0.7"
+error-chain = "0.12"
libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" }
libimagerror = { version = "0.9.0", path = "../../../lib/core/libimagerror" }
diff --git a/lib/domain/libimagmail/Cargo.toml b/lib/domain/libimagmail/Cargo.toml
index 8f1daab..0140217 100644
--- a/lib/domain/libimagmail/Cargo.toml
+++ b/lib/domain/libimagmail/Cargo.toml
@@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" }
log = "0.4.0"
email = "0.0.17"
filters = "0.3"
-error-chain = "0.11"
+error-chain = "0.12"
libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" }
libimagerror = { version = "0.9.0", path = "../../../lib/core/libimagerror" }
diff --git a/lib/domain/libimagnotes/Cargo.toml b/lib/domain/libimagnotes/Cargo.toml
index d722edc..64dde6e 100644
--- a/lib/domain/libimagnotes/Cargo.toml
+++ b/lib/domain/libimagnotes/Cargo.toml
@@ -22,8 +22,8 @@ maintenance = { status = "actively-developed" }
[dependencies]
log = "0.4.0"
toml = "0.4"
-toml-query = "0.6"
-error-chain = "0.11"
+toml-query = "0.7"
+error-chain = "0.12"
libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" }
libimagerror = { version = "0.9.0", path = "../../../lib/core/libimagerror" }
diff --git a/lib/domain/libimagtimetrack/Cargo.toml b/lib/domain/libimagtimetrack/Cargo.toml
index 3277567..ed95139 100644
--- a/lib/domain/libimagtimetrack/Cargo.toml
+++ b/lib/domain/libimagtimetrack/Cargo.toml
@@ -23,10 +23,10 @@ maintenance = { status = "actively-developed" }
filters = "0.3"
chrono = "0.4"
toml = "0.4"
-toml-query = "0.6"
-lazy_static = "0.2"
+toml-query = "0.7"
+lazy_static = "1"
is-match = "0.1"
-error-chain = "0.11"
+error-chain = "0.12"
libimagerror = { version = "0.9.0", path = "../../../lib/core/libimagerror" }
libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" }
diff --git a/lib/domain/libimagtodo/Cargo.toml b/lib/domain/libimagtodo/Cargo.toml
index f179080..34b8ace 100644
--- a/lib/domain/libimagtodo/Cargo.toml
+++ b/lib/domain/libimagtodo/Cargo.toml
@@ -23,10 +23,10 @@ maintenance = { status = "actively-developed" }
task-hookrs = "0.5"
uuid = "0.6"
toml = "0.4"
-toml-query = "0.6"
+toml-query = "0.7"
log = "0.4.0"
serde_json = "1"
-error-chain = "0.11"
+error-chain = "0.12"
libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" }
libimagerror = { version = "0.9.0", path = "../../../lib/core/libimagerror" }
diff --git a/lib/domain/libimagwiki/Cargo.toml b/lib/domain/libimagwiki/Cargo.toml
index 25ad3f2..7a643ac 100644
--- a/lib/domain/libimagwiki/Cargo.toml
+++ b/lib/domain/libimagwiki/Cargo.toml
@@ -21,9 +21,9 @@ maintenance = { status = "actively-developed" }
[dependencies]
log = "0.4"
-error-chain = "0.11"
+error-chain = "0.12"
toml = "0.4"
-toml-query = "0.6"
+toml-query = "0.7"
filters = "0.2"
libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" }
diff --git a/lib/entry/libimagentryannotation/Cargo.toml b/lib/entry/libimagentryannotation/Cargo.toml
index 08cabcb..085beed 100644
--- a/lib/entry/libimagentryannotation/Cargo.toml
+++ b/lib/entry/libimagentryannotation/Cargo.toml
@@ -20,10 +20,10 @@ is-it-maintained-open-issues = { repository = "matthiasbeyer/imag" }
maintenance = { status = "actively-developed" }
[dependencies]
-lazy_static = "0.2"
+lazy_static = "1"
toml = "0.4"
-toml-query = "0.6"
-error-chain = "0.11"
+toml-query = "0.7"
+error-chain = "0.12"
libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" }
libimagerror = { version = "0.9.0", path = "../../../lib/core/libimagerror" }
diff --git a/lib/entry/libimagentrycategory/Cargo.toml b/lib/entry/libimagentrycategory/Cargo.toml
index 66087c9..174b699 100644
--- a/lib/entry/libimagentrycategory/Cargo.toml
+++ b/lib/entry/libimagentrycategory/Cargo.toml
@@ -22,8 +22,8 @@ maintenance = { status = "actively-developed" }
[dependencies]
log = "0.4.0"
toml = "0.4"
-toml-query = "0.6"
-error-chain = "0.11"
+toml-query = "0.7"
+error-chain = "0.12"
libimagerror = { version = "0.9.0", path = "../../../lib/core/libimagerror" }
libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" }
diff --git a/lib/entry/libimagentrydatetime/Cargo.toml b/lib/entry/libimagentrydatetime/Cargo.toml
index b130774..26d7e69 100644
--- a/lib/entry/libimagentrydatetime/Cargo.toml
+++ b/lib/entry/libimagentrydatetime/Cargo.toml
@@ -21,10 +21,10 @@ maintenance = { status = "actively-developed" }
[dependencies]
chrono = "0.4"
-toml-query = "0.6"
-lazy_static = "0.2"
+toml-query = "0.7"
+lazy_static = "1"
toml = "0.4"
-error-chain = "0.11"
+error-chain = "0.12"
libimagerror = { version = "0.9.0", path = "../../../lib/core/libimagerror" }
libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" }
diff --git a/lib/entry/libimagentryedit/Cargo.toml b/lib/entry/libimagentryedit/Cargo.toml
index 8d30b76..7ca095a 100644
--- a/lib/entry/libimagentryedit/Cargo.toml
+++ b/lib/entry/libimagentryedit/Cargo.toml
@@ -20,7 +20,7 @@ is-it-maintained-open-issues = { repository = "matthiasbeyer/imag" }
maintenance = { status = "actively-developed" }
[dependencies]
-error-chain = "0.11"
+error-chain = "0.12"
toml = "0.4"
libimagerror = { version = "0.9.0", path = "../../../lib/core/libimagerror" }
diff --git a/lib/entry/libimagentryfilter/Cargo.toml b/lib/entry/libimagentryfilter/Cargo.toml
index def00e4..ca9f79e 100644
--- a/lib/entry/libimagentryfilter/Cargo.toml
+++ b/lib/entry/libimagentryfilter/Cargo.toml
@@ -26,8 +26,8 @@ log = "0.4.0"
regex = "0.2"
semver = "0.8"
toml = "0.4"
-toml-query = "0.6"
-error-chain = "0.11"
+toml-query = "0.7"
+error-chain = "0.12"
libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" }
libimagentrytag = { version = "0.9.0", path = "../../../lib/entry/libimagentrytag" }
diff --git a/lib/entry/libimagentrygps/Cargo.toml b/lib/entry/libimagentrygps/Cargo.toml
index 1fc957c..9c22482 100644
--- a/lib/entry/libimagentrygps/Cargo.toml
+++ b/lib/entry/libimagentrygps/Cargo.toml
@@ -21,10 +21,10 @@ maintenance = { status = "actively-developed" }
[dependencies]
toml = "0.4"
-toml-query = "0.6"
+toml-query = "0.7"
serde_derive = "1"
serde = "1"
-error-chain = "0.11"
+error-chain = "0.12"
libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" }
libimagerror = { version = "0.9.0", path = "../../../lib/core/libimagerror" }
diff --git a/lib/entry/libimagentrylink/Cargo.toml b/lib/entry/libimagentrylink/Cargo.toml
index 3b0029e..e04d4f6 100644
--- a/lib/entry/libimagentrylink/Cargo.toml
+++ b/lib/entry/libimagentrylink/Cargo.toml
@@ -27,8 +27,8 @@ url = "1.5"
sha-1 = "0.7"
hex = "0.3"
is-match = "0.1"
-toml-query = "0.6"
-error-chain = "0.11"
+toml-query = "0.7"
+error-chain = "0.12"
libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" }
libimagerror = { version = "0.9.0", path = "../../../lib/core/libimagerror" }
diff --git a/lib/entry/libimagentrymarkdown/Cargo.toml b/lib/entry/libimagentrymarkdown/Cargo.toml
index ad2d3f8..9fa5e9d 100644
--- a/lib/entry/libimagentrymarkdown/Cargo.toml
+++ b/lib/entry/libimagentrymarkdown/Cargo.toml
@@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" }
log = "0.4.0"
hoedown = "6.0.0"
url = "1.5"
-error-chain = "0.11"
+error-chain = "0.12"
env_logger = "0.5"
libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" }
diff --git a/lib/entry/libimagentryref/Cargo.toml b/lib/entry/libimagentryref/Cargo.toml
index a23c13d..e3cc11b 100644
--- a/lib/entry/libimagentryref/Cargo.toml
+++ b/lib/entry/libimagentryref/Cargo.toml
@@ -23,8 +23,8 @@ maintenance = { status = "actively-developed" }
itertools = "0.7"
log = "0.4.0"
toml = "0.4"
-toml-query = "0.6"
-error-chain = "0.11"
+toml-query = "0.7"
+error-chain = "0.12"
sha-1 = { version = "0.7", optional = true }
sha2 = { version = "0.7", optional = true }
sha3 = { version = "0.7", optional = true }
diff --git a/lib/entry/libimagentrytag/Cargo.toml b/lib/entry/libimagentrytag/Cargo.toml
index 415c713..0a5517c 100644
--- a/lib/entry/libimagentrytag/Cargo.toml
+++ b/lib/entry/libimagentrytag/Cargo.toml
@@ -26,8 +26,8 @@ toml = "0.4"
itertools = "0.7"
is-match = "0.1"
filters = "0.3"
-toml-query = "0.6"
-error-chain = "0.11"
+toml-query = "0.7"
+error-chain = "0.12"
libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" }
libimagerror = { version = "0.9.0", path = "../../../lib/core/libimagerror" }
diff --git a/lib/entry/libimagentryutil/Cargo.toml b/lib/entry/libimagentryutil/Cargo.toml
index 24be25e..1677433 100644
--- a/lib/entry/libimagentryutil/Cargo.toml
+++ b/lib/entry/libimagentryutil/Cargo.toml
@@ -21,8 +21,8 @@ maintenance = { status = "actively-developed" }
[dependencies]
toml = "0.4"
-toml-query = "0.6"
-error-chain = "0.11"
+toml-query = "0.7"
+error-chain = "0.12"
filters = "0.3"
libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" }
diff --git a/lib/entry/libimagentryview/Cargo.toml b/lib/entry/libimagentryview/Cargo.toml
index 788b2b6..73405e9 100644
--- a/lib/entry/libimagentryview/Cargo.toml
+++ b/lib/entry/libimagentryview/Cargo.toml
@@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" }
[dependencies]
log = "0.4.0"
toml = "0.4"
-error-chain = "0.11"
+error-chain = "0.12"
textwrap = "0.9"
libimagrt = { version = "0.9.0", path = "../../../lib/core/libimagrt" }
diff --git a/lib/etc/libimaginteraction/Cargo.toml b/lib/etc/libimaginteraction/Cargo.toml
index 284570e..04e7c94 100644
--- a/lib/etc/libimaginteraction/Cargo.toml
+++ b/lib/etc/libimaginteraction/Cargo.toml
@@ -22,12 +22,12 @@ maintenance = { status = "actively-developed" }
[dependencies]
ansi_term = "0.10"
interactor = "0.1"
-lazy_static = "0.2"
+lazy_static = "1"
log = "0.4.0"
regex = "0.2"
toml = "0.4"
-error-chain = "0.11"
-handlebars = "0.29.0"
+error-chain = "0.12"
+handlebars = "1.0"
serde_json = "1"
libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" }
diff --git a/lib/etc/libimaginteraction/src/format.rs b/lib/etc/libimaginteraction/src/format.rs
index 6865501..059bbdb 100644
--- a/lib/etc/libimaginteraction/src/format.rs
+++ b/lib/etc/libimaginteraction/src/format.rs
@@ -17,7 +17,8 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//
-use handlebars::{Handlebars, HelperDef, JsonRender, RenderError, RenderContext, Helper};
+use handlebars::{HelperDef, JsonRender, RenderError, RenderContext, Helper, Output, Context};
+use handlebars::Handlebars as Registry;
use serde_json::value::Value;
use ansi_term::Colour;
use ansi_term::Style;
@@ -26,8 +27,8 @@ use ansi_term::Style;
pub struct ColorizeBlackHelper;
impl HelperDef for ColorizeBlackHelper {
- fn call(&self, h: &Helper, hb: &Handlebars, rc: &mut RenderContext) -> Result<(), RenderError> {
- colorize(Colour::Black, h, hb, rc)
+ fn call<'reg: 'rc, 'rc>(&self, h: &Helper<'reg, 'rc>, _r: &'reg Registry, _ctx: &'rc Context, _rc: &mut RenderContext<'reg>, out: &mut Output) -> Result<(), RenderError> {
+ colorize(Colour::Black, h, out)
}
}
@@ -35,8 +36,8 @@ impl HelperDef for ColorizeBlackHelper {
pub struct ColorizeBlueHelper;
impl HelperDef for ColorizeBlueHelper {
- fn call(&self, h: &Helper, hb: &Handlebars, rc: &mut RenderContext) -> Result<(), RenderError> {
- colorize(Colour::Blue, h, hb, rc)
+ fn call<'reg: 'rc, 'rc>(&self, h: &Helper<'reg, 'rc>, _r: &'reg Registry, _ctx: &'rc Context, _rc: &mut RenderContext<'reg>, out: &mut Output) -> Result<(), RenderError> {
+ colorize(Colour::Blue, h, out)
}
}
@@ -44,8 +45,8 @@ impl HelperDef for ColorizeBlueHelper {
pub struct ColorizeCyanHelper;
impl HelperDef for ColorizeCyanHelper {
- fn call(&self, h: &Helper, hb: &Handlebars, rc: &mut RenderContext) -> Result<(), RenderError> {
- colorize(Colour::Cyan, h, hb, rc)
+ fn call<'reg: 'rc, 'rc>(&self, h: &Helper<'reg, 'rc>, _r: &'reg Registry, _ctx: &'rc Context, _rc: &mut RenderContext<'reg>, out: &mut Output) -> Result<(), RenderError> {
+ colorize(Colour::Cyan, h, out)
}
}
@@ -53,8 +54,8 @@ impl HelperDef for ColorizeCyanHelper {
pub struct ColorizeGreenHelper;
impl HelperDef for ColorizeGreenHelper {
- fn call(&self, h: &Helper, hb: &Handlebars, rc: &mut RenderContext) -> Result<(), RenderError> {
- colorize(Colour::Green, h, hb, rc)
+ fn call<'reg: 'rc, 'rc>(&self, h: &Helper<'reg, 'rc>, _r: &'reg Registry, _ctx: &'rc Context, _rc: &mut RenderContext<'reg>, out: &mut Output) -> Result<(), RenderError> {
+ colorize(Colour::Green, h, out)
}
}
@@ -62,8 +63,8 @@ impl HelperDef for ColorizeGreenHelper {
pub struct ColorizePurpleHelper;
impl HelperDef for ColorizePurpleHelper {
- fn call(&self, h: &Helper, hb: &Handlebars, rc: &mut RenderContext) -> Result<(), RenderError> {
- colorize(Colour::Purple, h, hb, rc)
+ fn call<'reg: 'rc, 'rc>(&self, h: &Helper<'reg, 'rc>, _r: &'reg Registry, _ctx: &'rc Context, _rc: &mut RenderContext<'reg>, out: &mut Output) -> Result<(), RenderError> {
+ colorize(Colour::Purple, h, out)
}
}
@@ -71,8 +72,8 @@ impl HelperDef for ColorizePurpleHelper {
pub struct ColorizeRedHelper;
impl HelperDef for ColorizeRedHelper {
- fn call(&self, h: &Helper, hb: &Handlebars, rc: &mut RenderContext) -> Result<(), RenderError> {
- colorize(Colour::Red, h, hb, rc)
+ fn call<'reg: 'rc, 'rc>(&self, h: &Helper<'reg, 'rc>, _r: &'reg Registry, _ctx: &'rc Context, _rc: &mut RenderContext<'reg>, out: &mut Output) -> Result<(), RenderError> {
+ colorize(Colour::Red, h, out)
}
}
@@ -80,8 +81,8 @@ impl HelperDef for ColorizeRedHelper {
pub struct ColorizeWhiteHelper;
impl HelperDef for ColorizeWhiteHelper {
- fn call(&self, h: &Helper, hb: &Handlebars, rc: &mut RenderContext) -> Result<(), RenderError> {
- colorize(Colour::White, h, hb, rc)
+ fn call<'reg: 'rc, 'rc>(&self, h: &Helper<'reg, 'rc>, _r: &'reg Registry, _ctx: &'rc Context, _rc: &mut RenderContext<'reg>, out: &mut Output) -> Result<(), RenderError> {
+ colorize(Colour::White, h, out)
}
}
@@ -89,15 +90,16 @@ impl HelperDef for ColorizeWhiteHelper {
pub struct ColorizeYellowHelper;
impl HelperDef for ColorizeYellowHelper {
- fn call(&self, h: &Helper, hb: &Handlebars, rc: &mut RenderContext) -> Result<(), RenderError> {
- colorize(Colour::Yellow, h, hb, rc)
+ fn call<'reg: 'rc, 'rc>(&self, h: &Helper<'reg, 'rc>, _r: &'reg Registry, _ctx: &'rc Context, _rc: &mut RenderContext<'reg>, out: &mut Output) -> Result<(), RenderError> {
+ colorize(Colour::Yellow, h, out)
}
}
-fn colorize(color: Colour, h: &Helper, _: &Handlebars, rc: &mut RenderContext) -> Result<(), RenderError> {
+#[inline]
+fn colorize(color: Colour, h: &Helper, output: &mut Output) -> Result<(), RenderError> {
let p = h.param(0).ok_or(RenderError::new("Too few arguments"))?;
- write!(rc.writer(), "{}", color.paint(p.value().render()))?;
+ output.write(&format!("{}", color.paint(p.value().render())))?;
Ok(())
}
@@ -105,11 +107,10 @@ fn colorize(color: Colour, h: &Helper, _: &Handlebars, rc: &mut RenderContext) -
pub struct UnderlineHelper;
impl HelperDef for UnderlineHelper {
- fn call(&self, h: &Helper, _: &Handlebars, rc: &mut RenderContext) -> Result<(),
- RenderError> {
+ fn call<'reg: 'rc, 'rc>(&self, h: &Helper<'reg, 'rc>, _r: &'reg Registry, _ctx: &'rc Context, _rc: &mut RenderContext<'reg>, out: &mut Output) -> Result<(), RenderError> {
let p = h.param(0).ok_or(RenderError::new("Too few arguments"))?;
let s = Style::new().underline();
- write!(rc.writer(), "{}", s.paint(p.value().render()))?;
+ out.write(&format!("{}", s.paint(p.value().render())))?;
Ok(())
}
}
@@ -118,11 +119,10 @@ impl HelperDef for UnderlineHelper {
pub struct BoldHelper;
impl HelperDef for BoldHelper {
- fn call(&self, h: &Helper, _: &Handlebars, rc: &mut RenderContext) -> Result<(),
- RenderError> {
+ fn call<'reg: 'rc, 'rc>(&self, h: &Helper<'reg, 'rc>, _r: &'reg Registry, _ctx: &'rc Context, _rc: &mut RenderContext<'reg>, out: &mut Output) -> Result<(), RenderError> {
let p = h.param(0).ok_or(RenderError::new("Too few arguments"))?;
let s = Style::new().bold();
- write!(rc.writer(), "{}", s.paint(p.value().render()))?;
+ out.write(&format!("{}", s.paint(p.value().render())))?;
Ok(())
}
}
@@ -131,11 +131,10 @@ impl HelperDef for BoldHelper {
pub struct BlinkHelper;
impl HelperDef for BlinkHelper {
- fn call(&self, h: &Helper, _: &Handlebars, rc: &mut RenderContext) -> Result<(),
- RenderError> {
+ fn call<'reg: 'rc, 'rc>(&self, h: &Helper<'reg, 'rc>, _r: &'reg Registry, _ctx: &'rc Context, _rc: &mut RenderContext<'reg>, out: &mut Output) -> Result<(), RenderError> {
let p = h.param(0).ok_or(RenderError::new("Too few arguments"))?;
let s = Style::new().blink();
- write!(rc.writer(), "{}", s.paint(p.value().render()))?;
+ out.write(&format!("{}", s.paint(p.value().render())))?;
Ok(())
}
}
@@ -144,11 +143,10 @@ impl HelperDef for BlinkHelper {
pub struct StrikethroughHelper;
impl HelperDef for StrikethroughHelper {
- fn call(&self, h: &Helper, _: &Handlebars, rc: &mut RenderContext) -> Result<(),
- RenderError> {
+ fn call<'reg: 'rc, 'rc>(&self, h: &Helper<'reg, 'rc>, _r: &'reg Registry, _ctx: &'rc Context, _rc: &mut RenderContext<'reg>, out: &mut Output) -> Result<(), RenderError> {
let p = h.param(0).ok_or(RenderError::new("Too few arguments"))?;
let s = Style::new().strikethrough();
- write!(rc.writer(), "{}", s.paint(p.value().render()))?;
+ out.write(&format!("{}", s.paint(p.value().render())))?;
Ok(())
}
}
@@ -164,11 +162,11 @@ fn param_to_number(idx: usize, h: &Helper) -> Result<u64, RenderError> {
pub struct LeftPadHelper;
impl HelperDef for LeftPadHelper {
- fn call(&self, h: &Helper, _: &Handlebars, rc: &mut RenderContext) -> Result<(), RenderError> {
+ fn call<'reg: 'rc, 'rc>(&self, h: &Helper<'reg, 'rc>, _r: &'reg Registry, _ctx: &'rc Context, _rc: &mut RenderContext<'reg>, out: &mut Output) -> Result<(), RenderError> {
let count = param_to_number(0, h)? as usize;
let text = h.param(1).ok_or(RenderError::new("Too few arguments"))?;
let text = format!("{:>width$}", text.value().render(), width = count);
- write!(rc.writer(), "{}", text)?;
+ out.write(&text)?;
Ok(())
}
}
@@ -177,11 +175,11 @@ impl HelperDef for LeftPadHelper {
pub struct RightPadHelper;
impl HelperDef for RightPadHelper {
- fn call(&self, h: &Helper, _: &Handlebars, rc: &mut RenderContext) -> Result<(), RenderError> {
+ fn call<'reg: 'rc, 'rc>(&self, h: &Helper<'reg, 'rc>, _r: &'reg Registry, _ctx: &'rc Context, _rc: &mut RenderContext<'reg>, out: &mut Output) -> Result<(), RenderError> {
let count = param_to_number(0, h)? as usize;
let text = h.param(1).ok_or(RenderError::new("Too few arguments"))?;
let text = format!("{:width$}", text.value().render(), width = count);
- write!(rc.writer(), "{}", text)?;
+ out.write(&text)?;
Ok(())
}
}
@@ -190,15 +188,15 @@ impl HelperDef for RightPadHelper {
pub struct AbbrevHelper;
impl HelperDef for AbbrevHelper {
- fn call(&self, h: &Helper, _: &Handlebars, rc: &mut RenderContext) -> Result<(), RenderError> {
+ fn call<'reg: 'rc, 'rc>(&self, h: &Helper<'reg, 'rc>, _r: &'reg Registry, _ctx: &'rc Context, _rc: &mut RenderContext<'reg>, out: &mut Output) -> Result<(), RenderError> {
let count = param_to_number(0, h)? as usize;
let text = h.param(1).ok_or(RenderError::new("Too few arguments"))?.value().render();
- write!(rc.writer(), "{}", text.chars().take(count).collect::<String>())?;
+ out.write(&text.chars().take(count).collect::<String>())?;
Ok(())
}
}
-pub fn register_all_color_helpers(handlebars: &mut Handlebars) {
+pub fn register_all_color_helpers(handlebars: &mut Registry) {
handlebars.register_helper("black" , Box::new(ColorizeBlackHelper));
handlebars.register_helper("blue" , Box::new(ColorizeBlueHelper));
handlebars.register_helper("cyan" , Box::new(ColorizeCyanHelper));
@@ -209,7 +207,7 @@ pub fn register_all_color_helpers(handlebars: &mut Handlebars) {
handlebars.register_helper("yellow" , Box::new(ColorizeYellowHelper));
}
-pub fn register_all_format_helpers(handlebars: &mut Handlebars) {
+pub fn register_all_format_helpers(handlebars: &mut Registry) {
handlebars.register_helper("underline" , Box::new(UnderlineHelper));
handlebars.register_helper("bold" , Box::new(BoldHelper));
handlebars.register_helper("blink" , Box::new(BlinkHelper));
diff --git a/lib/etc/libimagnotification/Cargo.toml b/lib/etc/libimagnotification/Cargo.toml
index e4beeb0..2cfc521 100644
--- a/lib/etc/libimagnotification/Cargo.toml
+++ b/lib/etc/libimagnotification/Cargo.toml
@@ -21,7 +21,7 @@ maintenance = { status = "actively-developed" }
[dependencies]
notify-rust = "3.4.2"
-error-chain = "0.11"
+error-chain = "0.12"
libimagerror = { version = "0.9.0", path = "../../../lib/core/libimagerror" }
diff --git a/lib/etc/libimagtimeui/Cargo.toml b/lib/etc/libimagtimeui/Cargo.toml
index 050e9b7..34c8b55 100644
--- a/lib/etc/libimagtimeui/Cargo.toml
+++ b/lib/etc/libimagtimeui/Cargo.toml
@@ -20,7 +20,7 @@ is-it-maintained-open-issues = { repository = "matthiasbeyer/imag" }
maintenance = { status = "actively-developed" }
[dependencies]
-lazy_static = "0.2"
+lazy_static = "1"
log = "0.4.0"
chrono = "0.4"
regex = "0.2"
diff --git a/lib/etc/libimagutil/Cargo.toml b/lib/etc/libimagutil/Cargo.toml
index bcd3d59..fa4f757 100644
--- a/lib/etc/libimagutil/Cargo.toml
+++ b/lib/etc/libimagutil/Cargo.toml
@@ -28,7 +28,7 @@ testing = []
[dependencies]
url = "1.5"
boolinator = "2.4.0"
-lazy_static = "0.2"
+lazy_static = "1"
log = "0.4.0"
regex = "0.2"
tempfile = "2.1"