From dfba366a897bab1170793a511d4c3f24e3cd2c1c Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 7 Nov 2018 18:10:13 +0100 Subject: [PATCH 1/2] Add changelog for 0.9.0 Signed-off-by: Matthias Beyer --- doc/src/09020-changelog.md | 83 +++++++++++++++++++++++++++++++++++++- 1 file changed, 82 insertions(+), 1 deletion(-) diff --git a/doc/src/09020-changelog.md b/doc/src/09020-changelog.md index 3a715f9f..77be775c 100644 --- a/doc/src/09020-changelog.md +++ b/doc/src/09020-changelog.md @@ -14,13 +14,94 @@ the changelog (though updating of dependencies is). Please note that we do not have a "Breaking changes" section as we are in Version 0.y.z and thus we can break the API like we want and need to. +## 0.9.0 + +* [f912d3e7f3](https://git.imag-pim.org/imag/commit/?id=f912d3e7f362e524347cd061f316d3569dfb18a0) + Fix: Duplicated printing of output in `imag log show --all` + The problem was that the used `Diary::diary_names()` iterator does not + call `unique()` on its output. + That decision was made because the return type would get more + complicated with that feature. + The fix was to call `Itertools::unique()` on the iterator. + +* [851db4abe4](https://git.imag-pim.org/imag/commit/?id=851db4abe4d8d0aebafe35ef41c5594213b1be6b) + Do not use rust-crypto anymore, but other crates + A contribution from newpavlov. Thank you very much! + +* [5b82d53fd2](https://git.imag-pim.org/imag/commit/?id=5b82d53fd29294ac598d3e80fcee0e7b27f59c0c) + Optimize libimagstore filesystem backend + This optimization changes the backend so that the files are not held open. The + files are now read whenever they are requested, then they are cached and are + written back on "Store::update()" (which is also called when the store is + dropped). + This change allows us now to read more files into memory than there are FDs for + the process (which was a problem with really large stores and, for example, + imag-diagnostics. + +* [6a81c0afd1](https://git.imag-pim.org/imag/commit/?id=6a81c0afd1d98520d4820f6a1dcb161ee4029761) + Update rust compiler for travis + +* [ccbc2b2672](https://git.imag-pim.org/imag/commit/?id=ccbc2b2672defc61f4e67040fc193b8271bd9f60) + Add progress bar for imag-diagnostic tool, so that a user can see + that something is happening. + +* [a101e777f3](https://git.imag-pim.org/imag/commit/?id=a101e777f365bc1e1fcd9f4ca3f9a9b6198e70af) + Update dependencies + Dependencies of these imag crates where updated: + Binaries: + * imag + * imag-contact + * imag-edit + * imag-git + * imag-grep + * imag-habit + * imag-link + * imag-timetrack + * imag-view + * imag-wiki + + Libraries: + * libimagbookmark + * libimagcontact + * libimagentryfilter + * libimagentrytag + * libimagentryview + * libimagerror + * libimaginteraction + * libimagmail + * libimagrt + * libimagstore + * libimagtimeui + * libimagtodo + * libimagutil + * libimagwiki + +* [9bce68b1bf](https://git.imag-pim.org/imag/commit/?id=9bce68b1bff5e2f77f7c86424de5c16a7e38a2cc) + Optimized the libimagstore `Store::entries()` interface to have + the possibility to limit the filesystem access to subdirectories in the store + path, so that IO operations are minimized. + +* [a749d97a16](https://git.imag-pim.org/imag/commit/?id=a749d97a16af553e4a6f949538433067a757d9e8) + Switched the whole ecosystem to use `failure` for error handling. + +* [ecf4cead93](https://git.imag-pim.org/imag/commit/?id=ecf4cead93da0b04cb74370082dbfc998d7a2752) + Introduced the runtime IO system, which can now be used to chain + imag calls like so: `imag ids | imag tag add "foobar"`. + +In the process of these major changes, small bugfixes and improvements were +applied to the codebase. Too much to list all of them here, though. + +The merge messages of the respective feature branches contain more details on +the changes. + + ## 0.8.0 After the last release (0.7.0), we changed how we keep our changelog from manual adding things to the list, to using `git-notes`. Hence, there's no categorization anymore. -* Add imag-diary functionality to list existing diaries +* Add imag(https://git.imag-pim.org/imag/commit/?id=imag)diary functionality to list existing diaries * `libimagentryview`s `StdoutViewer` is now able to wrap lines From 17d412389863be1567dc2ee6e44d3a8d62194d99 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 7 Nov 2018 18:21:27 +0100 Subject: [PATCH 2/2] Update dependencies from git versions to proper versions. Signed-off-by: Matthias Beyer --- bin/core/imag-annotate/Cargo.toml | 2 +- bin/core/imag-category/Cargo.toml | 2 +- bin/core/imag-diagnostics/Cargo.toml | 2 +- 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 | 4 ++-- bin/domain/imag-diary/Cargo.toml | 2 +- bin/domain/imag-habit/Cargo.toml | 4 ++-- bin/domain/imag-log/Cargo.toml | 2 +- bin/domain/imag-timetrack/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 | 4 ++-- lib/domain/libimagcontact/Cargo.toml | 4 ++-- lib/domain/libimagdiary/Cargo.toml | 2 +- lib/domain/libimaghabit/Cargo.toml | 4 ++-- lib/domain/libimaglog/Cargo.toml | 6 +++--- lib/domain/libimagnotes/Cargo.toml | 2 +- lib/domain/libimagtimetrack/Cargo.toml | 2 +- lib/domain/libimagtodo/Cargo.toml | 4 ++-- 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 +- 39 files changed, 47 insertions(+), 47 deletions(-) diff --git a/bin/core/imag-annotate/Cargo.toml b/bin/core/imag-annotate/Cargo.toml index 25e79c57..f9094caa 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.7" +toml-query = "0.8" failure = "0.1" libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" } diff --git a/bin/core/imag-category/Cargo.toml b/bin/core/imag-category/Cargo.toml index d7d2f425..08760c94 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 = { git = "https://github.com/matthiasbeyer/toml-query", branch = "failure" } +toml-query = "0.8" 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 20fce9ee..74c9f932 100644 --- a/bin/core/imag-diagnostics/Cargo.toml +++ b/bin/core/imag-diagnostics/Cargo.toml @@ -18,7 +18,7 @@ build = "../../../build.rs" [dependencies] log = "0.4" toml = "0.4" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "failure" } +toml-query = "0.8" indicatif = "0.9" failure = "0.1" diff --git a/bin/core/imag-edit/Cargo.toml b/bin/core/imag-edit/Cargo.toml index 8f3dab49..8fead0c6 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.4" version = "3" toml = "0.4" -toml-query = "0.7" +toml-query = "0.8" 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 6023a111..219a7e44 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.4" toml = "0.4" -toml-query = "0.7" +toml-query = "0.8" 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 52c7d31f..84c48af7 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.7" +toml-query = "0.8" failure = "0.1" libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" } diff --git a/bin/core/imag-ids/Cargo.toml b/bin/core/imag-ids/Cargo.toml index 84222b38..002e8215 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 = { git = "https://github.com/matthiasbeyer/toml-query", branch = "failure" } +toml-query = "0.8" is-match = "0.1" failure = "0.1" diff --git a/bin/core/imag-link/Cargo.toml b/bin/core/imag-link/Cargo.toml index 20db392c..b3409e66 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 = { git = "https://github.com/matthiasbeyer/toml-query", branch = "failure" } +toml-query = "0.8" prettytable-rs = "0.8" failure = "0.1" diff --git a/bin/core/imag-store/Cargo.toml b/bin/core/imag-store/Cargo.toml index 63731f56..d4943129 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.7" +version = "0.8" diff --git a/bin/core/imag-tag/Cargo.toml b/bin/core/imag-tag/Cargo.toml index e591586f..820c4f7a 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 = { git = "https://github.com/matthiasbeyer/toml-query", branch = "failure" } +toml-query = "0.8" env_logger = "0.5" failure = "0.1" diff --git a/bin/core/imag-view/Cargo.toml b/bin/core/imag-view/Cargo.toml index 75df7a1f..1fa77533 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 = { git = "https://github.com/matthiasbeyer/toml-query", branch = "failure" } +toml-query = "0.8" handlebars = "1.0" tempfile = "3" failure = "0.1" diff --git a/bin/core/imag/Cargo.toml b/bin/core/imag/Cargo.toml index ba37bdf8..9dabfa9b 100644 --- a/bin/core/imag/Cargo.toml +++ b/bin/core/imag/Cargo.toml @@ -34,7 +34,7 @@ maintenance = { status = "actively-developed" } walkdir = "2" log = "0.4.0" toml = "0.4" -toml-query = "0.7" +toml-query = "0.8" libimagerror = { version = "0.9.0", path = "../../../lib/core/libimagerror" } libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" } diff --git a/bin/domain/imag-bookmark/Cargo.toml b/bin/domain/imag-bookmark/Cargo.toml index 403419bd..1e8a6b9a 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 = { git = "https://github.com/matthiasbeyer/toml-query", branch = "failure" } +toml-query = "0.8" failure = "0.1" libimagrt = { version = "0.9.0", path = "../../../lib/core/libimagrt" } diff --git a/bin/domain/imag-contact/Cargo.toml b/bin/domain/imag-contact/Cargo.toml index 11e8aafd..52d67582 100644 --- a/bin/domain/imag-contact/Cargo.toml +++ b/bin/domain/imag-contact/Cargo.toml @@ -24,8 +24,8 @@ maintenance = { status = "actively-developed" } [dependencies] log = "0.4.0" toml = "0.4" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "failure" } -vobject = { git = "https://github.com/matthiasbeyer/rust-vobject", branch = "master" } +toml-query = "0.8" +vobject = "0.7" handlebars = "1.0" walkdir = "2" uuid = { version = "0.7", features = ["v4"] } diff --git a/bin/domain/imag-diary/Cargo.toml b/bin/domain/imag-diary/Cargo.toml index abf7caa0..c83100dd 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 = { git = "https://github.com/matthiasbeyer/toml-query", branch = "failure" } +toml-query = "0.8" itertools = "0.7" failure = "0.1" diff --git a/bin/domain/imag-habit/Cargo.toml b/bin/domain/imag-habit/Cargo.toml index b7018bfa..62785674 100644 --- a/bin/domain/imag-habit/Cargo.toml +++ b/bin/domain/imag-habit/Cargo.toml @@ -25,8 +25,8 @@ maintenance = { status = "actively-developed" } chrono = "0.4" log = "0.4" toml = "0.4" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "failure" } -kairos = { git = "https://github.com/matthiasbeyer/kairos", branch = "failure" } +toml-query = "0.8" +kairos = "0.3" prettytable-rs = "0.8" failure = "0.1" diff --git a/bin/domain/imag-log/Cargo.toml b/bin/domain/imag-log/Cargo.toml index 640f098c..e24c8ac4 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.4" toml = "0.4" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "failure" } +toml-query = "0.8" is-match = "0.1" itertools = "0.7" failure = "0.1" diff --git a/bin/domain/imag-timetrack/Cargo.toml b/bin/domain/imag-timetrack/Cargo.toml index 076f2228..975cd79c 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.8" -kairos = { git = "https://github.com/matthiasbeyer/kairos", branch = "failure" } +kairos = "0.3" failure = "0.1" libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" } diff --git a/bin/domain/imag-todo/Cargo.toml b/bin/domain/imag-todo/Cargo.toml index c6e6b74b..a081e4cd 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 = { git = "https://github.com/matthiasbeyer/toml-query", branch = "failure" } +toml-query = "0.8" is-match = "0.1" failure = "0.1" diff --git a/bin/domain/imag-wiki/Cargo.toml b/bin/domain/imag-wiki/Cargo.toml index 2f1a1b8e..13da0fbd 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.4" toml = "0.4" -toml-query = "0.7" +toml-query = "0.8" is-match = "0.1" regex = "1" filters = "0.3" diff --git a/lib/core/libimagrt/Cargo.toml b/lib/core/libimagrt/Cargo.toml index 611a49c2..b0bb89bc 100644 --- a/lib/core/libimagrt/Cargo.toml +++ b/lib/core/libimagrt/Cargo.toml @@ -25,7 +25,7 @@ toml = "0.4" xdg-basedir = "1.0" itertools = "0.7" ansi_term = "0.11" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "failure" } +toml-query = "0.8" atty = "0.2" failure = "0.1" failure_derive = "0.1" diff --git a/lib/core/libimagstore/Cargo.toml b/lib/core/libimagstore/Cargo.toml index 1c8878ba..73de88a3 100644 --- a/lib/core/libimagstore/Cargo.toml +++ b/lib/core/libimagstore/Cargo.toml @@ -29,8 +29,8 @@ walkdir = "2" is-match = "0.1" serde = "1" serde_json = "1" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "failure" } -failure = "0.1" +toml-query = "0.8" +failure = "0.1" 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 7a88f45d..6b076c5f 100644 --- a/lib/domain/libimagcontact/Cargo.toml +++ b/lib/domain/libimagcontact/Cargo.toml @@ -23,8 +23,8 @@ maintenance = { status = "actively-developed" } failure = "0.1" log = "0.4" toml = "0.4" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "failure" } -vobject = { git = "https://github.com/matthiasbeyer/rust-vobject", branch = "master" } +toml-query = "0.8" +vobject = "0.7" uuid = "0.7" serde = "1" serde_derive = "1" diff --git a/lib/domain/libimagdiary/Cargo.toml b/lib/domain/libimagdiary/Cargo.toml index 6b8e1a1a..624d4efc 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.7" +toml-query = "0.8" itertools = "0.7" failure = "0.1" filters = "0.3" diff --git a/lib/domain/libimaghabit/Cargo.toml b/lib/domain/libimaghabit/Cargo.toml index 451a7a94..bf9bdcc4 100644 --- a/lib/domain/libimaghabit/Cargo.toml +++ b/lib/domain/libimaghabit/Cargo.toml @@ -23,8 +23,8 @@ maintenance = { status = "actively-developed" } chrono = "0.4" log = "0.4" toml = "0.4" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "failure" } -kairos = { git = "https://github.com/matthiasbeyer/kairos", branch = "failure" } +toml-query = "0.8" +kairos = "0.3" failure = "0.1" libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" } diff --git a/lib/domain/libimaglog/Cargo.toml b/lib/domain/libimaglog/Cargo.toml index 08509a93..62f00ee2 100644 --- a/lib/domain/libimaglog/Cargo.toml +++ b/lib/domain/libimaglog/Cargo.toml @@ -20,9 +20,9 @@ is-it-maintained-open-issues = { repository = "matthiasbeyer/imag" } maintenance = { status = "actively-developed" } [dependencies] -toml = "0.4" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "failure" } -failure = "0.1" +toml = "0.4" +toml-query = "0.8" +failure = "0.1" 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 8798250a..327d70f4 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 = { git = "https://github.com/matthiasbeyer/toml-query", branch = "failure" } +toml-query = "0.8" failure = "0.1" libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" } diff --git a/lib/domain/libimagtimetrack/Cargo.toml b/lib/domain/libimagtimetrack/Cargo.toml index f5837a26..ee7c3654 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 = { git = "https://github.com/matthiasbeyer/toml-query", branch = "failure" } +toml-query = "0.8" lazy_static = "1" is-match = "0.1" failure = "0.1" diff --git a/lib/domain/libimagtodo/Cargo.toml b/lib/domain/libimagtodo/Cargo.toml index a7f88e46..27732655 100644 --- a/lib/domain/libimagtodo/Cargo.toml +++ b/lib/domain/libimagtodo/Cargo.toml @@ -20,10 +20,10 @@ is-it-maintained-open-issues = { repository = "matthiasbeyer/imag" } maintenance = { status = "actively-developed" } [dependencies] -task-hookrs = { git = "https://github.com/matthiasbeyer/task-hookrs", branch = "failure" } +task-hookrs = "0.6.0" uuid = "0.7" toml = "0.4" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "failure" } +toml-query = "0.8" log = "0.4.0" serde_json = "1" failure = "0.1" diff --git a/lib/domain/libimagwiki/Cargo.toml b/lib/domain/libimagwiki/Cargo.toml index c5671793..c58a5203 100644 --- a/lib/domain/libimagwiki/Cargo.toml +++ b/lib/domain/libimagwiki/Cargo.toml @@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" } [dependencies] log = "0.4" toml = "0.4" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "failure" } +toml-query = "0.8" filters = "0.3" failure = "0.1" diff --git a/lib/entry/libimagentryannotation/Cargo.toml b/lib/entry/libimagentryannotation/Cargo.toml index 506a1213..843ece8e 100644 --- a/lib/entry/libimagentryannotation/Cargo.toml +++ b/lib/entry/libimagentryannotation/Cargo.toml @@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" } [dependencies] lazy_static = "1" toml = "0.4" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "failure" } +toml-query = "0.8" failure = "0.1" failure_derive = "0.1" diff --git a/lib/entry/libimagentrycategory/Cargo.toml b/lib/entry/libimagentrycategory/Cargo.toml index 29107a7a..ec050c41 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 = { git = "https://github.com/matthiasbeyer/toml-query", branch = "failure" } +toml-query = "0.8" failure = "0.1" libimagerror = { version = "0.9.0", path = "../../../lib/core/libimagerror" } diff --git a/lib/entry/libimagentrydatetime/Cargo.toml b/lib/entry/libimagentrydatetime/Cargo.toml index 3844d8da..e4d43900 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 = { git = "https://github.com/matthiasbeyer/toml-query", branch = "failure" } +toml-query = "0.8" lazy_static = "1" toml = "0.4" failure = "0.1" diff --git a/lib/entry/libimagentryfilter/Cargo.toml b/lib/entry/libimagentryfilter/Cargo.toml index cd017512..4b9a706f 100644 --- a/lib/entry/libimagentryfilter/Cargo.toml +++ b/lib/entry/libimagentryfilter/Cargo.toml @@ -26,7 +26,7 @@ log = "0.4.0" regex = "1" semver = "0.9" toml = "0.4" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "failure" } +toml-query = "0.8" failure = "0.1" failure_derive = "0.1" diff --git a/lib/entry/libimagentrygps/Cargo.toml b/lib/entry/libimagentrygps/Cargo.toml index cc166259..a7bb0668 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 = { git = "https://github.com/matthiasbeyer/toml-query", branch = "failure" } +toml-query = "0.8" serde_derive = "1" serde = "1" failure = "0.1" diff --git a/lib/entry/libimagentrylink/Cargo.toml b/lib/entry/libimagentrylink/Cargo.toml index 18dbad0c..b1b2dadf 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 = { git = "https://github.com/matthiasbeyer/toml-query", branch = "failure" } +toml-query = "0.8" failure = "0.1" failure_derive = "0.1" diff --git a/lib/entry/libimagentryref/Cargo.toml b/lib/entry/libimagentryref/Cargo.toml index 91e5d464..7fad121b 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 = { git = "https://github.com/matthiasbeyer/toml-query", branch = "failure" } +toml-query = "0.8" failure = "0.1" 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 afc743a6..95d2e50b 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 = { git = "https://github.com/matthiasbeyer/toml-query", branch = "failure" } +toml-query = "0.8" failure = "0.1" libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" } diff --git a/lib/entry/libimagentryutil/Cargo.toml b/lib/entry/libimagentryutil/Cargo.toml index c8d6da20..5d94eb27 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 = { git = "https://github.com/matthiasbeyer/toml-query", branch = "failure" } +toml-query = "0.8" filters = "0.3" failure = "0.1"