From 1c723a9a0eaadfd06b72732d4baaa0bc08894587 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 16 May 2016 18:52:41 +0200 Subject: [PATCH 1/9] Move trace_error() functionality from libimagutil to libimagerror --- libimagerror/Cargo.toml | 2 ++ libimagerror/src/lib.rs | 4 ++++ {libimagutil => libimagerror}/src/trace.rs | 0 libimagutil/Cargo.toml | 1 - libimagutil/src/lib.rs | 2 -- 5 files changed, 6 insertions(+), 3 deletions(-) rename {libimagutil => libimagerror}/src/trace.rs (100%) diff --git a/libimagerror/Cargo.toml b/libimagerror/Cargo.toml index bd769698..2227ce9e 100644 --- a/libimagerror/Cargo.toml +++ b/libimagerror/Cargo.toml @@ -4,3 +4,5 @@ version = "0.1.0" authors = ["Matthias Beyer "] [dependencies] +log = "0.3" +ansi_term = "0.7" diff --git a/libimagerror/src/lib.rs b/libimagerror/src/lib.rs index 9f79f549..d7f374a7 100644 --- a/libimagerror/src/lib.rs +++ b/libimagerror/src/lib.rs @@ -1 +1,5 @@ +#[macro_use] extern crate log; +extern crate ansi_term; + pub mod error_gen; +pub mod trace; diff --git a/libimagutil/src/trace.rs b/libimagerror/src/trace.rs similarity index 100% rename from libimagutil/src/trace.rs rename to libimagerror/src/trace.rs diff --git a/libimagutil/Cargo.toml b/libimagutil/Cargo.toml index efcbff44..96638623 100644 --- a/libimagutil/Cargo.toml +++ b/libimagutil/Cargo.toml @@ -7,5 +7,4 @@ authors = ["Matthias Beyer "] lazy_static = "0.1.15" log = "0.3" regex = "0.1" -ansi_term = "0.7" diff --git a/libimagutil/src/lib.rs b/libimagutil/src/lib.rs index e0d7a3ce..bde49b00 100644 --- a/libimagutil/src/lib.rs +++ b/libimagutil/src/lib.rs @@ -16,9 +16,7 @@ #[macro_use] extern crate lazy_static; #[macro_use] extern crate log; extern crate regex; -extern crate ansi_term; pub mod ismatch; pub mod key_value_split; -pub mod trace; pub mod variants; From ea01312412697e82d8a2175ef1059e6acf9d7f9a Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 16 May 2016 18:59:02 +0200 Subject: [PATCH 2/9] imag-counter: Change dependency from libimagutil -> libimagerror --- imag-counter/Cargo.toml | 3 +++ imag-counter/src/create.rs | 2 +- imag-counter/src/delete.rs | 2 +- imag-counter/src/interactive.rs | 2 +- imag-counter/src/list.rs | 2 +- imag-counter/src/main.rs | 3 ++- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/imag-counter/Cargo.toml b/imag-counter/Cargo.toml index d3441fbb..964eda85 100644 --- a/imag-counter/Cargo.toml +++ b/imag-counter/Cargo.toml @@ -11,6 +11,9 @@ version = "2.0.1" [dependencies.libimagrt] path = "../libimagrt" +[dependencies.libimagerror] +path = "../libimagerror" + [dependencies.libimagutil] path = "../libimagutil" diff --git a/imag-counter/src/create.rs b/imag-counter/src/create.rs index 1b2838a5..22a38b34 100644 --- a/imag-counter/src/create.rs +++ b/imag-counter/src/create.rs @@ -2,7 +2,7 @@ use std::str::FromStr; use std::process::exit; use libimagrt::runtime::Runtime; -use libimagutil::trace::trace_error; +use libimagerror::trace::trace_error; use libimagcounter::counter::Counter; pub fn create(rt: &Runtime) { diff --git a/imag-counter/src/delete.rs b/imag-counter/src/delete.rs index bb68f2f1..4d7e6067 100644 --- a/imag-counter/src/delete.rs +++ b/imag-counter/src/delete.rs @@ -1,7 +1,7 @@ use std::process::exit; use libimagrt::runtime::Runtime; -use libimagutil::trace::trace_error; +use libimagerror::trace::trace_error; use libimagcounter::counter::Counter; pub fn delete(rt: &Runtime) { diff --git a/imag-counter/src/interactive.rs b/imag-counter/src/interactive.rs index 5a2b1e01..e07d8e1d 100644 --- a/imag-counter/src/interactive.rs +++ b/imag-counter/src/interactive.rs @@ -10,7 +10,7 @@ use libimagcounter::counter::Counter; use libimagcounter::error::CounterError; use libimagrt::runtime::Runtime; use libimagutil::key_value_split::IntoKeyValue; -use libimagutil::trace::trace_error; +use libimagerror::trace::trace_error; type Result = RResult; diff --git a/imag-counter/src/list.rs b/imag-counter/src/list.rs index 41e9ce62..57f1ef32 100644 --- a/imag-counter/src/list.rs +++ b/imag-counter/src/list.rs @@ -1,5 +1,5 @@ use libimagrt::runtime::Runtime; -use libimagutil::trace::trace_error; +use libimagerror::trace::trace_error; use libimagcounter::counter::Counter; pub fn list(rt: &Runtime) { diff --git a/imag-counter/src/main.rs b/imag-counter/src/main.rs index 538149dc..8eaa72d4 100644 --- a/imag-counter/src/main.rs +++ b/imag-counter/src/main.rs @@ -19,6 +19,7 @@ extern crate clap; extern crate libimagcounter; extern crate libimagrt; +extern crate libimagerror; extern crate libimagutil; use std::process::exit; @@ -26,7 +27,7 @@ use std::str::FromStr; use libimagrt::runtime::Runtime; use libimagcounter::counter::Counter; -use libimagutil::trace::trace_error; +use libimagerror::trace::trace_error; use libimagutil::key_value_split::IntoKeyValue; mod create; From 93ce1dbfd2890fdc8c596594d09890449b0fc993 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 16 May 2016 18:59:02 +0200 Subject: [PATCH 3/9] imag-link: Change dependency from libimagutil -> libimagerror --- imag-link/Cargo.toml | 4 ++-- imag-link/src/main.rs | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/imag-link/Cargo.toml b/imag-link/Cargo.toml index 858ff6f0..59ee82f1 100644 --- a/imag-link/Cargo.toml +++ b/imag-link/Cargo.toml @@ -20,6 +20,6 @@ path = "../libimagrt" [dependencies.libimagentrylink] path = "../libimagentrylink" -[dependencies.libimagutil] -path = "../libimagutil" +[dependencies.libimagerror] +path = "../libimagerror" diff --git a/imag-link/src/main.rs b/imag-link/src/main.rs index 8e2399df..48da0014 100644 --- a/imag-link/src/main.rs +++ b/imag-link/src/main.rs @@ -23,7 +23,7 @@ extern crate url; extern crate libimagentrylink; extern crate libimagrt; extern crate libimagstore; -extern crate libimagutil; +extern crate libimagerror; use std::process::exit; use std::ops::Deref; @@ -33,7 +33,7 @@ use libimagstore::error::StoreError; use libimagstore::store::Entry; use libimagstore::store::FileLockEntry; use libimagstore::store::Store; -use libimagutil::trace::trace_error; +use libimagerror::trace::trace_error; use libimagentrylink::external::ExternalLinker; use clap::ArgMatches; use url::Url; @@ -74,7 +74,7 @@ fn main() { fn handle_internal_linking(rt: &Runtime) { use libimagentrylink::internal::InternalLinker; - use libimagutil::trace::trace_error; + use libimagerror::trace::trace_error; debug!("Handle internal linking call"); let cmd = rt.cli().subcommand_matches("internal").unwrap(); @@ -192,7 +192,7 @@ fn get_entry_by_name<'a>(rt: &'a Runtime, name: &str) -> Result Date: Mon, 16 May 2016 18:59:02 +0200 Subject: [PATCH 4/9] imag-notes: Change dependency from libimagutil -> libimagerror --- imag-notes/Cargo.toml | 4 ++-- imag-notes/src/main.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/imag-notes/Cargo.toml b/imag-notes/Cargo.toml index 64f9f990..d6f78bfd 100644 --- a/imag-notes/Cargo.toml +++ b/imag-notes/Cargo.toml @@ -18,6 +18,6 @@ path = "../libimagnotes" [dependencies.libimagentrytag] path = "../libimagentrytag" -[dependencies.libimagutil] -path = "../libimagutil" +[dependencies.libimagerror] +path = "../libimagerror" diff --git a/imag-notes/src/main.rs b/imag-notes/src/main.rs index ee0df3d3..7e615afd 100644 --- a/imag-notes/src/main.rs +++ b/imag-notes/src/main.rs @@ -6,14 +6,14 @@ extern crate semver; extern crate libimagnotes; extern crate libimagrt; extern crate libimagentrytag; -extern crate libimagutil; +extern crate libimagerror; use std::process::exit; use libimagrt::edit::Edit; use libimagrt::runtime::Runtime; use libimagnotes::note::Note; -use libimagutil::trace::trace_error; +use libimagerror::trace::trace_error; mod ui; use ui::build_ui; From ab29265b1094dda481049bdfe16078de18cf5278 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 16 May 2016 18:59:02 +0200 Subject: [PATCH 5/9] imag-store: Change dependency from libimagutil -> libimagerror --- imag-store/src/create.rs | 2 +- imag-store/src/delete.rs | 2 +- imag-store/src/retrieve.rs | 2 +- imag-store/src/update.rs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/imag-store/src/create.rs b/imag-store/src/create.rs index fc33c9ee..8cb2b2aa 100644 --- a/imag-store/src/create.rs +++ b/imag-store/src/create.rs @@ -14,7 +14,7 @@ use libimagrt::runtime::Runtime; use libimagstore::store::Entry; use libimagstore::store::EntryHeader; use libimagstore::storeid::build_entry_path; -use libimagutil::trace::trace_error; +use libimagerror::trace::trace_error; use error::StoreError; use error::StoreErrorKind; diff --git a/imag-store/src/delete.rs b/imag-store/src/delete.rs index 0c59fc37..fb994818 100644 --- a/imag-store/src/delete.rs +++ b/imag-store/src/delete.rs @@ -1,6 +1,6 @@ use libimagstore::storeid::build_entry_path; use libimagrt::runtime::Runtime; -use libimagutil::trace::trace_error; +use libimagerror::trace::trace_error; pub fn delete(rt: &Runtime) { use std::process::exit; diff --git a/imag-store/src/retrieve.rs b/imag-store/src/retrieve.rs index c6b6adc8..113d5e8e 100644 --- a/imag-store/src/retrieve.rs +++ b/imag-store/src/retrieve.rs @@ -6,7 +6,7 @@ use toml::Value; use libimagstore::store::FileLockEntry; use libimagstore::storeid::build_entry_path; use libimagrt::runtime::Runtime; -use libimagutil::trace::trace_error; +use libimagerror::trace::trace_error; pub fn retrieve(rt: &Runtime) { rt.cli() diff --git a/imag-store/src/update.rs b/imag-store/src/update.rs index 311ce138..5022aaac 100644 --- a/imag-store/src/update.rs +++ b/imag-store/src/update.rs @@ -3,7 +3,7 @@ use std::process::exit; use libimagrt::runtime::Runtime; use libimagstore::storeid::build_entry_path; -use libimagutil::trace::trace_error; +use libimagerror::trace::trace_error; use util::build_toml_header; From be397bcdb6ce89e1353596a91cf56b0c5ffbbc4f Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 16 May 2016 18:59:02 +0200 Subject: [PATCH 6/9] imag-tag: Change dependency from libimagutil -> libimagerror --- imag-tag/Cargo.toml | 4 ++-- imag-tag/src/main.rs | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/imag-tag/Cargo.toml b/imag-tag/Cargo.toml index c3ed51ef..b9d7af38 100644 --- a/imag-tag/Cargo.toml +++ b/imag-tag/Cargo.toml @@ -16,8 +16,8 @@ path = "../libimagstore" [dependencies.libimagrt] path = "../libimagrt" -[dependencies.libimagutil] -path = "../libimagutil" +[dependencies.libimagerror] +path = "../libimagerror" [dependencies.libimagentrytag] path = "../libimagentrytag" diff --git a/imag-tag/src/main.rs b/imag-tag/src/main.rs index f070dbd1..f737d6e0 100644 --- a/imag-tag/src/main.rs +++ b/imag-tag/src/main.rs @@ -7,20 +7,19 @@ extern crate toml; extern crate libimagstore; extern crate libimagrt; extern crate libimagentrytag; -extern crate libimagutil; +extern crate libimagerror; use std::process::exit; use libimagrt::runtime::Runtime; use libimagentrytag::tagable::Tagable; use libimagstore::storeid::build_entry_path; +use libimagerror::trace::trace_error; mod ui; use ui::build_ui; -use libimagutil::trace::trace_error; - fn main() { let name = "imag-store"; let version = &version!()[..]; From 204e7761790219d4597b7fd1d93534e31acbf49d Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 16 May 2016 18:59:02 +0200 Subject: [PATCH 7/9] imag-view: Change dependency from libimagutil -> libimagerror --- imag-view/Cargo.toml | 3 --- imag-view/src/main.rs | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/imag-view/Cargo.toml b/imag-view/Cargo.toml index 7c7b3d55..2c43920e 100644 --- a/imag-view/Cargo.toml +++ b/imag-view/Cargo.toml @@ -18,9 +18,6 @@ path = "../libimagstore" [dependencies.libimagrt] path = "../libimagrt" -[dependencies.libimagutil] -path = "../libimagutil" - [dependencies.libimagerror] path = "../libimagerror" diff --git a/imag-view/src/main.rs b/imag-view/src/main.rs index 0efc25c8..81d2b5e9 100644 --- a/imag-view/src/main.rs +++ b/imag-view/src/main.rs @@ -22,7 +22,6 @@ extern crate toml; extern crate libimagrt; extern crate libimagstore; -extern crate libimagutil; #[macro_use] extern crate libimagerror; use std::result::Result as RResult; @@ -30,7 +29,7 @@ use std::process::exit; use libimagrt::runtime::Runtime; use libimagstore::store::FileLockEntry; -use libimagutil::trace::trace_error; +use libimagerror::trace::trace_error; mod error; mod ui; From ee32a85ff3888db5bbdad5eb5bd7a338239c24f8 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 16 May 2016 18:59:02 +0200 Subject: [PATCH 8/9] libimagrt: Change dependency from libimagutil -> libimagerror --- libimagrt/src/runtime.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libimagrt/src/runtime.rs b/libimagrt/src/runtime.rs index cae46bda..5087d063 100644 --- a/libimagrt/src/runtime.rs +++ b/libimagrt/src/runtime.rs @@ -42,8 +42,8 @@ impl<'a> Runtime<'a> { use libimagstore::hook::position::HookPosition; use libimagstore::error::StoreErrorKind; use libimagstorestdhook::debug::DebugHook; - use libimagutil::trace::trace_error; - use libimagutil::trace::trace_error_dbg; + use libimagerror::trace::trace_error; + use libimagerror::trace::trace_error_dbg; use configuration::error::ConfigErrorKind; From 8e5f5bae0bf743b4d285ccee94d6e410a68eabb0 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 16 May 2016 18:59:02 +0200 Subject: [PATCH 9/9] libimagstorestdhook: Change dependency from libimagutil -> libimagerror --- libimagstorestdhook/Cargo.toml | 4 ++-- libimagstorestdhook/src/lib.rs | 2 +- libimagstorestdhook/src/linkverify.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libimagstorestdhook/Cargo.toml b/libimagstorestdhook/Cargo.toml index 81ba8f37..789fc053 100644 --- a/libimagstorestdhook/Cargo.toml +++ b/libimagstorestdhook/Cargo.toml @@ -14,6 +14,6 @@ path = "../libimagstore" [dependencies.libimagentrylink] path = "../libimagentrylink" -[dependencies.libimagutil] -path = "../libimagutil" +[dependencies.libimagerror] +path = "../libimagerror" diff --git a/libimagstorestdhook/src/lib.rs b/libimagstorestdhook/src/lib.rs index 05e92f75..c53cbc52 100644 --- a/libimagstorestdhook/src/lib.rs +++ b/libimagstorestdhook/src/lib.rs @@ -20,7 +20,7 @@ extern crate fs2; extern crate libimagstore; extern crate libimagentrylink; -extern crate libimagutil; +extern crate libimagerror; pub mod debug; pub mod flock; diff --git a/libimagstorestdhook/src/linkverify.rs b/libimagstorestdhook/src/linkverify.rs index 295a9de4..e97981b7 100644 --- a/libimagstorestdhook/src/linkverify.rs +++ b/libimagstorestdhook/src/linkverify.rs @@ -9,7 +9,7 @@ use libimagstore::hook::accessor::NonMutableHookDataAccessor; use libimagstore::hook::result::HookResult; use libimagstore::store::FileLockEntry; use libimagentrylink::internal::InternalLinker; -use libimagutil::trace::trace_error; +use libimagerror::trace::trace_error; #[derive(Debug, Clone)] pub struct LinkedEntriesExistHook {