From 0a7afee454fa954ab5bdbcf5655422ac1f5e06fb Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 19 Jul 2018 20:00:54 +0200 Subject: [PATCH 01/12] Update dependency: error-chain: 0.11 -> 0.12 --- bin/core/imag-store/Cargo.toml | 2 +- lib/core/libimagerror/Cargo.toml | 2 +- lib/core/libimagrt/Cargo.toml | 2 +- lib/core/libimagstore/Cargo.toml | 2 +- lib/domain/libimagbookmark/Cargo.toml | 2 +- lib/domain/libimagcontact/Cargo.toml | 2 +- lib/domain/libimagdiary/Cargo.toml | 2 +- lib/domain/libimaghabit/Cargo.toml | 2 +- lib/domain/libimaglog/Cargo.toml | 2 +- lib/domain/libimagmail/Cargo.toml | 2 +- lib/domain/libimagnotes/Cargo.toml | 2 +- lib/domain/libimagtimetrack/Cargo.toml | 2 +- lib/domain/libimagtodo/Cargo.toml | 2 +- lib/domain/libimagwiki/Cargo.toml | 2 +- lib/entry/libimagentryannotation/Cargo.toml | 2 +- lib/entry/libimagentrycategory/Cargo.toml | 2 +- lib/entry/libimagentrydatetime/Cargo.toml | 2 +- lib/entry/libimagentryedit/Cargo.toml | 2 +- lib/entry/libimagentryfilter/Cargo.toml | 2 +- lib/entry/libimagentrygps/Cargo.toml | 2 +- lib/entry/libimagentrylink/Cargo.toml | 2 +- lib/entry/libimagentrymarkdown/Cargo.toml | 2 +- lib/entry/libimagentryref/Cargo.toml | 2 +- lib/entry/libimagentrytag/Cargo.toml | 2 +- lib/entry/libimagentryutil/Cargo.toml | 2 +- lib/entry/libimagentryview/Cargo.toml | 2 +- lib/etc/libimaginteraction/Cargo.toml | 2 +- lib/etc/libimagnotification/Cargo.toml | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/bin/core/imag-store/Cargo.toml b/bin/core/imag-store/Cargo.toml index 8a16ad27..ebc7ee50 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" } diff --git a/lib/core/libimagerror/Cargo.toml b/lib/core/libimagerror/Cargo.toml index aaa92104..fe4550ac 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 a44b0c14..862d6ecb 100644 --- a/lib/core/libimagrt/Cargo.toml +++ b/lib/core/libimagrt/Cargo.toml @@ -27,7 +27,7 @@ itertools = "0.7" ansi_term = "0.10" is-match = "0.1" toml-query = "0.6" -error-chain = "0.11" +error-chain = "0.12" handlebars = "0.29.0" atty = "0.2" diff --git a/lib/core/libimagstore/Cargo.toml b/lib/core/libimagstore/Cargo.toml index 7bb4e9ba..4d311586 100644 --- a/lib/core/libimagstore/Cargo.toml +++ b/lib/core/libimagstore/Cargo.toml @@ -29,7 +29,7 @@ walkdir = "1" is-match = "0.1" serde = "1" serde_json = "1" -error-chain = "0.11" +error-chain = "0.12" toml-query = "0.6" libimagerror = { version = "0.9.0", path = "../../../lib/core/libimagerror" } diff --git a/lib/domain/libimagbookmark/Cargo.toml b/lib/domain/libimagbookmark/Cargo.toml index 9c9587e2..09fc3068 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 3d764902..22768412 100644 --- a/lib/domain/libimagcontact/Cargo.toml +++ b/lib/domain/libimagcontact/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" log = "0.3" toml = "0.4" toml-query = "0.6" diff --git a/lib/domain/libimagdiary/Cargo.toml b/lib/domain/libimagdiary/Cargo.toml index d2d4ba3f..d8f17ac0 100644 --- a/lib/domain/libimagdiary/Cargo.toml +++ b/lib/domain/libimagdiary/Cargo.toml @@ -25,7 +25,7 @@ log = "0.4.0" toml = "0.4" toml-query = "0.6" 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 266e52fc..b528d229 100644 --- a/lib/domain/libimaghabit/Cargo.toml +++ b/lib/domain/libimaghabit/Cargo.toml @@ -24,7 +24,7 @@ chrono = "0.4" log = "0.3" toml = "0.4" toml-query = "0.6" -error-chain = "0.11" +error-chain = "0.12" kairos = "0.1.0" libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" } diff --git a/lib/domain/libimaglog/Cargo.toml b/lib/domain/libimaglog/Cargo.toml index eaf7b0e1..6eabd3ad 100644 --- a/lib/domain/libimaglog/Cargo.toml +++ b/lib/domain/libimaglog/Cargo.toml @@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" } [dependencies] toml = "0.4" toml-query = "0.6" -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/libimagmail/Cargo.toml b/lib/domain/libimagmail/Cargo.toml index 8f1daab9..01402178 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 d722edc8..6f60f2c7 100644 --- a/lib/domain/libimagnotes/Cargo.toml +++ b/lib/domain/libimagnotes/Cargo.toml @@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" } log = "0.4.0" toml = "0.4" toml-query = "0.6" -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/libimagtimetrack/Cargo.toml b/lib/domain/libimagtimetrack/Cargo.toml index 32775677..68c14ce8 100644 --- a/lib/domain/libimagtimetrack/Cargo.toml +++ b/lib/domain/libimagtimetrack/Cargo.toml @@ -26,7 +26,7 @@ toml = "0.4" toml-query = "0.6" lazy_static = "0.2" 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 f1790806..2c02d4dd 100644 --- a/lib/domain/libimagtodo/Cargo.toml +++ b/lib/domain/libimagtodo/Cargo.toml @@ -26,7 +26,7 @@ toml = "0.4" toml-query = "0.6" 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 25ad3f27..dd7164b5 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" -error-chain = "0.11" +error-chain = "0.12" toml = "0.4" toml-query = "0.6" filters = "0.2" diff --git a/lib/entry/libimagentryannotation/Cargo.toml b/lib/entry/libimagentryannotation/Cargo.toml index 08cabcbb..26cb8965 100644 --- a/lib/entry/libimagentryannotation/Cargo.toml +++ b/lib/entry/libimagentryannotation/Cargo.toml @@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" } lazy_static = "0.2" toml = "0.4" toml-query = "0.6" -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/libimagentrycategory/Cargo.toml b/lib/entry/libimagentrycategory/Cargo.toml index 66087c98..5d350615 100644 --- a/lib/entry/libimagentrycategory/Cargo.toml +++ b/lib/entry/libimagentrycategory/Cargo.toml @@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" } log = "0.4.0" toml = "0.4" toml-query = "0.6" -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/libimagentrydatetime/Cargo.toml b/lib/entry/libimagentrydatetime/Cargo.toml index b130774b..5ed9a65c 100644 --- a/lib/entry/libimagentrydatetime/Cargo.toml +++ b/lib/entry/libimagentrydatetime/Cargo.toml @@ -24,7 +24,7 @@ chrono = "0.4" toml-query = "0.6" lazy_static = "0.2" 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 8d30b767..7ca095ad 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 def00e4d..a21f1530 100644 --- a/lib/entry/libimagentryfilter/Cargo.toml +++ b/lib/entry/libimagentryfilter/Cargo.toml @@ -27,7 +27,7 @@ regex = "0.2" semver = "0.8" toml = "0.4" toml-query = "0.6" -error-chain = "0.11" +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 1fc957ce..e7099bb3 100644 --- a/lib/entry/libimagentrygps/Cargo.toml +++ b/lib/entry/libimagentrygps/Cargo.toml @@ -24,7 +24,7 @@ toml = "0.4" toml-query = "0.6" 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 3b0029ef..19da8f26 100644 --- a/lib/entry/libimagentrylink/Cargo.toml +++ b/lib/entry/libimagentrylink/Cargo.toml @@ -28,7 +28,7 @@ sha-1 = "0.7" hex = "0.3" is-match = "0.1" toml-query = "0.6" -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/libimagentrymarkdown/Cargo.toml b/lib/entry/libimagentrymarkdown/Cargo.toml index ad2d3f8c..9fa5e9d1 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 a23c13da..8c871abc 100644 --- a/lib/entry/libimagentryref/Cargo.toml +++ b/lib/entry/libimagentryref/Cargo.toml @@ -24,7 +24,7 @@ itertools = "0.7" log = "0.4.0" toml = "0.4" toml-query = "0.6" -error-chain = "0.11" +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 415c7134..ba0f769d 100644 --- a/lib/entry/libimagentrytag/Cargo.toml +++ b/lib/entry/libimagentrytag/Cargo.toml @@ -27,7 +27,7 @@ itertools = "0.7" is-match = "0.1" filters = "0.3" toml-query = "0.6" -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/libimagentryutil/Cargo.toml b/lib/entry/libimagentryutil/Cargo.toml index 24be25ef..380611c1 100644 --- a/lib/entry/libimagentryutil/Cargo.toml +++ b/lib/entry/libimagentryutil/Cargo.toml @@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" } [dependencies] toml = "0.4" toml-query = "0.6" -error-chain = "0.11" +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 788b2b65..73405e95 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 284570e5..49edab97 100644 --- a/lib/etc/libimaginteraction/Cargo.toml +++ b/lib/etc/libimaginteraction/Cargo.toml @@ -26,7 +26,7 @@ lazy_static = "0.2" log = "0.4.0" regex = "0.2" toml = "0.4" -error-chain = "0.11" +error-chain = "0.12" handlebars = "0.29.0" serde_json = "1" diff --git a/lib/etc/libimagnotification/Cargo.toml b/lib/etc/libimagnotification/Cargo.toml index e4beeb00..2cfc5216 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" } From 3d1299860306f9080711bd00099c030fda865d45 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 19 Jul 2018 20:03:22 +0200 Subject: [PATCH 02/12] Update dependency: toml-query: 0.6 -> 0.7 --- bin/core/imag-annotate/Cargo.toml | 2 +- bin/core/imag-category/Cargo.toml | 2 +- bin/core/imag-diagnostics/Cargo.toml | 4 ++-- bin/core/imag-edit/Cargo.toml | 2 +- bin/core/imag-git/Cargo.toml | 2 +- bin/core/imag-gps/Cargo.toml | 2 +- bin/core/imag-ids/Cargo.toml | 2 +- bin/core/imag-link/Cargo.toml | 2 +- bin/core/imag-store/Cargo.toml | 2 +- bin/core/imag-tag/Cargo.toml | 2 +- bin/core/imag-view/Cargo.toml | 2 +- bin/core/imag/Cargo.toml | 2 +- bin/domain/imag-bookmark/Cargo.toml | 2 +- bin/domain/imag-contact/Cargo.toml | 2 +- bin/domain/imag-diary/Cargo.toml | 2 +- bin/domain/imag-habit/Cargo.toml | 2 +- bin/domain/imag-log/Cargo.toml | 2 +- bin/domain/imag-todo/Cargo.toml | 2 +- bin/domain/imag-wiki/Cargo.toml | 2 +- lib/core/libimagrt/Cargo.toml | 2 +- lib/core/libimagstore/Cargo.toml | 2 +- lib/domain/libimagcontact/Cargo.toml | 2 +- lib/domain/libimagdiary/Cargo.toml | 2 +- lib/domain/libimaghabit/Cargo.toml | 2 +- lib/domain/libimaglog/Cargo.toml | 2 +- lib/domain/libimagnotes/Cargo.toml | 2 +- lib/domain/libimagtimetrack/Cargo.toml | 2 +- lib/domain/libimagtodo/Cargo.toml | 2 +- lib/domain/libimagwiki/Cargo.toml | 2 +- lib/entry/libimagentryannotation/Cargo.toml | 2 +- lib/entry/libimagentrycategory/Cargo.toml | 2 +- lib/entry/libimagentrydatetime/Cargo.toml | 2 +- lib/entry/libimagentryfilter/Cargo.toml | 2 +- lib/entry/libimagentrygps/Cargo.toml | 2 +- lib/entry/libimagentrylink/Cargo.toml | 2 +- lib/entry/libimagentryref/Cargo.toml | 2 +- lib/entry/libimagentrytag/Cargo.toml | 2 +- lib/entry/libimagentryutil/Cargo.toml | 2 +- 38 files changed, 39 insertions(+), 39 deletions(-) diff --git a/bin/core/imag-annotate/Cargo.toml b/bin/core/imag-annotate/Cargo.toml index 21561bbe..6819ea29 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 13272300..509db077 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 a6a12d92..58658242 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 230250fc..74a29bc6 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 295c1aae..39384947 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 92b90d79..85822c6d 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 43cf7981..da335333 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 eef2aacf..1c1db54c 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 ebc7ee50..9bc96a41 100644 --- a/bin/core/imag-store/Cargo.toml +++ b/bin/core/imag-store/Cargo.toml @@ -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 02ef200b..fb30659e 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 a54f2840..4039c42a 100644 --- a/bin/core/imag-view/Cargo.toml +++ b/bin/core/imag-view/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" handlebars = "0.29.0" tempfile = "2.1" diff --git a/bin/core/imag/Cargo.toml b/bin/core/imag/Cargo.toml index 07ac7054..ca0d379a 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 a7b206bc..ecc0a252 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 3070e2a2..9df76d74 100644 --- a/bin/domain/imag-contact/Cargo.toml +++ b/bin/domain/imag-contact/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" handlebars = "0.29" vobject = "0.4" walkdir = "1" diff --git a/bin/domain/imag-diary/Cargo.toml b/bin/domain/imag-diary/Cargo.toml index 223cdf5e..1e656766 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 bee3fba2..329e0ec8 100644 --- a/bin/domain/imag-habit/Cargo.toml +++ b/bin/domain/imag-habit/Cargo.toml @@ -25,7 +25,7 @@ maintenance = { status = "actively-developed" } chrono = "0.4" log = "0.3" toml = "0.4" -toml-query = "0.6" +toml-query = "0.7" kairos = "0.1.0" prettytable-rs = "0.6" diff --git a/bin/domain/imag-log/Cargo.toml b/bin/domain/imag-log/Cargo.toml index 3c22c706..5fabe578 100644 --- a/bin/domain/imag-log/Cargo.toml +++ b/bin/domain/imag-log/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" is-match = "0.1" itertools = "0.7" diff --git a/bin/domain/imag-todo/Cargo.toml b/bin/domain/imag-todo/Cargo.toml index 9ababa2f..4d6ca1fb 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 d222cb41..aa4bf21a 100644 --- a/bin/domain/imag-wiki/Cargo.toml +++ b/bin/domain/imag-wiki/Cargo.toml @@ -19,7 +19,7 @@ build = "../../../build.rs" clap = ">=2.17" log = "0.3" 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/libimagrt/Cargo.toml b/lib/core/libimagrt/Cargo.toml index 862d6ecb..dcd93802 100644 --- a/lib/core/libimagrt/Cargo.toml +++ b/lib/core/libimagrt/Cargo.toml @@ -26,7 +26,7 @@ xdg-basedir = "1.0" itertools = "0.7" ansi_term = "0.10" is-match = "0.1" -toml-query = "0.6" +toml-query = "0.7" error-chain = "0.12" handlebars = "0.29.0" atty = "0.2" diff --git a/lib/core/libimagstore/Cargo.toml b/lib/core/libimagstore/Cargo.toml index 4d311586..864d2b55 100644 --- a/lib/core/libimagstore/Cargo.toml +++ b/lib/core/libimagstore/Cargo.toml @@ -30,7 +30,7 @@ is-match = "0.1" serde = "1" serde_json = "1" error-chain = "0.12" -toml-query = "0.6" +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/libimagcontact/Cargo.toml b/lib/domain/libimagcontact/Cargo.toml index 22768412..75948c8e 100644 --- a/lib/domain/libimagcontact/Cargo.toml +++ b/lib/domain/libimagcontact/Cargo.toml @@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" } error-chain = "0.12" log = "0.3" toml = "0.4" -toml-query = "0.6" +toml-query = "0.7" vobject = "0.5" uuid = "0.6" serde = "1" diff --git a/lib/domain/libimagdiary/Cargo.toml b/lib/domain/libimagdiary/Cargo.toml index d8f17ac0..218a2233 100644 --- a/lib/domain/libimagdiary/Cargo.toml +++ b/lib/domain/libimagdiary/Cargo.toml @@ -23,7 +23,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" error-chain = "0.12" filters = "0.3" diff --git a/lib/domain/libimaghabit/Cargo.toml b/lib/domain/libimaghabit/Cargo.toml index b528d229..0f83bde9 100644 --- a/lib/domain/libimaghabit/Cargo.toml +++ b/lib/domain/libimaghabit/Cargo.toml @@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" } chrono = "0.4" log = "0.3" toml = "0.4" -toml-query = "0.6" +toml-query = "0.7" error-chain = "0.12" kairos = "0.1.0" diff --git a/lib/domain/libimaglog/Cargo.toml b/lib/domain/libimaglog/Cargo.toml index 6eabd3ad..764345f2 100644 --- a/lib/domain/libimaglog/Cargo.toml +++ b/lib/domain/libimaglog/Cargo.toml @@ -21,7 +21,7 @@ maintenance = { status = "actively-developed" } [dependencies] toml = "0.4" -toml-query = "0.6" +toml-query = "0.7" error-chain = "0.12" libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" } diff --git a/lib/domain/libimagnotes/Cargo.toml b/lib/domain/libimagnotes/Cargo.toml index 6f60f2c7..64dde6eb 100644 --- a/lib/domain/libimagnotes/Cargo.toml +++ b/lib/domain/libimagnotes/Cargo.toml @@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" } [dependencies] log = "0.4.0" toml = "0.4" -toml-query = "0.6" +toml-query = "0.7" error-chain = "0.12" libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" } diff --git a/lib/domain/libimagtimetrack/Cargo.toml b/lib/domain/libimagtimetrack/Cargo.toml index 68c14ce8..a6fd4b3c 100644 --- a/lib/domain/libimagtimetrack/Cargo.toml +++ b/lib/domain/libimagtimetrack/Cargo.toml @@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" } filters = "0.3" chrono = "0.4" toml = "0.4" -toml-query = "0.6" +toml-query = "0.7" lazy_static = "0.2" is-match = "0.1" error-chain = "0.12" diff --git a/lib/domain/libimagtodo/Cargo.toml b/lib/domain/libimagtodo/Cargo.toml index 2c02d4dd..34b8acee 100644 --- a/lib/domain/libimagtodo/Cargo.toml +++ b/lib/domain/libimagtodo/Cargo.toml @@ -23,7 +23,7 @@ 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.12" diff --git a/lib/domain/libimagwiki/Cargo.toml b/lib/domain/libimagwiki/Cargo.toml index dd7164b5..7a643ac8 100644 --- a/lib/domain/libimagwiki/Cargo.toml +++ b/lib/domain/libimagwiki/Cargo.toml @@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" } log = "0.4" 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 26cb8965..72ca7d4e 100644 --- a/lib/entry/libimagentryannotation/Cargo.toml +++ b/lib/entry/libimagentryannotation/Cargo.toml @@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" } [dependencies] lazy_static = "0.2" toml = "0.4" -toml-query = "0.6" +toml-query = "0.7" error-chain = "0.12" libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" } diff --git a/lib/entry/libimagentrycategory/Cargo.toml b/lib/entry/libimagentrycategory/Cargo.toml index 5d350615..174b699f 100644 --- a/lib/entry/libimagentrycategory/Cargo.toml +++ b/lib/entry/libimagentrycategory/Cargo.toml @@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" } [dependencies] log = "0.4.0" toml = "0.4" -toml-query = "0.6" +toml-query = "0.7" error-chain = "0.12" libimagerror = { version = "0.9.0", path = "../../../lib/core/libimagerror" } diff --git a/lib/entry/libimagentrydatetime/Cargo.toml b/lib/entry/libimagentrydatetime/Cargo.toml index 5ed9a65c..3f5e53cb 100644 --- a/lib/entry/libimagentrydatetime/Cargo.toml +++ b/lib/entry/libimagentrydatetime/Cargo.toml @@ -21,7 +21,7 @@ maintenance = { status = "actively-developed" } [dependencies] chrono = "0.4" -toml-query = "0.6" +toml-query = "0.7" lazy_static = "0.2" toml = "0.4" error-chain = "0.12" diff --git a/lib/entry/libimagentryfilter/Cargo.toml b/lib/entry/libimagentryfilter/Cargo.toml index a21f1530..ca9f79ea 100644 --- a/lib/entry/libimagentryfilter/Cargo.toml +++ b/lib/entry/libimagentryfilter/Cargo.toml @@ -26,7 +26,7 @@ log = "0.4.0" regex = "0.2" semver = "0.8" toml = "0.4" -toml-query = "0.6" +toml-query = "0.7" error-chain = "0.12" libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" } diff --git a/lib/entry/libimagentrygps/Cargo.toml b/lib/entry/libimagentrygps/Cargo.toml index e7099bb3..9c224824 100644 --- a/lib/entry/libimagentrygps/Cargo.toml +++ b/lib/entry/libimagentrygps/Cargo.toml @@ -21,7 +21,7 @@ maintenance = { status = "actively-developed" } [dependencies] toml = "0.4" -toml-query = "0.6" +toml-query = "0.7" serde_derive = "1" serde = "1" error-chain = "0.12" diff --git a/lib/entry/libimagentrylink/Cargo.toml b/lib/entry/libimagentrylink/Cargo.toml index 19da8f26..e04d4f6c 100644 --- a/lib/entry/libimagentrylink/Cargo.toml +++ b/lib/entry/libimagentrylink/Cargo.toml @@ -27,7 +27,7 @@ url = "1.5" sha-1 = "0.7" hex = "0.3" is-match = "0.1" -toml-query = "0.6" +toml-query = "0.7" error-chain = "0.12" libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" } diff --git a/lib/entry/libimagentryref/Cargo.toml b/lib/entry/libimagentryref/Cargo.toml index 8c871abc..e3cc11be 100644 --- a/lib/entry/libimagentryref/Cargo.toml +++ b/lib/entry/libimagentryref/Cargo.toml @@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" } itertools = "0.7" log = "0.4.0" toml = "0.4" -toml-query = "0.6" +toml-query = "0.7" error-chain = "0.12" sha-1 = { version = "0.7", optional = true } sha2 = { version = "0.7", optional = true } diff --git a/lib/entry/libimagentrytag/Cargo.toml b/lib/entry/libimagentrytag/Cargo.toml index ba0f769d..0a5517cc 100644 --- a/lib/entry/libimagentrytag/Cargo.toml +++ b/lib/entry/libimagentrytag/Cargo.toml @@ -26,7 +26,7 @@ toml = "0.4" itertools = "0.7" is-match = "0.1" filters = "0.3" -toml-query = "0.6" +toml-query = "0.7" error-chain = "0.12" libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" } diff --git a/lib/entry/libimagentryutil/Cargo.toml b/lib/entry/libimagentryutil/Cargo.toml index 380611c1..16774334 100644 --- a/lib/entry/libimagentryutil/Cargo.toml +++ b/lib/entry/libimagentryutil/Cargo.toml @@ -21,7 +21,7 @@ maintenance = { status = "actively-developed" } [dependencies] toml = "0.4" -toml-query = "0.6" +toml-query = "0.7" error-chain = "0.12" filters = "0.3" From 764a01981736c0ddce19c04b70ba22e2d868a92c Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 19 Jul 2018 20:05:00 +0200 Subject: [PATCH 03/12] Update dependency: log: 0.3 -> 0.4 --- bin/domain/imag-habit/Cargo.toml | 2 +- bin/domain/imag-log/Cargo.toml | 2 +- bin/domain/imag-wiki/Cargo.toml | 2 +- lib/domain/libimaghabit/Cargo.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/domain/imag-habit/Cargo.toml b/bin/domain/imag-habit/Cargo.toml index 329e0ec8..3a9a9d6e 100644 --- a/bin/domain/imag-habit/Cargo.toml +++ b/bin/domain/imag-habit/Cargo.toml @@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" } [dependencies] chrono = "0.4" -log = "0.3" +log = "0.4" toml = "0.4" toml-query = "0.7" kairos = "0.1.0" diff --git a/bin/domain/imag-log/Cargo.toml b/bin/domain/imag-log/Cargo.toml index 5fabe578..98283c17 100644 --- a/bin/domain/imag-log/Cargo.toml +++ b/bin/domain/imag-log/Cargo.toml @@ -22,7 +22,7 @@ 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.7" is-match = "0.1" diff --git a/bin/domain/imag-wiki/Cargo.toml b/bin/domain/imag-wiki/Cargo.toml index aa4bf21a..44ac5606 100644 --- a/bin/domain/imag-wiki/Cargo.toml +++ b/bin/domain/imag-wiki/Cargo.toml @@ -17,7 +17,7 @@ build = "../../../build.rs" [dependencies] clap = ">=2.17" -log = "0.3" +log = "0.4" toml = "0.4" toml-query = "0.7" is-match = "0.1" diff --git a/lib/domain/libimaghabit/Cargo.toml b/lib/domain/libimaghabit/Cargo.toml index 0f83bde9..8ae9cc41 100644 --- a/lib/domain/libimaghabit/Cargo.toml +++ b/lib/domain/libimaghabit/Cargo.toml @@ -21,7 +21,7 @@ maintenance = { status = "actively-developed" } [dependencies] chrono = "0.4" -log = "0.3" +log = "0.4" toml = "0.4" toml-query = "0.7" error-chain = "0.12" From abf6a3c3846709f04d9049b51fc274d922743665 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 20 Jul 2018 00:58:49 +0200 Subject: [PATCH 04/12] Update dependency: handlebars: 0.29.0 -> 1.0 --- bin/core/imag-view/Cargo.toml | 2 +- bin/domain/imag-contact/Cargo.toml | 2 +- lib/core/libimagrt/Cargo.toml | 2 +- lib/etc/libimaginteraction/Cargo.toml | 2 +- lib/etc/libimaginteraction/src/format.rs | 76 ++++++++++++------------ 5 files changed, 41 insertions(+), 43 deletions(-) diff --git a/bin/core/imag-view/Cargo.toml b/bin/core/imag-view/Cargo.toml index 4039c42a..a0d3023b 100644 --- a/bin/core/imag-view/Cargo.toml +++ b/bin/core/imag-view/Cargo.toml @@ -25,7 +25,7 @@ maintenance = { status = "actively-developed" } log = "0.4.0" toml = "0.4" toml-query = "0.7" -handlebars = "0.29.0" +handlebars = "1.0" tempfile = "2.1" libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" } diff --git a/bin/domain/imag-contact/Cargo.toml b/bin/domain/imag-contact/Cargo.toml index 9df76d74..11b8ce62 100644 --- a/bin/domain/imag-contact/Cargo.toml +++ b/bin/domain/imag-contact/Cargo.toml @@ -25,7 +25,7 @@ maintenance = { status = "actively-developed" } log = "0.4.0" toml = "0.4" toml-query = "0.7" -handlebars = "0.29" +handlebars = "1.0" vobject = "0.4" walkdir = "1" uuid = { version = "0.6", features = ["v4"] } diff --git a/lib/core/libimagrt/Cargo.toml b/lib/core/libimagrt/Cargo.toml index dcd93802..3907de97 100644 --- a/lib/core/libimagrt/Cargo.toml +++ b/lib/core/libimagrt/Cargo.toml @@ -28,7 +28,7 @@ ansi_term = "0.10" is-match = "0.1" toml-query = "0.7" error-chain = "0.12" -handlebars = "0.29.0" +handlebars = "1.0" atty = "0.2" libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" } diff --git a/lib/etc/libimaginteraction/Cargo.toml b/lib/etc/libimaginteraction/Cargo.toml index 49edab97..f38b7928 100644 --- a/lib/etc/libimaginteraction/Cargo.toml +++ b/lib/etc/libimaginteraction/Cargo.toml @@ -27,7 +27,7 @@ log = "0.4.0" regex = "0.2" toml = "0.4" error-chain = "0.12" -handlebars = "0.29.0" +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 68655013..059bbdb1 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 { 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::())?; + out.write(&text.chars().take(count).collect::())?; 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)); From c65e73acc843ee9bb32dfb4ae18614c5b82260e0 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 19 Jul 2018 21:34:33 +0200 Subject: [PATCH 05/12] Update dependency: kairos: 0.1 -> 0.2 --- bin/domain/imag-habit/Cargo.toml | 2 +- bin/domain/imag-timetrack/Cargo.toml | 2 +- lib/domain/libimaghabit/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/domain/imag-habit/Cargo.toml b/bin/domain/imag-habit/Cargo.toml index 3a9a9d6e..3c02f2e8 100644 --- a/bin/domain/imag-habit/Cargo.toml +++ b/bin/domain/imag-habit/Cargo.toml @@ -26,7 +26,7 @@ chrono = "0.4" log = "0.4" toml = "0.4" toml-query = "0.7" -kairos = "0.1.0" +kairos = "0.2" prettytable-rs = "0.6" libimagerror = { version = "0.9.0", path = "../../../lib/core/libimagerror" } diff --git a/bin/domain/imag-timetrack/Cargo.toml b/bin/domain/imag-timetrack/Cargo.toml index 8266313e..b035ce78 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 = "0.2" libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" } libimagrt = { version = "0.9.0", path = "../../../lib/core/libimagrt" } diff --git a/lib/domain/libimaghabit/Cargo.toml b/lib/domain/libimaghabit/Cargo.toml index 8ae9cc41..99289722 100644 --- a/lib/domain/libimaghabit/Cargo.toml +++ b/lib/domain/libimaghabit/Cargo.toml @@ -25,7 +25,7 @@ log = "0.4" toml = "0.4" toml-query = "0.7" error-chain = "0.12" -kairos = "0.1.0" +kairos = "0.2" libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" } libimagerror = { version = "0.9.0", path = "../../../lib/core/libimagerror" } From 61738ac9ee8c99634f2e1153cdaffdfb3e021635 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 13 Aug 2018 21:57:04 +0200 Subject: [PATCH 06/12] Revert "Update dependency: handlebars: 0.29.0 -> 1.0" This reverts commit a1f0872486995b80216e8a08a2176debdef3752a. As updating handlebars needs some more involvement, we roll back to the version we use currently and schedule the update for later. Signed-off-by: Matthias Beyer --- bin/core/imag-view/Cargo.toml | 2 +- bin/domain/imag-contact/Cargo.toml | 2 +- lib/core/libimagrt/Cargo.toml | 2 +- lib/etc/libimaginteraction/Cargo.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/core/imag-view/Cargo.toml b/bin/core/imag-view/Cargo.toml index a0d3023b..4039c42a 100644 --- a/bin/core/imag-view/Cargo.toml +++ b/bin/core/imag-view/Cargo.toml @@ -25,7 +25,7 @@ maintenance = { status = "actively-developed" } log = "0.4.0" toml = "0.4" toml-query = "0.7" -handlebars = "1.0" +handlebars = "0.29.0" tempfile = "2.1" libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" } diff --git a/bin/domain/imag-contact/Cargo.toml b/bin/domain/imag-contact/Cargo.toml index 11b8ce62..9df76d74 100644 --- a/bin/domain/imag-contact/Cargo.toml +++ b/bin/domain/imag-contact/Cargo.toml @@ -25,7 +25,7 @@ maintenance = { status = "actively-developed" } log = "0.4.0" toml = "0.4" toml-query = "0.7" -handlebars = "1.0" +handlebars = "0.29" vobject = "0.4" walkdir = "1" uuid = { version = "0.6", features = ["v4"] } diff --git a/lib/core/libimagrt/Cargo.toml b/lib/core/libimagrt/Cargo.toml index 3907de97..dcd93802 100644 --- a/lib/core/libimagrt/Cargo.toml +++ b/lib/core/libimagrt/Cargo.toml @@ -28,7 +28,7 @@ ansi_term = "0.10" is-match = "0.1" toml-query = "0.7" error-chain = "0.12" -handlebars = "1.0" +handlebars = "0.29.0" atty = "0.2" libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" } diff --git a/lib/etc/libimaginteraction/Cargo.toml b/lib/etc/libimaginteraction/Cargo.toml index f38b7928..49edab97 100644 --- a/lib/etc/libimaginteraction/Cargo.toml +++ b/lib/etc/libimaginteraction/Cargo.toml @@ -27,7 +27,7 @@ log = "0.4.0" regex = "0.2" toml = "0.4" error-chain = "0.12" -handlebars = "1.0" +handlebars = "0.29.0" serde_json = "1" libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" } From 946d9891e4a039e5bdc823bf85dafe3b6f6ea82f Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 26 Sep 2018 16:51:00 +0200 Subject: [PATCH 07/12] Update dependency: vobject: 0.{4,5} -> 0.6 --- bin/domain/imag-contact/Cargo.toml | 2 +- lib/domain/libimagcontact/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/domain/imag-contact/Cargo.toml b/bin/domain/imag-contact/Cargo.toml index 9df76d74..0618dc56 100644 --- a/bin/domain/imag-contact/Cargo.toml +++ b/bin/domain/imag-contact/Cargo.toml @@ -26,7 +26,7 @@ log = "0.4.0" toml = "0.4" toml-query = "0.7" handlebars = "0.29" -vobject = "0.4" +vobject = "0.6" walkdir = "1" uuid = { version = "0.6", features = ["v4"] } serde_json = "1" diff --git a/lib/domain/libimagcontact/Cargo.toml b/lib/domain/libimagcontact/Cargo.toml index 75948c8e..d373e947 100644 --- a/lib/domain/libimagcontact/Cargo.toml +++ b/lib/domain/libimagcontact/Cargo.toml @@ -24,7 +24,7 @@ error-chain = "0.12" log = "0.3" toml = "0.4" toml-query = "0.7" -vobject = "0.5" +vobject = "0.6" uuid = "0.6" serde = "1" serde_derive = "1" From f97d9e0d96da38f2d6cd643b290cafdb1f35c006 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 26 Sep 2018 16:52:56 +0200 Subject: [PATCH 08/12] Temporarily set vobject to custom fork until we have a new release --- bin/domain/imag-contact/Cargo.toml | 2 +- lib/domain/libimagcontact/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/domain/imag-contact/Cargo.toml b/bin/domain/imag-contact/Cargo.toml index 0618dc56..8ff941fd 100644 --- a/bin/domain/imag-contact/Cargo.toml +++ b/bin/domain/imag-contact/Cargo.toml @@ -26,7 +26,7 @@ log = "0.4.0" toml = "0.4" toml-query = "0.7" handlebars = "0.29" -vobject = "0.6" +vobject = { git = "https://github.com/matthiasbeyer/rust-vobject", branch = "update-errorchain" } walkdir = "1" uuid = { version = "0.6", features = ["v4"] } serde_json = "1" diff --git a/lib/domain/libimagcontact/Cargo.toml b/lib/domain/libimagcontact/Cargo.toml index d373e947..e361bf5b 100644 --- a/lib/domain/libimagcontact/Cargo.toml +++ b/lib/domain/libimagcontact/Cargo.toml @@ -24,7 +24,7 @@ error-chain = "0.12" log = "0.3" toml = "0.4" toml-query = "0.7" -vobject = "0.6" +vobject = { git = "https://github.com/matthiasbeyer/rust-vobject", branch = "update-errorchain" } uuid = "0.6" serde = "1" serde_derive = "1" From e838f0d0e76de7b8f9e1b871911205242f73876a Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 20 Jul 2018 00:58:49 +0200 Subject: [PATCH 09/12] Update dependency: handlebars: 0.29.0 -> 1.0 --- bin/core/imag-view/Cargo.toml | 2 +- bin/domain/imag-contact/Cargo.toml | 2 +- lib/core/libimagrt/Cargo.toml | 2 +- lib/etc/libimaginteraction/Cargo.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/core/imag-view/Cargo.toml b/bin/core/imag-view/Cargo.toml index 4039c42a..a0d3023b 100644 --- a/bin/core/imag-view/Cargo.toml +++ b/bin/core/imag-view/Cargo.toml @@ -25,7 +25,7 @@ maintenance = { status = "actively-developed" } log = "0.4.0" toml = "0.4" toml-query = "0.7" -handlebars = "0.29.0" +handlebars = "1.0" tempfile = "2.1" libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" } diff --git a/bin/domain/imag-contact/Cargo.toml b/bin/domain/imag-contact/Cargo.toml index 8ff941fd..3c95afb6 100644 --- a/bin/domain/imag-contact/Cargo.toml +++ b/bin/domain/imag-contact/Cargo.toml @@ -25,8 +25,8 @@ maintenance = { status = "actively-developed" } log = "0.4.0" toml = "0.4" toml-query = "0.7" -handlebars = "0.29" 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/lib/core/libimagrt/Cargo.toml b/lib/core/libimagrt/Cargo.toml index dcd93802..3907de97 100644 --- a/lib/core/libimagrt/Cargo.toml +++ b/lib/core/libimagrt/Cargo.toml @@ -28,7 +28,7 @@ ansi_term = "0.10" is-match = "0.1" toml-query = "0.7" error-chain = "0.12" -handlebars = "0.29.0" +handlebars = "1.0" atty = "0.2" libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" } diff --git a/lib/etc/libimaginteraction/Cargo.toml b/lib/etc/libimaginteraction/Cargo.toml index 49edab97..f38b7928 100644 --- a/lib/etc/libimaginteraction/Cargo.toml +++ b/lib/etc/libimaginteraction/Cargo.toml @@ -27,7 +27,7 @@ log = "0.4.0" regex = "0.2" toml = "0.4" error-chain = "0.12" -handlebars = "0.29.0" +handlebars = "1.0" serde_json = "1" libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" } From 1fa9b86531589d7c4ee4b50e4839bdc6016a2399 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 27 Sep 2018 10:05:39 +0200 Subject: [PATCH 10/12] Update dependency: lazy_static: 0.2 -> 1 --- lib/domain/libimagtimetrack/Cargo.toml | 2 +- lib/entry/libimagentryannotation/Cargo.toml | 2 +- lib/entry/libimagentrydatetime/Cargo.toml | 2 +- lib/etc/libimaginteraction/Cargo.toml | 2 +- lib/etc/libimagtimeui/Cargo.toml | 2 +- lib/etc/libimagutil/Cargo.toml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/domain/libimagtimetrack/Cargo.toml b/lib/domain/libimagtimetrack/Cargo.toml index a6fd4b3c..ed951391 100644 --- a/lib/domain/libimagtimetrack/Cargo.toml +++ b/lib/domain/libimagtimetrack/Cargo.toml @@ -24,7 +24,7 @@ filters = "0.3" chrono = "0.4" toml = "0.4" toml-query = "0.7" -lazy_static = "0.2" +lazy_static = "1" is-match = "0.1" error-chain = "0.12" diff --git a/lib/entry/libimagentryannotation/Cargo.toml b/lib/entry/libimagentryannotation/Cargo.toml index 72ca7d4e..085beed4 100644 --- a/lib/entry/libimagentryannotation/Cargo.toml +++ b/lib/entry/libimagentryannotation/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" toml = "0.4" toml-query = "0.7" error-chain = "0.12" diff --git a/lib/entry/libimagentrydatetime/Cargo.toml b/lib/entry/libimagentrydatetime/Cargo.toml index 3f5e53cb..26d7e69e 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.7" -lazy_static = "0.2" +lazy_static = "1" toml = "0.4" error-chain = "0.12" diff --git a/lib/etc/libimaginteraction/Cargo.toml b/lib/etc/libimaginteraction/Cargo.toml index f38b7928..04e7c946 100644 --- a/lib/etc/libimaginteraction/Cargo.toml +++ b/lib/etc/libimaginteraction/Cargo.toml @@ -22,7 +22,7 @@ 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" diff --git a/lib/etc/libimagtimeui/Cargo.toml b/lib/etc/libimagtimeui/Cargo.toml index 050e9b7e..34c8b554 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 bcd3d59a..fa4f7574 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" From d9e4eaad3cda1ed2774bea874ad16d0d12534b1c Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 27 Sep 2018 14:24:05 +0200 Subject: [PATCH 11/12] Update kairos to master branch Because of the new error-chain version which kairos can depend on, for which kairos is not yet released. --- bin/domain/imag-habit/Cargo.toml | 2 +- bin/domain/imag-timetrack/Cargo.toml | 2 +- lib/domain/libimaghabit/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/domain/imag-habit/Cargo.toml b/bin/domain/imag-habit/Cargo.toml index 3c02f2e8..b7f1b5d7 100644 --- a/bin/domain/imag-habit/Cargo.toml +++ b/bin/domain/imag-habit/Cargo.toml @@ -26,7 +26,7 @@ chrono = "0.4" log = "0.4" toml = "0.4" toml-query = "0.7" -kairos = "0.2" +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-timetrack/Cargo.toml b/bin/domain/imag-timetrack/Cargo.toml index b035ce78..328a038d 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.2" +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/lib/domain/libimaghabit/Cargo.toml b/lib/domain/libimaghabit/Cargo.toml index 99289722..5e4eb9b6 100644 --- a/lib/domain/libimaghabit/Cargo.toml +++ b/lib/domain/libimaghabit/Cargo.toml @@ -25,7 +25,7 @@ log = "0.4" toml = "0.4" toml-query = "0.7" error-chain = "0.12" -kairos = "0.2" +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" } From 89059bb7da412d6902eceb69047d1e155a4335ba Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 27 Sep 2018 14:42:58 +0200 Subject: [PATCH 12/12] Fix: Use VcardBuilder instead of Vcard itself The current implementation does not panic on VcardBuilder::build(), so we unwrap() that directly. Should be fixed in future versions of either rust-vobject or here, so that we error appropriately. Signed-off-by: Matthias Beyer --- bin/domain/imag-contact/src/create.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bin/domain/imag-contact/src/create.rs b/bin/domain/imag-contact/src/create.rs index d5ae4131..18de82c9 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 { - 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 { } + let vcard = vcard + .build() + .unwrap(); // TODO: This unwrap does not fail with rust-vobject, why is there a Result<> returned? Some(vcard) }