summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2018-10-06 12:50:57 +0200
committerMatthias Beyer <mail@beyermatthias.de>2018-10-06 12:50:57 +0200
commita101e777f365bc1e1fcd9f4ca3f9a9b6198e70af (patch)
tree0242a8225f75c42ea896af89d09058c5a9f41344
parent879dc25316a87372b177cfbb879c51cfc0984e11 (diff)
parenta0730c0ca984aa3757ca2a76c6c182cd0285305a (diff)
downloadimag-a101e777f365bc1e1fcd9f4ca3f9a9b6198e70af.zip
imag-a101e777f365bc1e1fcd9f4ca3f9a9b6198e70af.tar.gz
Merge branch 'update-deps'
Finally some updates for the dependencies. We had a "dependency update branch" already some weeks ago, but this branch has even more updates. Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
-rw-r--r--bin/core/imag-edit/Cargo.toml4
-rw-r--r--bin/core/imag-git/Cargo.toml2
-rw-r--r--bin/core/imag-grep/Cargo.toml2
-rw-r--r--bin/core/imag-link/Cargo.toml2
-rw-r--r--bin/core/imag-view/Cargo.toml2
-rw-r--r--bin/core/imag/Cargo.toml2
-rw-r--r--bin/domain/imag-contact/Cargo.toml4
-rw-r--r--bin/domain/imag-contact/src/create.rs4
-rw-r--r--bin/domain/imag-habit/Cargo.toml2
-rw-r--r--bin/domain/imag-habit/src/main.rs4
-rw-r--r--bin/domain/imag-timetrack/Cargo.toml2
-rw-r--r--bin/domain/imag-timetrack/src/list.rs4
-rw-r--r--bin/domain/imag-wiki/Cargo.toml2
-rw-r--r--lib/core/libimagerror/Cargo.toml2
-rw-r--r--lib/core/libimagrt/Cargo.toml8
-rw-r--r--lib/core/libimagrt/src/logger.rs12
-rw-r--r--lib/core/libimagstore/Cargo.toml6
-rw-r--r--lib/domain/libimagbookmark/Cargo.toml2
-rw-r--r--lib/domain/libimagcontact/Cargo.toml4
-rw-r--r--lib/domain/libimagcontact/src/error.rs2
-rw-r--r--lib/domain/libimagmail/Cargo.toml2
-rw-r--r--lib/domain/libimagtodo/Cargo.toml4
-rw-r--r--lib/domain/libimagwiki/Cargo.toml2
-rw-r--r--lib/entry/libimagentryfilter/Cargo.toml4
-rw-r--r--lib/entry/libimagentrytag/Cargo.toml2
-rw-r--r--lib/entry/libimagentryview/Cargo.toml2
-rw-r--r--lib/etc/libimaginteraction/Cargo.toml4
-rw-r--r--lib/etc/libimagtimeui/Cargo.toml2
-rw-r--r--lib/etc/libimagutil/Cargo.toml4
-rw-r--r--lib/etc/libimagutil/src/edit.rs5
30 files changed, 48 insertions, 55 deletions
diff --git a/bin/core/imag-edit/Cargo.toml b/bin/core/imag-edit/Cargo.toml
index 74a29bc..8f3dab4 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"
diff --git a/bin/core/imag-git/Cargo.toml b/bin/core/imag-git/Cargo.toml
index 3938494..6023a11 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"
diff --git a/bin/core/imag-grep/Cargo.toml b/bin/core/imag-grep/Cargo.toml
index 92d409d..4c81a60 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" }
diff --git a/bin/core/imag-link/Cargo.toml b/bin/core/imag-link/Cargo.toml
index 1c1db54..dd503be 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/core/imag-view/Cargo.toml b/bin/core/imag-view/Cargo.toml
index a0d3023..93d10cf 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" }
diff --git a/bin/core/imag/Cargo.toml b/bin/core/imag/Cargo.toml
index ca0d379..051792f 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"
diff --git a/bin/domain/imag-contact/Cargo.toml b/bin/domain/imag-contact/Cargo.toml
index 3c95afb..64db919 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 18de82c..02e2ec1 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)
}
};
diff --git a/bin/domain/imag-habit/Cargo.toml b/bin/domain/imag-habit/Cargo.toml
index b7f1b5d..7aee14a 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" }
diff --git a/bin/domain/imag-habit/src/main.rs b/bin/domain/imag-habit/src/main.rs
index 6d195ba..63246fd 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/Cargo.toml b/bin/domain/imag-timetrack/Cargo.toml
index 328a038..f19fec8 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" }
diff --git a/bin/domain/imag-timetrack/src/list.rs b/bin/domain/imag-timetrack/src/list.rs
index 1c3d709..b636619 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;
diff --git a/bin/domain/imag-wiki/Cargo.toml b/bin/domain/imag-wiki/Cargo.toml
index 44ac560..2f1a1b8 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" }
diff --git a/lib/core/libimagerror/Cargo.toml b/lib/core/libimagerror/Cargo.toml
index fe4550a..914bf59 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"
diff --git a/lib/core/libimagrt/Cargo.toml b/lib/core/libimagrt/Cargo.toml
index 3907de9..2ab0b52 100644
--- a/lib/core/libimagrt/Cargo.toml
+++ b/lib/core/libimagrt/Cargo.toml
@@ -24,11 +24,10 @@ 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"
-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 8d5d2e4..f7d0969 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();
{
diff --git a/lib/core/libimagstore/Cargo.toml b/lib/core/libimagstore/Cargo.toml
index 864d2b5..a4da0a4 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/libimagbookmark/Cargo.toml b/lib/domain/libimagbookmark/Cargo.toml
index 09fc306..e93e736 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" }
diff --git a/lib/domain/libimagcontact/Cargo.toml b/lib/domain/libimagcontact/Cargo.toml
index e361bf5..be76211 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"
diff --git a/lib/domain/libimagcontact/src/error.rs b/lib/domain/libimagcontact/src/error.rs
index 8eb757b..905c571 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 {
diff --git a/lib/domain/libimagmail/Cargo.toml b/lib/domain/libimagmail/Cargo.toml
index 0140217..c52f8d7 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"
diff --git a/lib/domain/libimagtodo/Cargo.toml b/lib/domain/libimagtodo/Cargo.toml
index 34b8ace..696f597 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"
diff --git a/lib/domain/libimagwiki/Cargo.toml b/lib/domain/libimagwiki/Cargo.toml
index 7a643ac..cd69387 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" }
diff --git a/lib/entry/libimagentryfilter/Cargo.toml b/lib/entry/libimagentryfilter/Cargo.toml
index ca9f79e..573ea57 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"
diff --git a/lib/entry/libimagentrytag/Cargo.toml b/lib/entry/libimagentrytag/Cargo.toml
index 0a5517c..43ad925 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"
diff --git a/lib/entry/libimagentryview/Cargo.toml b/lib/entry/libimagentryview/Cargo.toml
index 73405e9..705e480 100644
--- a/lib/entry/libimagentryview/Cargo.toml
+++ b/lib/entry/libimagentryview/Cargo.toml
@@ -23,7 +23,7 @@ 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" }
diff --git a/lib/etc/libimaginteraction/Cargo.toml b/lib/etc/libimaginteraction/Cargo.toml
index 04e7c94..b475578 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"
diff --git a/lib/etc/libimagtimeui/Cargo.toml b/lib/etc/libimagtimeui/Cargo.toml
index 34c8b55..dff34f8 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"
diff --git a/lib/etc/libimagutil/Cargo.toml b/lib/etc/libimagutil/Cargo.toml
index fa4f757..17e979f 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 17ad347..4a91c79 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();