diff options
author | Matthias Beyer <mail@beyermatthias.de> | 2020-05-31 18:15:30 +0200 |
---|---|---|
committer | Matthias Beyer <mail@beyermatthias.de> | 2020-05-31 18:15:40 +0200 |
commit | 6bc08b60e6e3a99cc9a263713db33061d63dc964 (patch) | |
tree | e3b7d58387d6104fc567defcf84878517defaf1b /bin | |
parent | be50f5ad51d05dd3d24ecfd6343055737a2757f0 (diff) | |
parent | 1f86bcd12178fd45772b565213e3f874f62494be (diff) |
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Diffstat (limited to 'bin')
-rw-r--r-- | bin/core/imag-view/Cargo.toml | 2 | ||||
-rw-r--r-- | bin/domain/imag-bookmark/Cargo.toml | 4 | ||||
-rw-r--r-- | bin/domain/imag-calendar/Cargo.toml | 2 | ||||
-rw-r--r-- | bin/domain/imag-calendar/src/util.rs | 4 | ||||
-rw-r--r-- | bin/domain/imag-contact/Cargo.toml | 4 | ||||
-rw-r--r-- | bin/domain/imag-contact/src/lib.rs | 2 | ||||
-rw-r--r-- | bin/domain/imag-diary/Cargo.toml | 2 | ||||
-rw-r--r-- | bin/domain/imag-log/Cargo.toml | 2 | ||||
-rw-r--r-- | bin/domain/imag-mail/Cargo.toml | 2 | ||||
-rw-r--r-- | bin/domain/imag-mail/src/util.rs | 2 | ||||
-rw-r--r-- | bin/domain/imag-notes/Cargo.toml | 2 | ||||
-rw-r--r-- | bin/domain/imag-timetrack/Cargo.toml | 2 | ||||
-rw-r--r-- | bin/domain/imag-todo/Cargo.toml | 6 | ||||
-rw-r--r-- | bin/domain/imag-todo/src/util.rs | 2 |
14 files changed, 19 insertions, 19 deletions
diff --git a/bin/core/imag-view/Cargo.toml b/bin/core/imag-view/Cargo.toml index 8eb92907..7015d5f5 100644 --- a/bin/core/imag-view/Cargo.toml +++ b/bin/core/imag-view/Cargo.toml @@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" } log = "0.4.6" toml = "0.5.1" toml-query = "0.10" -handlebars = "2" +handlebars = "3" tempfile = "3.0.9" anyhow = "1" resiter = "0.4.0" diff --git a/bin/domain/imag-bookmark/Cargo.toml b/bin/domain/imag-bookmark/Cargo.toml index f062b16f..565b6a3e 100644 --- a/bin/domain/imag-bookmark/Cargo.toml +++ b/bin/domain/imag-bookmark/Cargo.toml @@ -26,7 +26,7 @@ toml-query = "0.10" anyhow = "1" resiter = "0.4.0" url = "2" -handlebars = "2" +handlebars = "3" rayon = "1" libimagrt = { version = "0.10.0", path = "../../../lib/core/libimagrt" } @@ -43,7 +43,7 @@ default-features = false features = ["color", "suggestions", "wrap_help"] [dependencies.uuid] -version = "0.7" +version = "0.8" default-features = false features = ["serde", "v4"] diff --git a/bin/domain/imag-calendar/Cargo.toml b/bin/domain/imag-calendar/Cargo.toml index 12146bea..12a5359d 100644 --- a/bin/domain/imag-calendar/Cargo.toml +++ b/bin/domain/imag-calendar/Cargo.toml @@ -26,7 +26,7 @@ anyhow = "1" failure = "0.1" walkdir = "2.2.8" vobject = "0.7" -handlebars = "2" +handlebars = "3" chrono = "0.4" kairos = "0.3" resiter = "0.4.0" diff --git a/bin/domain/imag-calendar/src/util.rs b/bin/domain/imag-calendar/src/util.rs index 1467d310..636e3ec3 100644 --- a/bin/domain/imag-calendar/src/util.rs +++ b/bin/domain/imag-calendar/src/util.rs @@ -71,8 +71,8 @@ impl<'a> ParsedEventFLE<'a> { } } -pub fn get_event_print_format(config_value_path: &'static str, rt: &Runtime, scmd: &ArgMatches) - -> Result<Handlebars> +pub fn get_event_print_format<'rc>(config_value_path: &'static str, rt: &Runtime, scmd: &ArgMatches) + -> Result<Handlebars<'rc>> { scmd.value_of("format") .map(String::from) diff --git a/bin/domain/imag-contact/Cargo.toml b/bin/domain/imag-contact/Cargo.toml index 12f6392e..9427c42e 100644 --- a/bin/domain/imag-contact/Cargo.toml +++ b/bin/domain/imag-contact/Cargo.toml @@ -23,9 +23,9 @@ maintenance = { status = "actively-developed" } log = "0.4.6" toml = "0.5.1" vobject = "0.7.0" -handlebars = "2" +handlebars = "3" walkdir = "2.2.8" -uuid = { version = "0.7.4", features = ["v4"] } +uuid = { version = "0.8", features = ["v4"] } serde_json = "1.0.39" anyhow = "1" resiter = "0.4" diff --git a/bin/domain/imag-contact/src/lib.rs b/bin/domain/imag-contact/src/lib.rs index 13f17e0f..f7a4af90 100644 --- a/bin/domain/imag-contact/src/lib.rs +++ b/bin/domain/imag-contact/src/lib.rs @@ -380,7 +380,7 @@ fn find(rt: &Runtime) -> Result<()> { } } -fn get_contact_print_format(config_value_path: &'static str, rt: &Runtime, scmd: &ArgMatches) -> Result<Handlebars> { +fn get_contact_print_format<'rc>(config_value_path: &'static str, rt: &Runtime, scmd: &ArgMatches) -> Result<Handlebars<'rc>> { let fmt = match scmd.value_of("format").map(String::from) { Some(s) => Ok(s), None => rt.config() diff --git a/bin/domain/imag-diary/Cargo.toml b/bin/domain/imag-diary/Cargo.toml index 1fbf2ff3..ed0d4c49 100644 --- a/bin/domain/imag-diary/Cargo.toml +++ b/bin/domain/imag-diary/Cargo.toml @@ -24,7 +24,7 @@ chrono = "0.4.7" log = "0.4.6" toml = "0.5.1" toml-query = "0.10" -itertools = "0.8.0" +itertools = "0.9.0" anyhow = "1" resiter = "0.4.0" option-inspect = "0.1.0" diff --git a/bin/domain/imag-log/Cargo.toml b/bin/domain/imag-log/Cargo.toml index b0f974fe..ca456003 100644 --- a/bin/domain/imag-log/Cargo.toml +++ b/bin/domain/imag-log/Cargo.toml @@ -24,7 +24,7 @@ log = "0.4.6" toml = "0.5.1" toml-query = "0.10" is-match = "0.1.0" -itertools = "0.8.0" +itertools = "0.9.0" anyhow = "1" textwrap = "0.11.0" resiter = "0.4.0" diff --git a/bin/domain/imag-mail/Cargo.toml b/bin/domain/imag-mail/Cargo.toml index a1c0dcab..32cae649 100644 --- a/bin/domain/imag-mail/Cargo.toml +++ b/bin/domain/imag-mail/Cargo.toml @@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" } log = "0.4.6" anyhow = "1" resiter = "0.4" -handlebars = "2" +handlebars = "3" walkdir = "2" rayon = "1" diff --git a/bin/domain/imag-mail/src/util.rs b/bin/domain/imag-mail/src/util.rs index bdd27ba2..151c82fb 100644 --- a/bin/domain/imag-mail/src/util.rs +++ b/bin/domain/imag-mail/src/util.rs @@ -32,7 +32,7 @@ use libimagrt::runtime::Runtime; use libimagstore::store::FileLockEntry; use libimagentryref::reference::Config as RefConfig; -pub fn get_mail_print_format(config_value_path: &'static str, rt: &Runtime, scmd: &ArgMatches) -> Result<Handlebars> { +pub fn get_mail_print_format<'rc>(config_value_path: &'static str, rt: &Runtime, scmd: &ArgMatches) -> Result<Handlebars<'rc>> { let fmt = match scmd.value_of("format").map(String::from) { Some(s) => Ok(s), None => { diff --git a/bin/domain/imag-notes/Cargo.toml b/bin/domain/imag-notes/Cargo.toml index 574a8cb0..72b6712c 100644 --- a/bin/domain/imag-notes/Cargo.toml +++ b/bin/domain/imag-notes/Cargo.toml @@ -21,7 +21,7 @@ maintenance = { status = "actively-developed" } [dependencies] log = "0.4.6" -itertools = "0.8.0" +itertools = "0.9.0" anyhow = "1" resiter = "0.4.0" diff --git a/bin/domain/imag-timetrack/Cargo.toml b/bin/domain/imag-timetrack/Cargo.toml index e519aba7..e0ddd896 100644 --- a/bin/domain/imag-timetrack/Cargo.toml +++ b/bin/domain/imag-timetrack/Cargo.toml @@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" } log = "0.4.6" chrono = "0.4.7" filters = "0.3.0" -itertools = "0.8.0" +itertools = "0.9.0" prettytable-rs = "0.8.0" kairos = "0.3.0" anyhow = "1" diff --git a/bin/domain/imag-todo/Cargo.toml b/bin/domain/imag-todo/Cargo.toml index d837b70a..55a62422 100644 --- a/bin/domain/imag-todo/Cargo.toml +++ b/bin/domain/imag-todo/Cargo.toml @@ -29,7 +29,7 @@ chrono = "0.4" filters = "0.3" kairos = "0.3" resiter = "0.4.0" -handlebars = "2" +handlebars = "3" prettytable-rs = "0.8.0" libimagrt = { version = "0.10.0", path = "../../../lib/core/libimagrt" } @@ -47,11 +47,11 @@ default-features = false features = ["color", "suggestions", "wrap_help"] [dependencies.task-hookrs] -version = "0.7.0" +git = "https://github.com/matthiasbeyer/task-hookrs" optional = true [dependencies.uuid] -version = "0.7.4" +version = "0.8" features = ["v4"] optional = true diff --git a/bin/domain/imag-todo/src/util.rs b/bin/domain/imag-todo/src/util.rs index 9fce60e6..a22a3ae2 100644 --- a/bin/domain/imag-todo/src/util.rs +++ b/bin/domain/imag-todo/src/util.rs @@ -38,7 +38,7 @@ pub fn get_dt_str(d: Result<Option<NaiveDateTime>>, s: &str) -> Result<String> { .unwrap_or_else(|| s.to_string())) } -pub fn get_todo_print_format(config_value_path: &'static str, rt: &Runtime, scmd: &ArgMatches) -> Result<Handlebars> { +pub fn get_todo_print_format<'rc>(config_value_path: &'static str, rt: &Runtime, scmd: &ArgMatches) -> Result<Handlebars<'rc>> { let fmt = match scmd.value_of("format").map(String::from) { Some(s) => Ok(s), None => { |