diff options
author | Matthias Beyer <mail@beyermatthias.de> | 2020-03-24 14:33:04 +0100 |
---|---|---|
committer | Matthias Beyer <mail@beyermatthias.de> | 2020-03-24 14:33:04 +0100 |
commit | 9d543a5a2e48c14f502a0e89c9e7d690bce6b45e (patch) | |
tree | 5fd1c369a0062ab8bb75dbb9ff5f5f64038b63f5 | |
parent | 7108f686dbc5ced63b372792f620bd035c00c50d (diff) | |
parent | da931f6ab7595dde1a857a4ef52cac1c336711d1 (diff) |
Merge branch 'update-toml-query' into master
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
46 files changed, 46 insertions, 55 deletions
diff --git a/bin/core/imag-annotate/Cargo.toml b/bin/core/imag-annotate/Cargo.toml index 1550a100..1516103d 100644 --- a/bin/core/imag-annotate/Cargo.toml +++ b/bin/core/imag-annotate/Cargo.toml @@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" } log = "0.4.6" url = "2" toml = "0.5.1" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "master" } +toml-query = "0.10" anyhow = "1" resiter = "0.4.0" diff --git a/bin/core/imag-category/Cargo.toml b/bin/core/imag-category/Cargo.toml index 9aabf454..4b1775f8 100644 --- a/bin/core/imag-category/Cargo.toml +++ b/bin/core/imag-category/Cargo.toml @@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" } [dependencies] log = "0.4.6" toml = "0.5.1" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "master" } +toml-query = "0.10" anyhow = "1" resiter = "0.4.0" diff --git a/bin/core/imag-diagnostics/Cargo.toml b/bin/core/imag-diagnostics/Cargo.toml index 2dafe4ba..d49da954 100644 --- a/bin/core/imag-diagnostics/Cargo.toml +++ b/bin/core/imag-diagnostics/Cargo.toml @@ -16,7 +16,7 @@ homepage = "http://imag-pim.org" [dependencies] log = "0.4.6" toml = "0.5.1" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "master" } +toml-query = "0.10" indicatif = "0.14.0" anyhow = "1" resiter = "0.4.0" diff --git a/bin/core/imag-edit/Cargo.toml b/bin/core/imag-edit/Cargo.toml index 0ba6f6d0..724152f8 100644 --- a/bin/core/imag-edit/Cargo.toml +++ b/bin/core/imag-edit/Cargo.toml @@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" } log = "0.4.6" version = "3.0.0" toml = "0.5.1" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "master" } +toml-query = "0.10" anyhow = "1" resiter = "0.4.0" diff --git a/bin/core/imag-git/Cargo.toml b/bin/core/imag-git/Cargo.toml index fb0c04de..6e143e5d 100644 --- a/bin/core/imag-git/Cargo.toml +++ b/bin/core/imag-git/Cargo.toml @@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" } [dependencies] log = "0.4.6" toml = "0.5.1" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "master" } +toml-query = "0.10" anyhow = "1" libimagrt = { version = "0.10.0", path = "../../../lib/core/libimagrt" } diff --git a/bin/core/imag-gps/Cargo.toml b/bin/core/imag-gps/Cargo.toml index c831f292..ffd10a19 100644 --- a/bin/core/imag-gps/Cargo.toml +++ b/bin/core/imag-gps/Cargo.toml @@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" } log = "0.4.6" url = "2" toml = "0.5.1" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "master" } +toml-query = "0.10" anyhow = "1" libimagstore = { version = "0.10.0", path = "../../../lib/core/libimagstore" } diff --git a/bin/core/imag-header/Cargo.toml b/bin/core/imag-header/Cargo.toml index 258baa50..6399d33a 100644 --- a/bin/core/imag-header/Cargo.toml +++ b/bin/core/imag-header/Cargo.toml @@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" } log = "0.4.6" version = "3.0.0" toml = "0.5.1" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "master" } +toml-query = "0.10" filters = "0.3.0" anyhow = "1" resiter = "0.4.0" diff --git a/bin/core/imag-id-in-collection/Cargo.toml b/bin/core/imag-id-in-collection/Cargo.toml index 91467e8e..b9e19809 100644 --- a/bin/core/imag-id-in-collection/Cargo.toml +++ b/bin/core/imag-id-in-collection/Cargo.toml @@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" } filters = "0.3.0" log = "0.4.6" toml = "0.5.1" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "master" } +toml-query = "0.10" anyhow = "1" libimagstore = { version = "0.10.0", path = "../../../lib/core/libimagstore" } diff --git a/bin/core/imag-ids/Cargo.toml b/bin/core/imag-ids/Cargo.toml index 635be96d..33695a3d 100644 --- a/bin/core/imag-ids/Cargo.toml +++ b/bin/core/imag-ids/Cargo.toml @@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" } [dependencies] log = "0.4.6" toml = "0.5.1" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "master" } +toml-query = "0.10" anyhow = "1" resiter = "0.4.0" diff --git a/bin/core/imag-link/Cargo.toml b/bin/core/imag-link/Cargo.toml index 2b8aad2e..60e049e2 100644 --- a/bin/core/imag-link/Cargo.toml +++ b/bin/core/imag-link/Cargo.toml @@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" } log = "0.4.6" url = "2" toml = "0.5.1" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "master" } +toml-query = "0.10" prettytable-rs = "0.8.0" anyhow = "1" diff --git a/bin/core/imag-store/Cargo.toml b/bin/core/imag-store/Cargo.toml index ae582e58..eaead468 100644 --- a/bin/core/imag-store/Cargo.toml +++ b/bin/core/imag-store/Cargo.toml @@ -39,7 +39,7 @@ features = ["color", "suggestions", "wrap_help"] early-panic = [ "libimagstore/early-panic" ] [dev-dependencies] -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "master" } +toml-query = "0.10" [dev-dependencies.libimagutil] version = "0.10.0" diff --git a/bin/core/imag-tag/Cargo.toml b/bin/core/imag-tag/Cargo.toml index 7c0b4a6d..22630680 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 = "master" } +toml-query = "0.10" env_logger = "0.7" [dev-dependencies.libimagutil] diff --git a/bin/core/imag-view/Cargo.toml b/bin/core/imag-view/Cargo.toml index 50e7914c..a9c9828a 100644 --- a/bin/core/imag-view/Cargo.toml +++ b/bin/core/imag-view/Cargo.toml @@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" } [dependencies] log = "0.4.6" toml = "0.5.1" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "master" } +toml-query = "0.10" handlebars = "2" tempfile = "3.0.9" anyhow = "1" diff --git a/bin/core/imag/Cargo.toml b/bin/core/imag/Cargo.toml index 5d1fa3a3..f84aad08 100644 --- a/bin/core/imag/Cargo.toml +++ b/bin/core/imag/Cargo.toml @@ -60,7 +60,7 @@ maintenance = { status = "actively-developed" } walkdir = "2.2.8" log = "0.4.6" toml = "0.5.1" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "master" } +toml-query = "0.10" anyhow = "1" libimagerror = { version = "0.10.0", path = "../../../lib/core/libimagerror" } diff --git a/bin/domain/imag-bookmark/Cargo.toml b/bin/domain/imag-bookmark/Cargo.toml index 8ab316de..5ab3ffc0 100644 --- a/bin/domain/imag-bookmark/Cargo.toml +++ b/bin/domain/imag-bookmark/Cargo.toml @@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" } [dependencies] log = "0.4.6" toml = "0.5.1" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "master" } +toml-query = "0.10" anyhow = "1" resiter = "0.4.0" url = "2" diff --git a/bin/domain/imag-calendar/Cargo.toml b/bin/domain/imag-calendar/Cargo.toml index 62fd9879..13dc00ee 100644 --- a/bin/domain/imag-calendar/Cargo.toml +++ b/bin/domain/imag-calendar/Cargo.toml @@ -46,8 +46,7 @@ default-features = false features = ["color", "suggestions", "wrap_help"] [dependencies.toml-query] -git = "https://github.com/matthiasbeyer/toml-query" -branch = "master" +version = "0.10" default-features = false features = ["typed"] diff --git a/bin/domain/imag-contact/Cargo.toml b/bin/domain/imag-contact/Cargo.toml index 8625bee7..193f3f5c 100644 --- a/bin/domain/imag-contact/Cargo.toml +++ b/bin/domain/imag-contact/Cargo.toml @@ -45,8 +45,7 @@ default-features = false features = ["color", "suggestions", "wrap_help"] [dependencies.toml-query] -git = "https://github.com/matthiasbeyer/toml-query" -branch = "master" +version = "0.10" default-features = false features = ["typed"] diff --git a/bin/domain/imag-diary/Cargo.toml b/bin/domain/imag-diary/Cargo.toml index 4d53f523..95718e64 100644 --- a/bin/domain/imag-diary/Cargo.toml +++ b/bin/domain/imag-diary/Cargo.toml @@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" } chrono = "0.4.7" log = "0.4.6" toml = "0.5.1" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "master" } +toml-query = "0.10" itertools = "0.8.0" anyhow = "1" resiter = "0.4.0" diff --git a/bin/domain/imag-habit/Cargo.toml b/bin/domain/imag-habit/Cargo.toml index 5e089f5b..21aacbe9 100644 --- a/bin/domain/imag-habit/Cargo.toml +++ b/bin/domain/imag-habit/Cargo.toml @@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" } chrono = "0.4.7" log = "0.4.6" toml = "0.5.1" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "master" } +toml-query = "0.10" kairos = "0.3.0" prettytable-rs = "0.8.0" anyhow = "1" diff --git a/bin/domain/imag-log/Cargo.toml b/bin/domain/imag-log/Cargo.toml index 4160304f..a6d3fb10 100644 --- a/bin/domain/imag-log/Cargo.toml +++ b/bin/domain/imag-log/Cargo.toml @@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" } [dependencies] log = "0.4.6" toml = "0.5.1" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "master" } +toml-query = "0.10" is-match = "0.1.0" itertools = "0.8.0" anyhow = "1" diff --git a/bin/domain/imag-mail/Cargo.toml b/bin/domain/imag-mail/Cargo.toml index 0d1fadad..7a90bba6 100644 --- a/bin/domain/imag-mail/Cargo.toml +++ b/bin/domain/imag-mail/Cargo.toml @@ -41,8 +41,7 @@ default-features = false features = ["color", "suggestions", "wrap_help"] [dependencies.toml-query] -git = "https://github.com/matthiasbeyer/toml-query" -branch = "master" +version = "0.10" default-features = false features = ["typed"] diff --git a/bin/domain/imag-todo/Cargo.toml b/bin/domain/imag-todo/Cargo.toml index 4e6f0824..db981103 100644 --- a/bin/domain/imag-todo/Cargo.toml +++ b/bin/domain/imag-todo/Cargo.toml @@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" } [dependencies] log = "0.4.6" toml = "0.5.1" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "master" } +toml-query = "0.10" is-match = "0.1.0" anyhow = "1" chrono = "0.4" diff --git a/bin/domain/imag-wiki/Cargo.toml b/bin/domain/imag-wiki/Cargo.toml index b0605867..b8b8f9aa 100644 --- a/bin/domain/imag-wiki/Cargo.toml +++ b/bin/domain/imag-wiki/Cargo.toml @@ -17,7 +17,7 @@ homepage = "http://imag-pim.org" clap = "2.33.0" log = "0.4.6" toml = "0.5.1" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "master" } +toml-query = "0.10" is-match = "0.1.0" regex = "1.1.7" filters = "0.3.0" diff --git a/lib/core/libimagrt/Cargo.toml b/lib/core/libimagrt/Cargo.toml index fc1a2d29..333eab2f 100644 --- a/lib/core/libimagrt/Cargo.toml +++ b/lib/core/libimagrt/Cargo.toml @@ -53,8 +53,7 @@ default-features = false features = ["no_logging"] [dependencies.toml-query] -git = "https://github.com/matthiasbeyer/toml-query" -branch = "master" +version = "0.10" default-features = false features = [ "typed" ] diff --git a/lib/core/libimagstore/Cargo.toml b/lib/core/libimagstore/Cargo.toml index 6357b183..f6352a2f 100644 --- a/lib/core/libimagstore/Cargo.toml +++ b/lib/core/libimagstore/Cargo.toml @@ -29,7 +29,7 @@ walkdir = "2.2.8" is-match = "0.1.0" serde = "1.0.94" serde_json = "1.0.39" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "master" } +toml-query = "0.10" anyhow = "1" libimagerror = { version = "0.10.0", path = "../../../lib/core/libimagerror" } diff --git a/lib/domain/libimagcalendar/Cargo.toml b/lib/domain/libimagcalendar/Cargo.toml index 809825f9..e305bec5 100644 --- a/lib/domain/libimagcalendar/Cargo.toml +++ b/lib/domain/libimagcalendar/Cargo.toml @@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" } anyhow = "1" log = "0.4" toml = "0.5" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "master" } +toml-query = "0.10" vobject = "0.7" chrono = "0.4" failure = "0.1" diff --git a/lib/domain/libimagcontact/Cargo.toml b/lib/domain/libimagcontact/Cargo.toml index d2f740ad..c487b2c9 100644 --- a/lib/domain/libimagcontact/Cargo.toml +++ b/lib/domain/libimagcontact/Cargo.toml @@ -24,7 +24,7 @@ anyhow = "1" failure = "0.1" log = "0.4.6" toml = "0.5.1" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "master" } +toml-query = "0.10" vobject = "0.7.0" uuid = "0.7.4" serde = "1.0.94" diff --git a/lib/domain/libimagdiary/Cargo.toml b/lib/domain/libimagdiary/Cargo.toml index b5c45a60..f73c8ee3 100644 --- a/lib/domain/libimagdiary/Cargo.toml +++ b/lib/domain/libimagdiary/Cargo.toml @@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" } chrono = "0.4.7" log = "0.4.6" toml = "0.5.1" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "master" } +toml-query = "0.10" itertools = "0.8.0" anyhow = "1" filters = "0.3.0" diff --git a/lib/domain/libimaghabit/Cargo.toml b/lib/domain/libimaghabit/Cargo.toml index b12d03e4..d28a16ce 100644 --- a/lib/domain/libimaghabit/Cargo.toml +++ b/lib/domain/libimaghabit/Cargo.toml @@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" } chrono = "0.4.7" log = "0.4.6" toml = "0.5.1" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "master" } +toml-query = "0.10" kairos = { git = "https://github.com/matthiasbeyer/kairos", branch = "master" } anyhow = "1" diff --git a/lib/domain/libimaglog/Cargo.toml b/lib/domain/libimaglog/Cargo.toml index b68567f5..7a2e4093 100644 --- a/lib/domain/libimaglog/Cargo.toml +++ b/lib/domain/libimaglog/Cargo.toml @@ -21,7 +21,7 @@ maintenance = { status = "actively-developed" } [dependencies] toml = "0.5.1" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "master" } +toml-query = "0.10" anyhow = "1" libimagstore = { version = "0.10.0", path = "../../../lib/core/libimagstore" } diff --git a/lib/domain/libimagmail/Cargo.toml b/lib/domain/libimagmail/Cargo.toml index f4a1cb82..8b7c5e25 100644 --- a/lib/domain/libimagmail/Cargo.toml +++ b/lib/domain/libimagmail/Cargo.toml @@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" } [dependencies] log = "0.4.6" toml = "0.5.1" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "master" } +toml-query = "0.10" mailparse = "0.8.0" filters = "0.3.0" anyhow = "1" diff --git a/lib/domain/libimagnotes/Cargo.toml b/lib/domain/libimagnotes/Cargo.toml index c331672a..89d078cf 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.6" toml = "0.5.1" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "master" } +toml-query = "0.10" anyhow = "1" libimagstore = { version = "0.10.0", path = "../../../lib/core/libimagstore" } diff --git a/lib/domain/libimagtimetrack/Cargo.toml b/lib/domain/libimagtimetrack/Cargo.toml index a0b20ac6..b53bb1a0 100644 --- a/lib/domain/libimagtimetrack/Cargo.toml +++ b/lib/domain/libimagtimetrack/Cargo.toml @@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" } filters = "0.3.0" chrono = "0.4.7" toml = "0.5.1" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "master" } +toml-query = "0.10" lazy_static = "1.3.0" is-match = "0.1.0" anyhow = "1" diff --git a/lib/domain/libimagtodo/Cargo.toml b/lib/domain/libimagtodo/Cargo.toml index 24f2ff37..a5f1956e 100644 --- a/lib/domain/libimagtodo/Cargo.toml +++ b/lib/domain/libimagtodo/Cargo.toml @@ -34,8 +34,7 @@ libimagentryutil = { version = "0.10.0", path = "../../../lib/entry/libimagentr libimagutil = { version = "0.10.0", path = "../../../lib/etc/libimagutil" } [dependencies.toml-query] -git = "https://github.com/matthiasbeyer/toml-query" -branch = "master" +version = "0.10" default-features = false features = ["typed"] diff --git a/lib/domain/libimagwiki/Cargo.toml b/lib/domain/libimagwiki/Cargo.toml index ecf68438..d22d7195 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.6" toml = "0.5.1" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "master" } +toml-query = "0.10" filters = "0.3.0" anyhow = "1" diff --git a/lib/entry/libimagentryannotation/Cargo.toml b/lib/entry/libimagentryannotation/Cargo.toml index 1be867c1..57c0af83 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.3.0" toml = "0.5.1" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "master" } +toml-query = "0.10" anyhow = "1" uuid = { version = "0.7.4", features = ["v4"] } diff --git a/lib/entry/libimagentrycategory/Cargo.toml b/lib/entry/libimagentrycategory/Cargo.toml index 040820d9..9f5c59f8 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.6" toml = "0.5.1" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "master" } +toml-query = "0.10" anyhow = "1" libimagerror = { version = "0.10.0", path = "../../../lib/core/libimagerror" } diff --git a/lib/entry/libimagentrydatetime/Cargo.toml b/lib/entry/libimagentrydatetime/Cargo.toml index 40bef663..3d88a241 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.7" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "master" } +toml-query = "0.10" toml = "0.5.1" anyhow = "1" diff --git a/lib/entry/libimagentryfilter/Cargo.toml b/lib/entry/libimagentryfilter/Cargo.toml index e5d63e5e..82d47422 100644 --- a/lib/entry/libimagentryfilter/Cargo.toml +++ b/lib/entry/libimagentryfilter/Cargo.toml @@ -26,7 +26,7 @@ log = "0.4.6" regex = "1.1.7" semver = "0.9.0" toml = "0.5.1" -toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "master" } +toml-query = "0.10" |