diff options
55 files changed, 7 insertions, 111 deletions
diff --git a/bin/core/imag-link/Cargo.toml b/bin/core/imag-link/Cargo.toml index 7b2c1884..c73ec329 100644 --- a/bin/core/imag-link/Cargo.toml +++ b/bin/core/imag-link/Cargo.toml @@ -14,13 +14,12 @@ repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" [dependencies] -semver = "0.5.1" clap = ">=2.17" log = "0.3" version = "2.0.1" -toml = "^0.4" -toml-query = "0.1" url = "1.2" +toml = "0.4" +toml-query = "0.3.0" libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" } libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" } diff --git a/bin/core/imag-link/src/main.rs b/bin/core/imag-link/src/main.rs index 45c08325..6e3a92b8 100644 --- a/bin/core/imag-link/src/main.rs +++ b/bin/core/imag-link/src/main.rs @@ -34,11 +34,10 @@ #[macro_use] extern crate log; extern crate clap; -extern crate semver; -extern crate toml; -extern crate toml_query; extern crate url; #[macro_use] extern crate version; +#[cfg(test)] extern crate toml; +#[cfg(test)] extern crate toml_query; extern crate libimagentrylink; extern crate libimagrt; diff --git a/bin/core/imag-ref/Cargo.toml b/bin/core/imag-ref/Cargo.toml index d2e92b19..1d93a042 100644 --- a/bin/core/imag-ref/Cargo.toml +++ b/bin/core/imag-ref/Cargo.toml @@ -14,12 +14,10 @@ repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" [dependencies] -semver = "0.5.1" clap = ">=2.17" log = "0.3" version = "2.0.1" -libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" } libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" } libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" } libimagentryref = { version = "0.4.0", path = "../../../lib/entry/libimagentryref" } diff --git a/bin/core/imag-ref/src/main.rs b/bin/core/imag-ref/src/main.rs index aa2f7d08..092ca762 100644 --- a/bin/core/imag-ref/src/main.rs +++ b/bin/core/imag-ref/src/main.rs @@ -34,10 +34,8 @@ #[macro_use] extern crate log; #[macro_use] extern crate version; -extern crate semver; extern crate clap; -extern crate libimagstore; extern crate libimagrt; extern crate libimagentryref; extern crate libimagerror; diff --git a/bin/core/imag-store/Cargo.toml b/bin/core/imag-store/Cargo.toml index d2e47410..34a54b92 100644 --- a/bin/core/imag-store/Cargo.toml +++ b/bin/core/imag-store/Cargo.toml @@ -17,7 +17,6 @@ homepage = "http://imag-pim.org" clap = ">=2.17" log = "0.3" version = "2.0.1" -semver = "0.5" toml = "^0.4" libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore", features = ["verify"] } diff --git a/bin/core/imag-store/src/main.rs b/bin/core/imag-store/src/main.rs index c425bf7b..9e5c5267 100644 --- a/bin/core/imag-store/src/main.rs +++ b/bin/core/imag-store/src/main.rs @@ -34,7 +34,6 @@ extern crate clap; #[macro_use] extern crate log; -extern crate semver; extern crate toml; #[macro_use] extern crate version; diff --git a/bin/core/imag-tag/Cargo.toml b/bin/core/imag-tag/Cargo.toml index afd41e61..0e53a1c0 100644 --- a/bin/core/imag-tag/Cargo.toml +++ b/bin/core/imag-tag/Cargo.toml @@ -17,8 +17,7 @@ homepage = "http://imag-pim.org" clap = "2.*" log = "0.3" version = "2.0.1" -semver = "0.2" -toml = "^0.4" +toml = "0.4" libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" } libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" } diff --git a/bin/core/imag-tag/src/main.rs b/bin/core/imag-tag/src/main.rs index c4f7eb3f..882a4053 100644 --- a/bin/core/imag-tag/src/main.rs +++ b/bin/core/imag-tag/src/main.rs @@ -19,10 +19,10 @@ extern crate clap; #[macro_use] extern crate log; -extern crate semver; -extern crate toml; #[macro_use] extern crate version; +#[cfg(test)] extern crate toml; + extern crate libimagstore; extern crate libimagrt; extern crate libimagentrytag; diff --git a/bin/core/imag-view/Cargo.toml b/bin/core/imag-view/Cargo.toml index ad4456a9..ed69c44c 100644 --- a/bin/core/imag-view/Cargo.toml +++ b/bin/core/imag-view/Cargo.toml @@ -16,8 +16,6 @@ homepage = "http://imag-pim.org" [dependencies] clap = ">=2.17" log = "0.3" -semver = "0.5" -toml = "^0.4" version = "2.0.1" libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" } diff --git a/bin/core/imag-view/src/main.rs b/bin/core/imag-view/src/main.rs index da20fa54..e6b78092 100644 --- a/bin/core/imag-view/src/main.rs +++ b/bin/core/imag-view/src/main.rs @@ -34,8 +34,6 @@ extern crate clap; #[macro_use] extern crate log; -extern crate semver; -extern crate toml; #[macro_use] extern crate version; extern crate libimagentryview; diff --git a/bin/domain/imag-bookmark/Cargo.toml b/bin/domain/imag-bookmark/Cargo.toml index 658566d3..3ab2a245 100644 --- a/bin/domain/imag-bookmark/Cargo.toml +++ b/bin/domain/imag-bookmark/Cargo.toml @@ -21,6 +21,5 @@ version = "2.0.1" libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" } libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" } libimagbookmark = { version = "0.4.0", path = "../../../lib/domain/libimagbookmark" } -libimagentrylink = { version = "0.4.0", path = "../../../lib/entry/libimagentrylink" } libimagentrytag = { version = "0.4.0", path = "../../../lib/entry/libimagentrytag" } libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" } diff --git a/bin/domain/imag-bookmark/src/main.rs b/bin/domain/imag-bookmark/src/main.rs index e0635164..43924e73 100644 --- a/bin/domain/imag-bookmark/src/main.rs +++ b/bin/domain/imag-bookmark/src/main.rs @@ -37,7 +37,6 @@ extern crate clap; #[macro_use] extern crate version; extern crate libimagbookmark; -extern crate libimagentrylink; extern crate libimagentrytag; extern crate libimagrt; extern crate libimagerror; diff --git a/bin/domain/imag-mail/Cargo.toml b/bin/domain/imag-mail/Cargo.toml index 8c9dfbc5..ac69c58c 100644 --- a/bin/domain/imag-mail/Cargo.toml +++ b/bin/domain/imag-mail/Cargo.toml @@ -10,12 +10,9 @@ readme = "../README.md" license = "LGPL-2.1" [dependencies] -semver = "0.5" clap = "2.*" log = "0.3" version = "2.0.1" -toml = "0.4.*" -url = "1.2" libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" } libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" } diff --git a/bin/domain/imag-mail/src/main.rs b/bin/domain/imag-mail/src/main.rs index 1eeb52bf..cb910630 100644 --- a/bin/domain/imag-mail/src/main.rs +++ b/bin/domain/imag-mail/src/main.rs @@ -17,10 +17,7 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA // -extern crate semver; extern crate clap; -extern crate toml; -extern crate url; #[macro_use] extern crate log; #[macro_use] extern crate version; diff --git a/bin/domain/imag-notes/Cargo.toml b/bin/domain/imag-notes/Cargo.toml index e274e3d8..6228662c 100644 --- a/bin/domain/imag-notes/Cargo.toml +++ b/bin/domain/imag-notes/Cargo.toml @@ -14,7 +14,6 @@ repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" [dependencies] -semver = "0.2.1" clap = ">=2.17" log = "0.3" version = "2.0.1" diff --git a/bin/domain/imag-notes/src/main.rs b/bin/domain/imag-notes/src/main.rs index 697c034d..5d07f5b7 100644 --- a/bin/domain/imag-notes/src/main.rs +++ b/bin/domain/imag-notes/src/main.rs @@ -19,7 +19,6 @@ extern crate clap; #[macro_use] extern crate log; -extern crate semver; #[macro_use] extern crate version; extern crate itertools; diff --git a/bin/domain/imag-timetrack/Cargo.toml b/bin/domain/imag-timetrack/Cargo.toml index 21b394bc..27d68595 100644 --- a/bin/domain/imag-timetrack/Cargo.toml +++ b/bin/domain/imag-timetrack/Cargo.toml @@ -17,8 +17,6 @@ homepage = "http://imag-pim.org" clap = "2.*" log = "0.3" version = "2.0.1" -semver = "0.2" -toml = "^0.4" chrono = "^0.4" filters = "0.1.1" itertools = "0.6" @@ -27,4 +25,3 @@ libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" } libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" } libimagtimetrack = { version = "0.4.0", path = "../../../lib/domain/libimagtimetrack" } -libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" } diff --git a/bin/domain/imag-timetrack/src/main.rs b/bin/domain/imag-timetrack/src/main.rs index 7fc53bfa..85e270a6 100644 --- a/bin/domain/imag-timetrack/src/main.rs +++ b/bin/domain/imag-timetrack/src/main.rs @@ -24,8 +24,6 @@ extern crate log; extern crate version; extern crate clap; -extern crate semver; -extern crate toml; extern crate chrono; extern crate filters; extern crate itertools; @@ -34,7 +32,6 @@ extern crate libimagerror; extern crate libimagstore; extern crate libimagrt; extern crate libimagtimetrack; -extern crate libimagutil; mod cont; mod day; diff --git a/bin/domain/imag-todo/Cargo.toml b/bin/domain/imag-todo/Cargo.toml index 047cdd50..a2c1503d 100644 --- a/bin/domain/imag-todo/Cargo.toml +++ b/bin/domain/imag-todo/Cargo.toml @@ -15,17 +15,12 @@ homepage = "http://imag-pim.org" [dependencies] clap = ">=2.17" -glob = "0.2.11" log = "0.3.6" -semver = "0.5.1" -serde_json = "0.8.3" -task-hookrs = "0.2.2" toml = "0.4.*" toml-query = "0.3.*" is-match = "0.1.*" version = "2.0.1" libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" } -libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" } libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" } libimagtodo = { version = "0.4.0", path = "../../../lib/domain/libimagtodo" } diff --git a/bin/domain/imag-todo/src/main.rs b/bin/domain/imag-todo/src/main.rs index b9bd8872..43545d2a 100644 --- a/bin/domain/imag-todo/src/main.rs +++ b/bin/domain/imag-todo/src/main.rs @@ -18,19 +18,13 @@ // extern crate clap; -extern crate glob; #[macro_use] extern crate log; -extern crate serde_json; -extern crate semver; extern crate toml; extern crate toml_query; #[macro_use] extern crate is_match; #[macro_use] extern crate version; -extern crate task_hookrs; - extern crate libimagrt; -extern crate libimagstore; extern crate libimagerror; extern crate libimagtodo; diff --git a/lib/core/libimagrt/Cargo.toml b/lib/core/libimagrt/Cargo.toml index 0599e233..c717580c 100644 --- a/lib/core/libimagrt/Cargo.toml +++ b/lib/core/libimagrt/Cargo.toml @@ -20,7 +20,6 @@ toml = "^0.4" log = "0.3" xdg-basedir = "1.0" itertools = "0.5" -tempfile = "2.1" ansi_term = "0.9" is-match = "0.1" toml-query = "0.3.0" diff --git a/lib/core/libimagrt/src/lib.rs b/lib/core/libimagrt/src/lib.rs index a28b525f..ce0e08c1 100644 --- a/lib/core/libimagrt/src/lib.rs +++ b/lib/core/libimagrt/src/lib.rs @@ -37,7 +37,6 @@ extern crate itertools; #[cfg(unix)] extern crate xdg_basedir; extern crate env_logger; -extern crate tempfile; extern crate ansi_term; extern crate clap; diff --git a/lib/core/libimagstore/Cargo.toml b/lib/core/libimagstore/Cargo.toml index c5fb527f..a904e0b3 100644 --- a/lib/core/libimagstore/Cargo.toml +++ b/lib/core/libimagstore/Cargo.toml @@ -14,7 +14,6 @@ repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" [dependencies] -fs2 = "0.4" glob = "0.2.11" lazy_static = "0.2.*" log = "0.3" @@ -22,9 +21,7 @@ regex = "0.2" semver = "0.5" toml = "^0.4" version = "2.0.1" -crossbeam = "0.2.*" walkdir = "1.0.*" -itertools = "0.6.*" is-match = "0.1" serde = "1.0" serde_json = "1.0" diff --git a/lib/core/libimagstore/src/lib.rs b/lib/core/libimagstore/src/lib.rs index ba9abe83..96147ef2 100644 --- a/lib/core/libimagstore/src/lib.rs +++ b/lib/core/libimagstore/src/lib.rs @@ -35,18 +35,14 @@ #[macro_use] extern crate log; #[macro_use] extern crate version; -extern crate fs2; extern crate glob; #[macro_use] extern crate lazy_static; extern crate regex; extern crate toml; #[cfg(test)] extern crate tempdir; extern crate semver; -extern crate crossbeam; extern crate walkdir; -extern crate itertools; #[macro_use] extern crate is_match; -extern crate serde; extern crate serde_json; #[macro_use] extern crate serde_derive; diff --git a/lib/domain/libimagbookmark/Cargo.toml b/lib/domain/libimagbookmark/Cargo.toml index d81cb9d8..4b621b5a 100644 --- a/lib/domain/libimagbookmark/Cargo.toml +++ b/lib/domain/libimagbookmark/Cargo.toml @@ -14,7 +14,6 @@ repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" [dependencies] -semver = "0.5" url = "1.2" regex = "0.1" diff --git a/lib/domain/libimagbookmark/src/lib.rs b/lib/domain/libimagbookmark/src/lib.rs index e5a34357..0a864121 100644 --- a/lib/domain/libimagbookmark/src/lib.rs +++ b/lib/domain/libimagbookmark/src/lib.rs @@ -33,7 +33,6 @@ while_true, )] -extern crate semver; extern crate url; extern crate regex; diff --git a/lib/domain/libimagcounter/Cargo.toml b/lib/domain/libimagcounter/Cargo.toml index 01519e14..842c15d3 100644 --- a/lib/domain/libimagcounter/Cargo.toml +++ b/lib/domain/libimagcounter/Cargo.toml @@ -17,7 +17,6 @@ homepage = "http://imag-pim.org" log = "0.3" toml = "0.4.*" toml-query = "0.3.*" -semver = "0.5" libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" } libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" } diff --git a/lib/domain/libimagcounter/src/lib.rs b/lib/domain/libimagcounter/src/lib.rs index 13bf7367..cbbd043c 100644 --- a/lib/domain/libimagcounter/src/lib.rs +++ b/lib/domain/libimagcounter/src/lib.rs @@ -36,7 +36,6 @@ extern crate toml; extern crate toml_query; #[macro_use] extern crate log; -extern crate semver; #[macro_use] extern crate libimagstore; #[macro_use] extern crate libimagerror; diff --git a/lib/domain/libimagdiary/Cargo.toml b/lib/domain/libimagdiary/Cargo.toml index 1da26c75..fbcdbb37 100644 --- a/lib/domain/libimagdiary/Cargo.toml +++ b/lib/domain/libimagdiary/Cargo.toml @@ -16,15 +16,12 @@ homepage = "http://imag-pim.org" [dependencies] chrono = "0.4" log = "0.3" -semver = "0.5" toml = "0.4.*" toml-query = "0.3.*" -regex = "0.1" itertools = "0.5" libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" } libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" } libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" } -libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" } libimagentryedit = { version = "0.4.0", path = "../../../lib/entry/libimagentryedit" } libimagentryview = { version = "0.4.0", path = "../../../lib/entry/libimagentryview" } diff --git a/lib/domain/libimagdiary/src/lib.rs b/lib/domain/libimagdiary/src/lib.rs index fcabc94e..ca54f902 100644 --- a/lib/domain/libimagdiary/src/lib.rs +++ b/lib/domain/libimagdiary/src/lib.rs @@ -35,10 +35,8 @@ extern crate chrono; #[macro_use] extern crate log; -extern crate semver; extern crate toml; extern crate toml_query; -extern crate regex; extern crate itertools; #[macro_use] extern crate libimagstore; @@ -46,7 +44,6 @@ extern crate itertools; extern crate libimagentryedit; extern crate libimagentryview; extern crate libimagrt; -extern crate libimagutil; module_entry_path_mod!("diary"); diff --git a/lib/domain/libimagmail/Cargo.toml b/lib/domain/libimagmail/Cargo.toml index f3ab1e88..69a434ea 100644 --- a/lib/domain/libimagmail/Cargo.toml +++ b/lib/domain/libimagmail/Cargo.toml @@ -16,8 +16,6 @@ homepage = "http://imag-pim.org" [dependencies] log = "0.3" email = "0.0.17" -semver = "0.5" -toml = "0.4.*" filters = "0.1.*" libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" } diff --git a/lib/domain/libimagmail/src/lib.rs b/lib/domain/libimagmail/src/lib.rs index ae3fa850..14200eaf 100644 --- a/lib/domain/libimagmail/src/lib.rs +++ b/lib/domain/libimagmail/src/lib.rs @@ -35,8 +35,6 @@ #[macro_use] extern crate log; extern crate email; -extern crate semver; -extern crate toml; extern crate filters; #[macro_use] extern crate libimagerror; diff --git a/lib/domain/libimagnotes/Cargo.toml b/lib/domain/libimagnotes/Cargo.toml index 3b19375a..8b9159c2 100644 --- a/lib/domain/libimagnotes/Cargo.toml +++ b/lib/domain/libimagnotes/Cargo.toml @@ -14,7 +14,6 @@ repository = "https://github.com/matthiasbeyer/imag" homepage = "http://imag-pim.org" [dependencies] -semver = "0.5" log = "0.3" toml = "^0.4" toml-query = "0.3.0" @@ -23,4 +22,3 @@ libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" } libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" } libimagentryedit = { version = "0.4.0", path = "../../../lib/entry/libimagentryedit" } -libimagentrytag = { version = "0.4.0", path = "../../../lib/entry/libimagentrytag" } diff --git a/lib/domain/libimagnotes/src/lib.rs b/lib/domain/libimagnotes/src/lib.rs index 3fa1f5d2..699701ac 100644 --- a/lib/domain/libimagnotes/src/lib.rs +++ b/lib/domain/libimagnotes/src/lib.rs @@ -34,7 +34,6 @@ )] #[macro_use] extern crate log; -extern crate semver; extern crate toml; extern crate toml_query; @@ -42,7 +41,6 @@ extern crate libimagrt; #[macro_us |