From 3b0b9c8d7ba094d08b62d04eea93dca5526bbe7f Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 30 Sep 2018 15:04:29 +0200 Subject: [PATCH 01/26] Update dependency: walkdir 1 -> 2 --- bin/core/imag/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/core/imag/Cargo.toml b/bin/core/imag/Cargo.toml index ca0d379a..051792fe 100644 --- a/bin/core/imag/Cargo.toml +++ b/bin/core/imag/Cargo.toml @@ -28,7 +28,7 @@ is-it-maintained-open-issues = { repository = "matthiasbeyer/imag" } maintenance = { status = "actively-developed" } [dependencies] -walkdir = "1" +walkdir = "2" log = "0.4.0" toml = "0.4" toml-query = "0.7" From 1c3bc5951f72740765bbd23cae8ea9110f72e88e Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 30 Sep 2018 15:04:51 +0200 Subject: [PATCH 02/26] Update dependency: ansi_term: 0.10 -> 0.11 --- lib/core/libimagerror/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/core/libimagerror/Cargo.toml b/lib/core/libimagerror/Cargo.toml index fe4550ac..914bf598 100644 --- a/lib/core/libimagerror/Cargo.toml +++ b/lib/core/libimagerror/Cargo.toml @@ -21,5 +21,5 @@ maintenance = { status = "actively-developed" } [dependencies] log = "0.4" -ansi_term = "0.10" +ansi_term = "0.11" error-chain = "0.12" From e34d67d0a11d752832ecbf2a0e002b43419b68e3 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 30 Sep 2018 15:04:51 +0200 Subject: [PATCH 03/26] Update dependency: ansi_term: 0.10 -> 0.11 --- lib/core/libimagrt/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/core/libimagrt/Cargo.toml b/lib/core/libimagrt/Cargo.toml index 3907de97..ae3c9a05 100644 --- a/lib/core/libimagrt/Cargo.toml +++ b/lib/core/libimagrt/Cargo.toml @@ -24,7 +24,7 @@ env_logger = "0.5" toml = "0.4" xdg-basedir = "1.0" itertools = "0.7" -ansi_term = "0.10" +ansi_term = "0.11" is-match = "0.1" toml-query = "0.7" error-chain = "0.12" From 989ca3dba8e92b3c34ab862d528f518e7835515e Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 30 Sep 2018 15:05:46 +0200 Subject: [PATCH 04/26] Update dependencies: regex: 0.2 -> 1, tempfile: 2 -> 3 --- lib/etc/libimagutil/Cargo.toml | 4 ++-- lib/etc/libimagutil/src/edit.rs | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/etc/libimagutil/Cargo.toml b/lib/etc/libimagutil/Cargo.toml index fa4f7574..17e979fa 100644 --- a/lib/etc/libimagutil/Cargo.toml +++ b/lib/etc/libimagutil/Cargo.toml @@ -30,7 +30,7 @@ url = "1.5" boolinator = "2.4.0" lazy_static = "1" log = "0.4.0" -regex = "0.2" -tempfile = "2.1" +regex = "1" +tempfile = "3" chrono = "0.4" diff --git a/lib/etc/libimagutil/src/edit.rs b/lib/etc/libimagutil/src/edit.rs index 17ad347c..4a91c798 100644 --- a/lib/etc/libimagutil/src/edit.rs +++ b/lib/etc/libimagutil/src/edit.rs @@ -31,7 +31,7 @@ pub fn edit_in_tmpfile_with_command(mut cmd: Command, s: &mut String) -> Result< let file_path = file.path(); file.write_all(&s.clone().into_bytes()[..])?; - file.sync_data()?; + file.as_file().sync_data()?; debug!("Calling {:?} for {}", cmd, file_path.display()); @@ -39,7 +39,8 @@ pub fn edit_in_tmpfile_with_command(mut cmd: Command, s: &mut String) -> Result< .status() .and_then(|status| { if status.success() { - file.sync_data() + file.as_file() + .sync_data() .and_then(|_| file.seek(SeekFrom::Start(0))) .and_then(|_| { let mut new_s = String::new(); From c162856a219589a5d91e14a39e3274d1f7d6cd89 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 30 Sep 2018 15:06:06 +0200 Subject: [PATCH 05/26] Update dependencies regex: 0.2 -> 1 semver: 0.8 -> 0.9 walkdir: 1 -> 2 --- lib/core/libimagstore/Cargo.toml | 6 +++--- lib/domain/libimagcontact/src/error.rs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/core/libimagstore/Cargo.toml b/lib/core/libimagstore/Cargo.toml index 864d2b55..a4da0a4b 100644 --- a/lib/core/libimagstore/Cargo.toml +++ b/lib/core/libimagstore/Cargo.toml @@ -22,10 +22,10 @@ maintenance = { status = "actively-developed" } [dependencies] glob = "0.2.11" log = "0.4.0" -regex = "0.2" -semver = "0.8" +regex = "1" +semver = "0.9" toml = "0.4" -walkdir = "1" +walkdir = "2" is-match = "0.1" serde = "1" serde_json = "1" diff --git a/lib/domain/libimagcontact/src/error.rs b/lib/domain/libimagcontact/src/error.rs index 8eb757b5..905c5711 100644 --- a/lib/domain/libimagcontact/src/error.rs +++ b/lib/domain/libimagcontact/src/error.rs @@ -35,7 +35,7 @@ error_chain! { TomlDe(::toml::de::Error); TomlSer(::toml::ser::Error); TomlQueryError(::toml_query::error::Error); - UuidError(::uuid::ParseError); + UuidError(::uuid::parser::ParseError); } errors { From 3e22f425b8062ff1b7e08d824bf3df120fa04492 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 30 Sep 2018 15:06:52 +0200 Subject: [PATCH 06/26] Update dependencies ansi_term: 0.10 -> 0.11 regex: 0.2 -> 1 --- lib/etc/libimaginteraction/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/etc/libimaginteraction/Cargo.toml b/lib/etc/libimaginteraction/Cargo.toml index 04e7c946..b4755787 100644 --- a/lib/etc/libimaginteraction/Cargo.toml +++ b/lib/etc/libimaginteraction/Cargo.toml @@ -20,11 +20,11 @@ is-it-maintained-open-issues = { repository = "matthiasbeyer/imag" } maintenance = { status = "actively-developed" } [dependencies] -ansi_term = "0.10" +ansi_term = "0.11" interactor = "0.1" lazy_static = "1" log = "0.4.0" -regex = "0.2" +regex = "1" toml = "0.4" error-chain = "0.12" handlebars = "1.0" From 155a6aeca98ede5483ba600f8fb84e02a7362928 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 30 Sep 2018 15:08:00 +0200 Subject: [PATCH 07/26] Update dependency: regex: 0.2 -> 1 --- lib/entry/libimagentrytag/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/entry/libimagentrytag/Cargo.toml b/lib/entry/libimagentrytag/Cargo.toml index 0a5517cc..43ad925f 100644 --- a/lib/entry/libimagentrytag/Cargo.toml +++ b/lib/entry/libimagentrytag/Cargo.toml @@ -21,7 +21,7 @@ maintenance = { status = "actively-developed" } [dependencies] log = "0.4.0" -regex = "0.2" +regex = "1" toml = "0.4" itertools = "0.7" is-match = "0.1" From 3e4fcb19bbdfb9dbe4f9d44ef00ee930163ed75a Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 30 Sep 2018 15:08:34 +0200 Subject: [PATCH 08/26] Update dependencies: log: 0.3 -> 0.4, version: 2 -> 3 --- bin/core/imag-edit/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/core/imag-edit/Cargo.toml b/bin/core/imag-edit/Cargo.toml index 74a29bc6..8f3dab49 100644 --- a/bin/core/imag-edit/Cargo.toml +++ b/bin/core/imag-edit/Cargo.toml @@ -22,8 +22,8 @@ is-it-maintained-open-issues = { repository = "matthiasbeyer/imag" } maintenance = { status = "actively-developed" } [dependencies] -log = "0.3" -version = "2.0.1" +log = "0.4" +version = "3" toml = "0.4" toml-query = "0.7" From 2077980f22525d82f64789153bfcd929b5935764 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 30 Sep 2018 15:08:48 +0200 Subject: [PATCH 09/26] Update dependencies: log: 0.3 -> 0.4 --- bin/core/imag-git/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/core/imag-git/Cargo.toml b/bin/core/imag-git/Cargo.toml index 39384947..6023a111 100644 --- a/bin/core/imag-git/Cargo.toml +++ b/bin/core/imag-git/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" From f2de7462930050dd334ed4ee0821e7b3d6da28fd Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 30 Sep 2018 15:09:03 +0200 Subject: [PATCH 10/26] Update dependency: regex: 0.2 -> 1 --- bin/core/imag-grep/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/core/imag-grep/Cargo.toml b/bin/core/imag-grep/Cargo.toml index 92d409dd..4c81a609 100644 --- a/bin/core/imag-grep/Cargo.toml +++ b/bin/core/imag-grep/Cargo.toml @@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" } [dependencies] log = "0.4" -regex = "0.2" +regex = "1" libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" } libimagrt = { version = "0.9.0", path = "../../../lib/core/libimagrt" } From 502889b9a2f40f322d05cd82e6abce790358a01b Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 30 Sep 2018 15:09:47 +0200 Subject: [PATCH 11/26] Update dependency: prettytable: 0.6 -> 0.8 --- bin/core/imag-link/Cargo.toml | 2 +- bin/domain/imag-habit/src/main.rs | 4 ++-- bin/domain/imag-timetrack/src/list.rs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/core/imag-link/Cargo.toml b/bin/core/imag-link/Cargo.toml index 1c1db54c..dd503bef 100644 --- a/bin/core/imag-link/Cargo.toml +++ b/bin/core/imag-link/Cargo.toml @@ -26,7 +26,7 @@ log = "0.4.0" url = "1.5" toml = "0.4" toml-query = "0.7" -prettytable-rs = "0.6" +prettytable-rs = "0.8" libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" } libimagrt = { version = "0.9.0", path = "../../../lib/core/libimagrt" } diff --git a/bin/domain/imag-habit/src/main.rs b/bin/domain/imag-habit/src/main.rs index 6d195ba8..63246fd8 100644 --- a/bin/domain/imag-habit/src/main.rs +++ b/bin/domain/imag-habit/src/main.rs @@ -51,8 +51,8 @@ use std::io::Write; use std::process::exit; use prettytable::Table; -use prettytable::cell::Cell; -use prettytable::row::Row; +use prettytable::Cell; +use prettytable::Row; use libimagrt::runtime::Runtime; use libimagrt::setup::generate_runtime_setup; diff --git a/bin/domain/imag-timetrack/src/list.rs b/bin/domain/imag-timetrack/src/list.rs index 1c3d7097..b6366196 100644 --- a/bin/domain/imag-timetrack/src/list.rs +++ b/bin/domain/imag-timetrack/src/list.rs @@ -20,8 +20,8 @@ use chrono::NaiveDateTime; use filters::filter::Filter; use prettytable::Table; -use prettytable::row::Row; -use prettytable::cell::Cell; +use prettytable::Row; +use prettytable::Cell; use kairos::parser::Parsed; use kairos::parser::parse as kairos_parse; use clap::ArgMatches; From 51730eed896785139687e672b295838c7f110af3 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 30 Sep 2018 15:10:10 +0200 Subject: [PATCH 12/26] Update dependency: tempfile: 2 -> 3 --- bin/core/imag-view/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/core/imag-view/Cargo.toml b/bin/core/imag-view/Cargo.toml index a0d3023b..93d10cf7 100644 --- a/bin/core/imag-view/Cargo.toml +++ b/bin/core/imag-view/Cargo.toml @@ -26,7 +26,7 @@ log = "0.4.0" toml = "0.4" toml-query = "0.7" handlebars = "1.0" -tempfile = "2.1" +tempfile = "3" libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" } libimagrt = { version = "0.9.0", path = "../../../lib/core/libimagrt" } From 0069463e4663ff36998373a72a9aade3662152a5 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 30 Sep 2018 15:10:46 +0200 Subject: [PATCH 13/26] Update dependencies mdcat: 0.8 -> 0.10 textwrap: 0.9 -> 0.10 --- lib/entry/libimagentryview/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/entry/libimagentryview/Cargo.toml b/lib/entry/libimagentryview/Cargo.toml index 73405e95..152b4491 100644 --- a/lib/entry/libimagentryview/Cargo.toml +++ b/lib/entry/libimagentryview/Cargo.toml @@ -23,14 +23,14 @@ maintenance = { status = "actively-developed" } log = "0.4.0" toml = "0.4" error-chain = "0.12" -textwrap = "0.9" +textwrap = "0.10" libimagrt = { version = "0.9.0", path = "../../../lib/core/libimagrt" } libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" } libimagerror = { version = "0.9.0", path = "../../../lib/core/libimagerror" } libimagentryedit = { version = "0.9.0", path = "../../../lib/entry/libimagentryedit" } -mdcat = { version = "0.8", optional = true } +mdcat = { version = "0.10", optional = true } failure = { version = "0.1", optional = true } [dependencies.pulldown-cmark] From 695d9f2df8fb08f8782a113a9be0c4b3013709d2 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 30 Sep 2018 15:11:21 +0200 Subject: [PATCH 14/26] Update dependency: regex: 0.2 -> 1 --- lib/domain/libimagbookmark/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/domain/libimagbookmark/Cargo.toml b/lib/domain/libimagbookmark/Cargo.toml index 09fc3068..e93e7362 100644 --- a/lib/domain/libimagbookmark/Cargo.toml +++ b/lib/domain/libimagbookmark/Cargo.toml @@ -21,7 +21,7 @@ maintenance = { status = "actively-developed" } [dependencies] url = "1.5" -regex = "0.2" +regex = "1" error-chain = "0.12" libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" } From ab3b36ebcf5f9f540c6289e94fc386840714cb55 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 30 Sep 2018 15:11:36 +0200 Subject: [PATCH 15/26] Update dependencies walkdir: 1 -> 2 uuid: 0.6 -> 0.7 --- bin/domain/imag-contact/Cargo.toml | 4 ++-- bin/domain/imag-contact/src/create.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/domain/imag-contact/Cargo.toml b/bin/domain/imag-contact/Cargo.toml index 3c95afb6..64db919a 100644 --- a/bin/domain/imag-contact/Cargo.toml +++ b/bin/domain/imag-contact/Cargo.toml @@ -27,8 +27,8 @@ toml = "0.4" toml-query = "0.7" vobject = { git = "https://github.com/matthiasbeyer/rust-vobject", branch = "update-errorchain" } handlebars = "1.0" -walkdir = "1" -uuid = { version = "0.6", features = ["v4"] } +walkdir = "2" +uuid = { version = "0.7", features = ["v4"] } serde_json = "1" libimagrt = { version = "0.9.0", path = "../../../lib/core/libimagrt" } diff --git a/bin/domain/imag-contact/src/create.rs b/bin/domain/imag-contact/src/create.rs index 18de82c9..02e2ec11 100644 --- a/bin/domain/imag-contact/src/create.rs +++ b/bin/domain/imag-contact/src/create.rs @@ -93,7 +93,7 @@ pub fn create(rt: &Runtime) { error!("File does exist, cannot create/override"); exit(1); } else if fl.is_dir() { - let uuid = Uuid::new_v4().hyphenated().to_string(); + let uuid = Uuid::new_v4().to_hyphenated().to_string(); fl.push(uuid.clone()); fl.set_extension("vcf"); info!("Creating file: {:?}", fl); @@ -144,7 +144,7 @@ pub fn create(rt: &Runtime) { (Box::new(file), Some(fl), uuid_string) } else { // We generate a random uuid for stdout - let uuid = Uuid::new_v4().hyphenated().to_string(); + let uuid = Uuid::new_v4().to_hyphenated().to_string(); (Box::new(rt.stdout()), None, uuid) } }; From c0f74fcbed3f5e320dfa3ffa5d4bc5962eb63192 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 30 Sep 2018 15:12:12 +0200 Subject: [PATCH 16/26] Update dependencies log: 0.3 -> 0.4 uuid: 0.6 -> 0.7 --- lib/domain/libimagcontact/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/domain/libimagcontact/Cargo.toml b/lib/domain/libimagcontact/Cargo.toml index e361bf5b..be76211c 100644 --- a/lib/domain/libimagcontact/Cargo.toml +++ b/lib/domain/libimagcontact/Cargo.toml @@ -21,11 +21,11 @@ maintenance = { status = "actively-developed" } [dependencies] error-chain = "0.12" -log = "0.3" +log = "0.4" toml = "0.4" toml-query = "0.7" vobject = { git = "https://github.com/matthiasbeyer/rust-vobject", branch = "update-errorchain" } -uuid = "0.6" +uuid = "0.7" serde = "1" serde_derive = "1" From de4df95e0449ba75f3d5d4ac4f8511346600e512 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 30 Sep 2018 15:12:38 +0200 Subject: [PATCH 17/26] Update dependency: regex: 0.2 -> 1 --- lib/etc/libimagtimeui/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/etc/libimagtimeui/Cargo.toml b/lib/etc/libimagtimeui/Cargo.toml index 34c8b554..dff34f84 100644 --- a/lib/etc/libimagtimeui/Cargo.toml +++ b/lib/etc/libimagtimeui/Cargo.toml @@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" } lazy_static = "1" log = "0.4.0" chrono = "0.4" -regex = "0.2" +regex = "1" [dependencies.clap] version = "^2.29" From f65824db222239eb036a04602b77efe77a98d56b Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 30 Sep 2018 15:12:56 +0200 Subject: [PATCH 18/26] Update dependency: prettytable: 0.6 -> 0.8 --- bin/domain/imag-habit/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/domain/imag-habit/Cargo.toml b/bin/domain/imag-habit/Cargo.toml index b7f1b5d7..7aee14ae 100644 --- a/bin/domain/imag-habit/Cargo.toml +++ b/bin/domain/imag-habit/Cargo.toml @@ -27,7 +27,7 @@ log = "0.4" toml = "0.4" toml-query = "0.7" kairos = { git = "https://github.com/matthiasbeyer/kairos", branch = "master" } -prettytable-rs = "0.6" +prettytable-rs = "0.8" libimagerror = { version = "0.9.0", path = "../../../lib/core/libimagerror" } libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" } From e8d24634e67dbb4d2cb319cf083dd901c0495abe Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 30 Sep 2018 15:13:18 +0200 Subject: [PATCH 19/26] Update dependency: email: 0.0.17 -> 0.0.20 --- lib/domain/libimagmail/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/domain/libimagmail/Cargo.toml b/lib/domain/libimagmail/Cargo.toml index 01402178..c52f8d7d 100644 --- a/lib/domain/libimagmail/Cargo.toml +++ b/lib/domain/libimagmail/Cargo.toml @@ -21,7 +21,7 @@ maintenance = { status = "actively-developed" } [dependencies] log = "0.4.0" -email = "0.0.17" +email = "0.0.20" filters = "0.3" error-chain = "0.12" From 0d6b3457413ce8707df279c5703ed879851e9e23 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 30 Sep 2018 15:13:33 +0200 Subject: [PATCH 20/26] Update dependency: prettytable: 0.6 -> 0.8 --- bin/domain/imag-timetrack/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/domain/imag-timetrack/Cargo.toml b/bin/domain/imag-timetrack/Cargo.toml index 328a038d..f19fec86 100644 --- a/bin/domain/imag-timetrack/Cargo.toml +++ b/bin/domain/imag-timetrack/Cargo.toml @@ -26,7 +26,7 @@ log = "0.4.0" chrono = "0.4" filters = "0.3" itertools = "0.7" -prettytable-rs = "0.6" +prettytable-rs = "0.8" kairos = { git = "https://github.com/matthiasbeyer/kairos", branch = "master" } libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" } From c7612f156dd72a119dd5ed6a59b667966dff2356 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 30 Sep 2018 15:13:52 +0200 Subject: [PATCH 21/26] Update dependency: uuid: 0.6 -> 0.7 --- lib/domain/libimagtodo/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/domain/libimagtodo/Cargo.toml b/lib/domain/libimagtodo/Cargo.toml index 34b8acee..696f5978 100644 --- a/lib/domain/libimagtodo/Cargo.toml +++ b/lib/domain/libimagtodo/Cargo.toml @@ -20,8 +20,8 @@ is-it-maintained-open-issues = { repository = "matthiasbeyer/imag" } maintenance = { status = "actively-developed" } [dependencies] -task-hookrs = "0.5" -uuid = "0.6" +task-hookrs = { git = "https://github.com/matthiasbeyer/task-hookrs", branch = "master" } +uuid = "0.7" toml = "0.4" toml-query = "0.7" log = "0.4.0" From f768c068e3a808f6820e55243ed92de8dbeef5fc Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 30 Sep 2018 15:14:04 +0200 Subject: [PATCH 22/26] Update dependency: regex: 0.2 -> 1 --- bin/domain/imag-wiki/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/domain/imag-wiki/Cargo.toml b/bin/domain/imag-wiki/Cargo.toml index 44ac5606..2f1a1b8e 100644 --- a/bin/domain/imag-wiki/Cargo.toml +++ b/bin/domain/imag-wiki/Cargo.toml @@ -21,7 +21,7 @@ log = "0.4" toml = "0.4" toml-query = "0.7" is-match = "0.1" -regex = "0.2" +regex = "1" filters = "0.3" libimagentryedit = { version = "0.9.0", path = "../../../lib/entry/libimagentryedit" } From 5e4779c1f01061402fcf407f67f6fd10a42d3cdd Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 30 Sep 2018 15:14:18 +0200 Subject: [PATCH 23/26] Update dependency: filters: 0.2 -> 0.3 --- lib/domain/libimagwiki/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/domain/libimagwiki/Cargo.toml b/lib/domain/libimagwiki/Cargo.toml index 7a643ac8..cd693876 100644 --- a/lib/domain/libimagwiki/Cargo.toml +++ b/lib/domain/libimagwiki/Cargo.toml @@ -24,7 +24,7 @@ log = "0.4" error-chain = "0.12" toml = "0.4" toml-query = "0.7" -filters = "0.2" +filters = "0.3" libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" } libimagerror = { version = "0.9.0", path = "../../../lib/core/libimagerror" } From 5d901ae41163c02a39e23ee2baf8577f79197411 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 30 Sep 2018 15:14:35 +0200 Subject: [PATCH 24/26] Update dependencies regex: 0.2 -> 1 semver: 0.8 -> 0.9 --- lib/entry/libimagentryfilter/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/entry/libimagentryfilter/Cargo.toml b/lib/entry/libimagentryfilter/Cargo.toml index ca9f79ea..573ea576 100644 --- a/lib/entry/libimagentryfilter/Cargo.toml +++ b/lib/entry/libimagentryfilter/Cargo.toml @@ -23,8 +23,8 @@ maintenance = { status = "actively-developed" } filters = "0.3" itertools = "0.7" log = "0.4.0" -regex = "0.2" -semver = "0.8" +regex = "1" +semver = "0.9" toml = "0.4" toml-query = "0.7" error-chain = "0.12" From 1161562372f58ee557fa9d5e3cb67a79e985716b Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 4 Oct 2018 16:11:11 +0200 Subject: [PATCH 25/26] Remove handlebars exception in log implementation The issue was that the handlebars implementation logs as well and if we use handlebars in the logger implementation that causes recursion which crashes the program. With handlebars 1.0.5, there is a feature[0] to disable logging in handlebars (compiletime) which we use with this patch. The exception-checking in the log implementation can be removed therefore. [0]: https://github.com/sunng87/handlebars-rust/pull/236#issuecomment-427014611 Signed-off-by: Matthias Beyer --- lib/core/libimagrt/Cargo.toml | 6 +++++- lib/core/libimagrt/src/logger.rs | 12 ------------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/lib/core/libimagrt/Cargo.toml b/lib/core/libimagrt/Cargo.toml index ae3c9a05..2ab0b52a 100644 --- a/lib/core/libimagrt/Cargo.toml +++ b/lib/core/libimagrt/Cargo.toml @@ -28,7 +28,6 @@ ansi_term = "0.11" is-match = "0.1" toml-query = "0.7" error-chain = "0.12" -handlebars = "1.0" atty = "0.2" libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" } @@ -46,6 +45,11 @@ version = "0.4" default-features = false features = ["std"] +[dependencies.handlebars] +version = "^1.0.5" +default-features = false +features = ["no_logging"] + [features] default = [] diff --git a/lib/core/libimagrt/src/logger.rs b/lib/core/libimagrt/src/logger.rs index 8d5d2e4d..f7d09697 100644 --- a/lib/core/libimagrt/src/logger.rs +++ b/lib/core/libimagrt/src/logger.rs @@ -131,18 +131,6 @@ impl Log for ImagLogger { } fn log(&self, record: &Record) { - if record.module_path().map(|m| m.starts_with("handlebars")).unwrap_or(false) { - // This is a ugly, yet necessary hack. When logging, we use handlebars for templating. - // But as the handlebars library itselfs logs via a normal logging macro ("debug!()"), - // we have a recursion in our chain. - // - // To prevent this recursion, we return here. - // - // (As of handlebars 0.29.0 - please check whether you can update handlebars if you see - // this. Hopefully the next version has a compiletime flag to disable logging) - return; - } - let mut data = BTreeMap::new(); { From a0730c0ca984aa3757ca2a76c6c182cd0285305a Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 4 Oct 2018 18:12:09 +0200 Subject: [PATCH 26/26] Roll back mdcat update Because 0.8 -> 0.10 has changed the API, we cannot update trivially. Revert the update because of that. --- lib/entry/libimagentryview/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/entry/libimagentryview/Cargo.toml b/lib/entry/libimagentryview/Cargo.toml index 152b4491..705e4804 100644 --- a/lib/entry/libimagentryview/Cargo.toml +++ b/lib/entry/libimagentryview/Cargo.toml @@ -30,7 +30,7 @@ libimagstore = { version = "0.9.0", path = "../../../lib/core/libimagstore" libimagerror = { version = "0.9.0", path = "../../../lib/core/libimagerror" } libimagentryedit = { version = "0.9.0", path = "../../../lib/entry/libimagentryedit" } -mdcat = { version = "0.10", optional = true } +mdcat = { version = "0.8", optional = true } failure = { version = "0.1", optional = true } [dependencies.pulldown-cmark]