Merge pull request #415 from matthiasbeyer/libimagerror/move-trace_error

Libimagerror/move trace error

imag-counter/Cargo.toml

@@ -11,6 +11,9 @@ version = "2.0.1"
 [dependencies.libimagrt]
 path = "../libimagrt"
 
+[dependencies.libimagerror]
+path = "../libimagerror"
+
 [dependencies.libimagutil]
 path = "../libimagutil"
 

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) {

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) {

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<T> = RResult<T, CounterError>;
 

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) {

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;

imag-link/Cargo.toml

@@ -20,6 +20,6 @@ path = "../libimagrt"
 [dependencies.libimagentrylink]
 path = "../libimagentrylink"
 
-[dependencies.libimagutil]
+[dependencies.libimagerror]
-path = "../libimagutil"
+path = "../libimagerror"
 

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<FileLockEntry<'a
 }
 
 fn handle_external_linking(rt: &Runtime) {
-    use libimagutil::trace::trace_error;
+    use libimagerror::trace::trace_error;
 
     let scmd       = rt.cli().subcommand_matches("external").unwrap();
     let entry_name = scmd.value_of("id").unwrap(); // enforced by clap

imag-notes/Cargo.toml

@@ -18,6 +18,6 @@ path = "../libimagnotes"
 [dependencies.libimagentrytag]
 path = "../libimagentrytag"
 
-[dependencies.libimagutil]
+[dependencies.libimagerror]
-path = "../libimagutil"
+path = "../libimagerror"
 

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;

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;

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;

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()

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;
 

imag-tag/Cargo.toml

@@ -16,8 +16,8 @@ path = "../libimagstore"
 [dependencies.libimagrt]
 path = "../libimagrt"
 
-[dependencies.libimagutil]
+[dependencies.libimagerror]
-path = "../libimagutil"
+path = "../libimagerror"
 
 [dependencies.libimagentrytag]
 path = "../libimagentrytag"

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!()[..];

imag-view/Cargo.toml

@@ -18,9 +18,6 @@ path = "../libimagstore"
 [dependencies.libimagrt]
 path = "../libimagrt"
 
-[dependencies.libimagutil]
-path = "../libimagutil"
-
 [dependencies.libimagerror]
 path = "../libimagerror"
 

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;

libimagerror/Cargo.toml

@@ -4,3 +4,5 @@ version = "0.1.0"
 authors = ["Matthias Beyer <mail@beyermatthias.de>"]
 
 [dependencies]
+log = "0.3"
+ansi_term = "0.7"

libimagerror/src/lib.rs

@@ -1 +1,5 @@
+#[macro_use] extern crate log;
+extern crate ansi_term;
+
 pub mod error_gen;
+pub mod trace;

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 libimagerror::trace::trace_error;
-        use libimagutil::trace::trace_error_dbg;
+        use libimagerror::trace::trace_error_dbg;
 
         use configuration::error::ConfigErrorKind;
 

libimagstorestdhook/Cargo.toml

@@ -14,6 +14,6 @@ path = "../libimagstore"
 [dependencies.libimagentrylink]
 path = "../libimagentrylink"
 
-[dependencies.libimagutil]
+[dependencies.libimagerror]
-path = "../libimagutil"
+path = "../libimagerror"
 

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;

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 {

libimagutil/Cargo.toml

@@ -7,5 +7,4 @@ authors = ["Matthias Beyer <mail@beyermatthias.de>"]
 lazy_static = "0.1.15"
 log = "0.3"
 regex = "0.1"
-ansi_term = "0.7"
 

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;