diff options
48 files changed, 29 insertions, 75 deletions
diff --git a/bin/core/imag-annotate/Cargo.toml b/bin/core/imag-annotate/Cargo.toml index ff03e342..ccdb1d06 100644 --- a/bin/core/imag-annotate/Cargo.toml +++ b/bin/core/imag-annotate/Cargo.toml @@ -22,7 +22,6 @@ maintenance = { status = "actively-developed" } [dependencies] clap = ">=2.17" log = "0.3" -version = "2.0.1" url = "1.2" toml = "0.4" toml-query = "0.4" diff --git a/bin/core/imag-annotate/src/main.rs b/bin/core/imag-annotate/src/main.rs index dd2c68e1..94cbd48a 100644 --- a/bin/core/imag-annotate/src/main.rs +++ b/bin/core/imag-annotate/src/main.rs @@ -35,8 +35,6 @@ extern crate clap; #[macro_use] extern crate log; -#[macro_use] -extern crate version; extern crate libimagentryannotation; extern crate libimagentryedit; @@ -62,7 +60,7 @@ mod ui; fn main() { let rt = generate_runtime_setup("imag-annotation", - &version!()[..], + env!("CARGO_PKG_VERSION"), "Add annotations to entries", ui::build_ui); diff --git a/bin/core/imag-diagnostics/Cargo.toml b/bin/core/imag-diagnostics/Cargo.toml index f627499f..30ccf4c7 100644 --- a/bin/core/imag-diagnostics/Cargo.toml +++ b/bin/core/imag-diagnostics/Cargo.toml @@ -15,7 +15,6 @@ homepage = "http://imag-pim.org" [dependencies] clap = ">=2.17" -version = "2.0.1" toml = "0.4" toml-query = "0.4" diff --git a/bin/core/imag-diagnostics/src/main.rs b/bin/core/imag-diagnostics/src/main.rs index 9f813055..b9d2ee8f 100644 --- a/bin/core/imag-diagnostics/src/main.rs +++ b/bin/core/imag-diagnostics/src/main.rs @@ -35,7 +35,6 @@ extern crate clap; extern crate toml; extern crate toml_query; -#[macro_use] extern crate version; extern crate libimagrt; extern crate libimagerror; @@ -95,7 +94,7 @@ impl<'a> From<FileLockEntry<'a>> for Diagnostic { fn main() { let rt = generate_runtime_setup("imag-diagnostics", - &version!()[..], + &env!("CARGO_PKG_VERSION")[..], "Print diagnostics about imag and the imag store", ui::build_ui); @@ -153,7 +152,7 @@ fn main() { let n = diags.len(); - println!("imag version {}", version!()); + println!("imag version {}", env!("CARGO_PKG_VERSION")); println!(""); println!("{} entries", n); for (k, v) in version_counts { diff --git a/bin/core/imag-edit/src/main.rs b/bin/core/imag-edit/src/main.rs index e6ae04ff..222ebeb5 100644 --- a/bin/core/imag-edit/src/main.rs +++ b/bin/core/imag-edit/src/main.rs @@ -34,7 +34,6 @@ extern crate clap; #[macro_use] extern crate log; -#[macro_use] extern crate version; extern crate libimagentryedit; extern crate libimagerror; @@ -54,7 +53,7 @@ mod ui; fn main() { let rt = generate_runtime_setup("imag-edit", - &version!()[..], + env!("CARGO_PKG_VERSION"), "Edit store entries with $EDITOR", ui::build_ui); diff --git a/bin/core/imag-gps/Cargo.toml b/bin/core/imag-gps/Cargo.toml index 7411a1f8..39b7320d 100644 --- a/bin/core/imag-gps/Cargo.toml +++ b/bin/core/imag-gps/Cargo.toml @@ -22,7 +22,6 @@ maintenance = { status = "actively-developed" } [dependencies] clap = ">=2.17" log = "0.3" -version = "2.0.1" url = "1.2" toml = "0.4" toml-query = "^0.4" diff --git a/bin/core/imag-gps/src/main.rs b/bin/core/imag-gps/src/main.rs index 403e4b9b..301f37a5 100644 --- a/bin/core/imag-gps/src/main.rs +++ b/bin/core/imag-gps/src/main.rs @@ -35,8 +35,6 @@ extern crate clap; #[macro_use] extern crate log; -#[macro_use] -extern crate version; extern crate libimagentrygps; extern crate libimagrt; @@ -60,7 +58,7 @@ mod ui; fn main() { let rt = generate_runtime_setup("imag-gps", - &version!()[..], + env!("CARGO_PKG_VERSION"), "Add GPS coordinates to entries", ui::build_ui); diff --git a/bin/core/imag-grep/Cargo.toml b/bin/core/imag-grep/Cargo.toml index 41072980..39ea9016 100644 --- a/bin/core/imag-grep/Cargo.toml +++ b/bin/core/imag-grep/Cargo.toml @@ -21,7 +21,6 @@ maintenance = { status = "actively-developed" } [dependencies] clap = ">=2.17" -version = "2.0.1" regex = "0.2" libimagstore = { version = "0.6.0", path = "../../../lib/core/libimagstore" } diff --git a/bin/core/imag-grep/src/main.rs b/bin/core/imag-grep/src/main.rs index 33cad496..6e92b601 100644 --- a/bin/core/imag-grep/src/main.rs +++ b/bin/core/imag-grep/src/main.rs @@ -34,7 +34,6 @@ extern crate clap; extern crate regex; -#[macro_use] extern crate version; extern crate libimagstore; extern crate libimagrt; @@ -56,7 +55,7 @@ struct Options { fn main() { let rt = generate_runtime_setup("imag-grep", - &version!()[..], + env!("CARGO_PKG_VERSION"), "grep through entries text", ui::build_ui); diff --git a/bin/core/imag-init/Cargo.toml b/bin/core/imag-init/Cargo.toml index 547e36b2..cbe42a38 100644 --- a/bin/core/imag-init/Cargo.toml +++ b/bin/core/imag-init/Cargo.toml @@ -21,7 +21,6 @@ maintenance = { status = "actively-developed" } [dependencies] clap = ">=2.17" -version = "2.0.1" [dev-dependencies] toml = "0.4" diff --git a/bin/core/imag-init/src/main.rs b/bin/core/imag-init/src/main.rs index 03908d91..bd7e3239 100644 --- a/bin/core/imag-init/src/main.rs +++ b/bin/core/imag-init/src/main.rs @@ -33,7 +33,6 @@ )] extern crate clap; -#[macro_use] extern crate version; #[cfg(test)] extern crate toml; diff --git a/bin/core/imag-init/src/ui.rs b/bin/core/imag-init/src/ui.rs index 9bcb7d63..deba3cdf 100644 --- a/bin/core/imag-init/src/ui.rs +++ b/bin/core/imag-init/src/ui.rs @@ -21,7 +21,7 @@ use clap::{Arg, App}; pub fn build_ui<'a>() -> App<'a, 'a> { App::new("imag-init") - .version(&version!()[..]) + .version(env!("CARGO_PKG_VERSION")) .author("Matthias Beyer <mail@beyermatthias.de>") .about("Initialize a ~/.imag repository. Optionally with git") diff --git a/bin/core/imag-link/Cargo.toml b/bin/core/imag-link/Cargo.toml index c8b1e481..b7037dae 100644 --- a/bin/core/imag-link/Cargo.toml +++ b/bin/core/imag-link/Cargo.toml @@ -22,7 +22,6 @@ maintenance = { status = "actively-developed" } [dependencies] clap = ">=2.17" log = "0.3" -version = "2.0.1" url = "1.5" toml = "0.4" toml-query = "^0.4" diff --git a/bin/core/imag-link/src/main.rs b/bin/core/imag-link/src/main.rs index 9a686327..76796a97 100644 --- a/bin/core/imag-link/src/main.rs +++ b/bin/core/imag-link/src/main.rs @@ -35,7 +35,6 @@ #[macro_use] extern crate log; extern crate clap; extern crate url; -#[macro_use] extern crate version; #[cfg(test)] extern crate toml; #[cfg(test)] extern crate toml_query; @@ -73,7 +72,7 @@ use ui::build_ui; fn main() { let rt = generate_runtime_setup("imag-link", - &version!()[..], + env!("CARGO_PKG_VERSION"), "Link entries", build_ui); if rt.cli().is_present("check-consistency") { diff --git a/bin/core/imag-mv/Cargo.toml b/bin/core/imag-mv/Cargo.toml index c8ac05c4..4c4cb91c 100644 --- a/bin/core/imag-mv/Cargo.toml +++ b/bin/core/imag-mv/Cargo.toml @@ -20,7 +20,6 @@ is-it-maintained-open-issues = { repository = "matthiasbeyer/imag" } maintenance = { status = "actively-developed" } [dependencies] -version = "2.0" clap = ">=2.17" log = "0.3" diff --git a/bin/core/imag-mv/src/main.rs b/bin/core/imag-mv/src/main.rs index a86a8936..7896e8f1 100644 --- a/bin/core/imag-mv/src/main.rs +++ b/bin/core/imag-mv/src/main.rs @@ -33,7 +33,6 @@ )] #[macro_use] extern crate log; -#[macro_use] extern crate version; extern crate clap; extern crate libimagrt; @@ -51,7 +50,7 @@ use libimagstore::storeid::StoreId; fn main() { let rt = generate_runtime_setup("imag-mv", - &version!()[..], + env!("CARGO_PKG_VERSION"), "Move things around in the store", build_ui); diff --git a/bin/core/imag-ref/Cargo.toml b/bin/core/imag-ref/Cargo.toml index 53f566fd..51f8d298 100644 --- a/bin/core/imag-ref/Cargo.toml +++ b/bin/core/imag-ref/Cargo.toml @@ -22,7 +22,6 @@ maintenance = { status = "actively-developed" } [dependencies] clap = ">=2.17" log = "0.3" -version = "2.0.1" libimagrt = { version = "0.6.0", path = "../../../lib/core/libimagrt" } libimagerror = { version = "0.6.0", path = "../../../lib/core/libimagerror" } diff --git a/bin/core/imag-ref/src/main.rs b/bin/core/imag-ref/src/main.rs index 742d11eb..7448df3b 100644 --- a/bin/core/imag-ref/src/main.rs +++ b/bin/core/imag-ref/src/main.rs @@ -33,7 +33,6 @@ )] #[macro_use] extern crate log; -#[macro_use] extern crate version; extern crate clap; extern crate libimagrt; @@ -58,7 +57,7 @@ use libimagrt::runtime::Runtime; fn main() { let rt = generate_runtime_setup("imag-ref", - &version!()[..], + env!("CARGO_PKG_VERSION"), "Reference files outside of the store", build_ui); rt.cli() diff --git a/bin/core/imag-store/Cargo.toml b/bin/core/imag-store/Cargo.toml index 786f46f9..6102a75f 100644 --- a/bin/core/imag-store/Cargo.toml +++ b/bin/core/imag-store/Cargo.toml @@ -22,7 +22,6 @@ maintenance = { status = "actively-developed" } [dependencies] clap = ">=2.17" log = "0.3" -version = "2.0.1" toml = "0.4" error-chain = "0.11" diff --git a/bin/core/imag-store/src/main.rs b/bin/core/imag-store/src/main.rs index a997654f..a0b9c71a 100644 --- a/bin/core/imag-store/src/main.rs +++ b/bin/core/imag-store/src/main.rs @@ -36,7 +36,6 @@ extern crate clap; #[macro_use] extern crate log; extern crate toml; #[cfg(test)] extern crate toml_query; -#[macro_use] extern crate version; #[macro_use] extern crate error_chain; extern crate libimagrt; @@ -78,7 +77,7 @@ use ids::ids; fn main() { let mut rt = generate_runtime_setup("imag-store", - &version!()[..], + env!("CARGO_PKG_VERSION"), "Direct interface to the store. Use with great care!", build_ui); diff --git a/bin/core/imag-tag/Cargo.toml b/bin/core/imag-tag/Cargo.toml index 7e6bbecb..8e425299 100644 --- a/bin/core/imag-tag/Cargo.toml +++ b/bin/core/imag-tag/Cargo.toml @@ -22,7 +22,6 @@ maintenance = { status = "actively-developed" } [dependencies] clap = ">=2.17" log = "0.3" -version = "2.0.1" toml = "0.4" libimagstore = { version = "0.6.0", path = "../../../lib/core/libimagstore" } diff --git a/bin/core/imag-tag/src/main.rs b/bin/core/imag-tag/src/main.rs index 699cc5f8..beceee12 100644 --- a/bin/core/imag-tag/src/main.rs +++ b/bin/core/imag-tag/src/main.rs @@ -19,7 +19,6 @@ extern crate clap; #[macro_use] extern crate log; -#[macro_use] extern crate version; #[cfg(test)] extern crate toml; @@ -59,7 +58,7 @@ use ui::build_ui; fn main() { let rt = generate_runtime_setup("imag-store", - &version!()[..], + env!("CARGO_PKG_VERSION"), "Direct interface to the store. Use with great care!", build_ui); diff --git a/bin/core/imag-view/Cargo.toml b/bin/core/imag-view/Cargo.toml index e552cabd..3569d6da 100644 --- a/bin/core/imag-view/Cargo.toml +++ b/bin/core/imag-view/Cargo.toml @@ -24,7 +24,6 @@ clap = ">=2.17" log = "0.3" toml = "0.4" toml-query = "^0.4" -version = "2.0.1" handlebars = "0.29.0" tempfile = "2.1" diff --git a/bin/core/imag-view/src/main.rs b/bin/core/imag-view/src/main.rs index ec13e0fe..b5cea1b7 100644 --- a/bin/core/imag-view/src/main.rs +++ b/bin/core/imag-view/src/main.rs @@ -34,7 +34,6 @@ extern crate clap; #[macro_use] extern crate log; -#[macro_use] extern crate version; extern crate handlebars; extern crate tempfile; extern crate toml; @@ -67,7 +66,7 @@ use ui::build_ui; fn main() { let rt = generate_runtime_setup( "imag-view", - &version!()[..], + env!("CARGO_PKG_VERSION"), "View entries (readonly)", build_ui); diff --git a/bin/core/imag/Cargo.toml b/bin/core/imag/Cargo.toml index 276774e0..0953dd09 100644 --- a/bin/core/imag/Cargo.toml +++ b/bin/core/imag/Cargo.toml @@ -20,7 +20,6 @@ is-it-maintained-open-issues = { repository = "matthiasbeyer/imag" } maintenance = { status = "actively-developed" } [dependencies] -version = "2.0" walkdir = "1" clap = ">=2.17" log = "0.3" diff --git a/bin/core/imag/src/main.rs b/bin/core/imag/src/main.rs index 5d9d1e86..1c7bbf9f 100644 --- a/bin/core/imag/src/main.rs +++ b/bin/core/imag/src/main.rs @@ -18,7 +18,6 @@ // extern crate clap; -#[macro_use] extern crate version; #[macro_use] extern crate log; extern crate walkdir; extern crate toml; @@ -118,7 +117,7 @@ fn get_commands() -> Vec<String> { fn main() { // Initialize the Runtime and build the CLI let appname = "imag"; - let version = &version!(); + let version = env!("CARGO_PKG_VERSION"); let about = "imag - the PIM suite for the commandline"; let commands = get_commands(); let helptext = help_text(commands.clone()); @@ -152,7 +151,7 @@ fn main() { if matches.is_present("version") { debug!("Showing version"); - println!("imag {}", &version!()[..]); + println!("imag {}", env!("CARGO_PKG_VERSION")); exit(0); } diff --git a/bin/domain/imag-bookmark/Cargo.toml b/bin/domain/imag-bookmark/Cargo.toml index e4dd8580..64974b36 100644 --- a/bin/domain/imag-bookmark/Cargo.toml +++ b/bin/domain/imag-bookmark/Cargo.toml @@ -22,7 +22,6 @@ maintenance = { status = "actively-developed" } [dependencies] clap = ">=2.17" log = "0.3" -version = "2.0.1" toml = "0.4" toml-query = "^0.4" diff --git a/bin/domain/imag-bookmark/src/main.rs b/bin/domain/imag-bookmark/src/main.rs index 7cfc8bb3..26263932 100644 --- a/bin/domain/imag-bookmark/src/main.rs +++ b/bin/domain/imag-bookmark/src/main.rs @@ -34,7 +34,6 @@ extern crate clap; #[macro_use] extern crate log; -#[macro_use] extern crate version; extern crate toml; extern crate toml_query; @@ -62,7 +61,7 @@ use ui::build_ui; fn main() { let rt = generate_runtime_setup("imag-bookmark", - &version!()[..], + env!("CARGO_PKG_VERSION"), "Bookmark collection tool", build_ui); diff --git a/bin/domain/imag-contact/Cargo.toml b/bin/domain/imag-contact/Cargo.toml index de6b4434..09f2a9fd 100644 --- a/bin/domain/imag-contact/Cargo.toml +++ b/bin/domain/imag-contact/Cargo.toml @@ -16,7 +16,6 @@ homepage = "http://imag-pim.org" [dependencies] clap = ">=2.17" log = "0.3" -version = "2.0.1" toml = "0.4" toml-query = "^0.3.1" handlebars = "0.29" diff --git a/bin/domain/imag-contact/src/main.rs b/bin/domain/imag-contact/src/main.rs index 505ef918..412ae256 100644 --- a/bin/domain/imag-contact/src/main.rs +++ b/bin/domain/imag-contact/src/main.rs @@ -34,7 +34,6 @@ extern crate clap; #[macro_use] extern crate log; -#[macro_use] extern crate version; #[macro_use] extern crate vobject; extern crate toml; extern crate toml_query; @@ -81,7 +80,7 @@ use create::create; fn main() { let rt = generate_runtime_setup("imag-contact", - &version!()[..], + env!("CARGO_PKG_VERSION"), "Contact management tool", build_ui); diff --git a/bin/domain/imag-diary/Cargo.toml b/bin/domain/imag-diary/Cargo.toml index 7570a07e..136b618d 100644 --- a/bin/domain/imag-diary/Cargo.toml +++ b/bin/domain/imag-diary/Cargo.toml @@ -21,7 +21,6 @@ maintenance = { status = "actively-developed" } [dependencies] chrono = "0.4" -version = "2.0" clap = ">=2.17" log = "0.3" toml = "0.4" diff --git a/bin/domain/imag-diary/src/main.rs b/bin/domain/imag-diary/src/main.rs index 4502185f..7c13967b 100644 --- a/bin/domain/imag-diary/src/main.rs +++ b/bin/domain/imag-diary/src/main.rs @@ -33,7 +33,6 @@ )] #[macro_use] extern crate log; -#[macro_use] extern crate version; extern crate clap; extern crate chrono; extern crate toml; @@ -70,7 +69,7 @@ use view::view; fn main() { let name = "imag-diary"; - let version = &version!()[..]; + let version = env!("CARGO_PKG_VERSION"); let about = "Personal Diary/Diaries"; let ui = build_ui(Runtime::get_default_cli_builder(name, version, about)); let rt = { diff --git a/bin/domain/imag-habit/Cargo.toml b/bin/domain/imag-habit/Cargo.toml index 6c575d11..28ab4c7b 100644 --- a/bin/domain/imag-habit/Cargo.toml +++ b/bin/domain/imag-habit/Cargo.toml @@ -15,7 +15,6 @@ homepage = "http://imag-pim.org" [dependencies] chrono = "0.4" -version = "2.0" clap = ">=2.17" log = "0.3" toml = "0.4" diff --git a/bin/domain/imag-habit/src/main.rs b/bin/domain/imag-habit/src/main.rs index 8de4753f..02ee8866 100644 --- a/bin/domain/imag-habit/src/main.rs +++ b/bin/domain/imag-habit/src/main.rs @@ -34,7 +34,6 @@ extern crate clap; #[macro_use] extern crate log; -#[macro_use] extern crate version; extern crate toml; extern crate toml_query; extern crate kairos; @@ -67,7 +66,7 @@ mod ui; fn main() { let rt = generate_runtime_setup("imag-habit", - &version!()[..], + env!("CARGO_PKG_VERSION"), "Habit tracking tool", ui::build_ui); diff --git a/bin/domain/imag-log/Cargo.toml b/bin/domain/imag-log/Cargo.toml index 5c7a89ee..c698acdd 100644 --- a/bin/domain/imag-log/Cargo.toml +++ b/bin/domain/imag-log/Cargo.toml @@ -22,7 +22,6 @@ maintenance = { status = "actively-developed" } [dependencies] clap = ">=2.17" log = "0.3" -version = "2.0.1" toml = "0.4" toml-query = "^0.4" is-match = "0.1" diff --git a/bin/domain/imag-log/src/main.rs b/bin/domain/imag-log/src/main.rs index 99f917f8..a4b143bb 100644 --- a/bin/domain/imag-log/src/main.rs +++ b/bin/domain/imag-log/src/main.rs @@ -35,7 +35,6 @@ extern crate clap; #[macro_use] extern crate is_match; #[macro_use] extern crate log; -#[macro_use] extern crate version; extern crate toml; extern crate toml_query; @@ -58,7 +57,7 @@ use toml::Value; fn main() { let rt = generate_runtime_setup("imag-log", - &version!()[..], + env!("CARGO_PKG_VERSION"), "Overlay to imag-diary to 'log' single lines of text", build_ui); diff --git a/bin/domain/imag-mail/Cargo.toml b/bin/domain/imag-mail/Cargo.toml index 0de2c005..4666164c 100644 --- a/bin/domain/imag-mail/Cargo.toml +++ b/bin/domain/imag-mail/Cargo.toml @@ -18,7 +18,6 @@ maintenance = { status = "actively-developed" } [dependencies] clap = ">=2.17" log = "0.3" -version = "2.0.1" libimagrt = { version = "0.6.0", path = "../../../lib/core/libimagrt" } libimagerror = { version = "0.6.0", path = "../../../lib/core/libimagerror" } diff --git a/bin/domain/imag-mail/src/main.rs b/bin/domain/imag-mail/src/main.rs index 7987e281..fde1a7c9 100644 --- a/bin/domain/imag-mail/src/main.rs +++ b/bin/domain/imag-mail/src/main.rs @@ -19,7 +19,6 @@ extern crate clap; #[macro_use] extern crate log; -#[macro_use] extern crate version; extern crate libimagrt; extern crate libimagmail; @@ -38,7 +37,7 @@ use ui::build_ui; fn main() { let rt = generate_runtim |