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; 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"] [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/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; 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 { 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;