Run 'cargo fix' for rust-2018

With this patch we move the codebase to Rust-2018.

The diff was generated by executing

    cargo fix --all --all-features --edition

on the codebase.

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>

75 files changed, 224 insertions, 224 deletions

diff --git a/lib/core/libimagerror/src/io.rs b/lib/core/libimagerror/src/io.rs
index 38940484..d8abf0b1 100644
--- a/lib/core/libimagerror/src/io.rs
+++ b/lib/core/libimagerror/src/io.rs
@@ -19,7 +19,7 @@
 
 use std::io::ErrorKind;
 
-use exit::ExitCode;
+use crate::exit::ExitCode;
 
 pub enum Settings {
     Ignore(ErrorKind),
@@ -28,7 +28,7 @@ pub enum Settings {
 
 pub trait ToExitCode<T> {
     fn to_exit_code(self) -> Result<T, ExitCode>;
-    fn to_exit_code_with(self, Settings) -> Result<T, ExitCode>;
+    fn to_exit_code_with(self, _: Settings) -> Result<T, ExitCode>;
 }
 
 impl<T> ToExitCode<T> for Result<T, ::std::io::Error> {
diff --git a/lib/core/libimagerror/src/iter.rs b/lib/core/libimagerror/src/iter.rs
index e5cf7125..5a288321 100644
--- a/lib/core/libimagerror/src/iter.rs
+++ b/lib/core/libimagerror/src/iter.rs
@@ -62,7 +62,7 @@ impl<I, T> Iterator for UnwrapExit<I, T>
     type Item = T;
 
     fn next(&mut self) -> Option<Self::Item> {
-        use trace::MapErrTrace;
+        use crate::trace::MapErrTrace;
         self.0.next().map(|e| e.map_err_trace_exit_unwrap())
     }
 }
@@ -71,7 +71,7 @@ impl<I, T> DoubleEndedIterator for UnwrapExit<I, T>
     where I: DoubleEndedIterator<Item = Result<T, Error>>,
 {
     fn next_back(&mut self) -> Option<Self::Item> {
-        use trace::MapErrTrace;
+        use crate::trace::MapErrTrace;
         self.0.next_back().map(|e| e.map_err_trace_exit_unwrap())
     }
 }
diff --git a/lib/core/libimagrt/src/logger.rs b/lib/core/libimagrt/src/logger.rs
index 585f2855..3090fb3f 100644
--- a/lib/core/libimagrt/src/logger.rs
+++ b/lib/core/libimagrt/src/logger.rs
@@ -24,7 +24,7 @@ use std::sync::Arc;
 use std::sync::Mutex;
 use std::ops::Deref;
 
-use runtime::Runtime;
+use crate::runtime::Runtime;
 
 use failure::ResultExt;
 use failure::Fallible as Result;
diff --git a/lib/core/libimagrt/src/runtime.rs b/lib/core/libimagrt/src/runtime.rs
index 6eadc12c..a4cba80f 100644
--- a/lib/core/libimagrt/src/runtime.rs
+++ b/lib/core/libimagrt/src/runtime.rs
@@ -37,9 +37,9 @@ use failure::Fallible as Result;
 use failure::Error;
 use failure::err_msg;
 
-use configuration::{fetch_config, override_config, InternalConfiguration};
-use logger::ImagLogger;
-use io::OutputProxy;
+use crate::configuration::{fetch_config, override_config, InternalConfiguration};
+use crate::logger::ImagLogger;
+use crate::io::OutputProxy;
 
 use libimagerror::exit::ExitCode;
 use libimagerror::errors::ErrorMsg as EM;
@@ -48,7 +48,7 @@ use libimagerror::io::ToExitCode;
 use libimagstore::store::Store;
 use libimagstore::storeid::StoreId;
 use libimagutil::debug_result::DebugResult;
-use spec::CliSpec;
+use crate::spec::CliSpec;
 use atty;
 
 /// The Runtime object
diff --git a/lib/core/libimagrt/src/setup.rs b/lib/core/libimagrt/src/setup.rs
index 6a6a9182..f226d9e3 100644
--- a/lib/core/libimagrt/src/setup.rs
+++ b/lib/core/libimagrt/src/setup.rs
@@ -19,7 +19,7 @@
 
 use clap::App;
 
-use runtime::Runtime;
+use crate::runtime::Runtime;
 
 pub type Name          = &'static str;
 pub type Version<'a>   = &'a str;
diff --git a/lib/core/libimagstore/src/configuration.rs b/lib/core/libimagstore/src/configuration.rs
index 6a8beb8a..d0b3452d 100644
--- a/lib/core/libimagstore/src/configuration.rs
+++ b/lib/core/libimagstore/src/configuration.rs
@@ -45,7 +45,7 @@ pub fn config_implicit_store_create_allowed(config: &Option<Value>) -> Result<bo
 #[cfg(test)]
 mod tests {
     use toml::de::from_str as toml_from_str;
-    use configuration::*;
+    use crate::configuration::*;
 
     #[test]
     fn test_implicit_store_create_allowed_no_toml() {
diff --git a/lib/core/libimagstore/src/file_abstraction/fs.rs b/lib/core/libimagstore/src/file_abstraction/fs.rs
index 904e81d0..5d960bd0 100644
--- a/lib/core/libimagstore/src/file_abstraction/fs.rs
+++ b/lib/core/libimagstore/src/file_abstraction/fs.rs
@@ -27,10 +27,10 @@ use libimagerror::errors::ErrorMsg as EM;
 use super::FileAbstraction;
 use super::FileAbstractionInstance;
 use super::Drain;
-use store::Entry;
-use storeid::StoreIdWithBase;
-use file_abstraction::iter::PathIterator;
-use file_abstraction::iter::PathIterBuilder;
+use crate::store::Entry;
+use crate::storeid::StoreIdWithBase;
+use crate::file_abstraction::iter::PathIterator;
+use crate::file_abstraction::iter::PathIterBuilder;
 
 use walkdir::WalkDir;
 use failure::ResultExt;
diff --git a/lib/core/libimagstore/src/file_abstraction/inmemory.rs b/lib/core/libimagstore/src/file_abstraction/inmemory.rs
index 603f4dbd..13428721 100644
--- a/lib/core/libimagstore/src/file_abstraction/inmemory.rs
+++ b/lib/core/libimagstore/src/file_abstraction/inmemory.rs
@@ -32,10 +32,10 @@ use failure::Error;
 use super::FileAbstraction;
 use super::FileAbstractionInstance;
 use super::Drain;
-use store::Entry;
-use storeid::StoreIdWithBase;
-use file_abstraction::iter::PathIterator;
-use file_abstraction::iter::PathIterBuilder;
+use crate::store::Entry;
+use crate::storeid::StoreIdWithBase;
+use crate::file_abstraction::iter::PathIterator;
+use crate::file_abstraction::iter::PathIterBuilder;
 
 type Backend = Arc<Mutex<RefCell<HashMap<PathBuf, Entry>>>>;
 
diff --git a/lib/core/libimagstore/src/file_abstraction/iter.rs b/lib/core/libimagstore/src/file_abstraction/iter.rs
index 6bd476a1..c15949df 100644
--- a/lib/core/libimagstore/src/file_abstraction/iter.rs
+++ b/lib/core/libimagstore/src/file_abstraction/iter.rs
@@ -23,8 +23,8 @@ use std::fmt::Debug;
 
 use failure::Fallible as Result;
 
-use storeid::StoreIdWithBase;
-use file_abstraction::FileAbstraction;
+use crate::storeid::StoreIdWithBase;
+use crate::file_abstraction::FileAbstraction;
 
 /// See documentation for PathIterator
 pub(crate) trait PathIterBuilder : Debug {
diff --git a/lib/core/libimagstore/src/file_abstraction/mod.rs b/lib/core/libimagstore/src/file_abstraction/mod.rs
index 9a80293e..a8fbf403 100644
--- a/lib/core/libimagstore/src/file_abstraction/mod.rs
+++ b/lib/core/libimagstore/src/file_abstraction/mod.rs
@@ -24,8 +24,8 @@ use std::sync::Arc;
 
 use failure::Fallible as Result;
 
-use store::Entry;
-use storeid::StoreIdWithBase;
+use crate::store::Entry;
+use crate::storeid::StoreIdWithBase;
 
 pub mod fs;
 pub mod inmemory;
@@ -40,8 +40,8 @@ pub(crate) trait FileAbstraction : Debug {
     fn rename(&self, from: &PathBuf, to: &PathBuf) -> Result<()>;
     fn create_dir_all(&self, _: &PathBuf) -> Result<()>;
 
-    fn exists(&self, &PathBuf) -> Result<bool>;
-    fn is_file(&self, &PathBuf) -> Result<bool>;
+    fn exists(&self, _: &PathBuf) -> Result<bool>;
+    fn is_file(&self, _: &PathBuf) -> Result<bool>;
 
     fn new_instance(&self, p: PathBuf) -> Box<FileAbstractionInstance>;
 
@@ -97,8 +97,8 @@ mod test {
     use super::FileAbstractionInstance;
     use super::inmemory::InMemoryFileAbstraction;
     use super::inmemory::InMemoryFileAbstractionInstance;
-    use storeid::StoreIdWithBase;
-    use store::Entry;
+    use crate::storeid::StoreIdWithBase;
+    use crate::store::Entry;
 
     #[test]
     fn lazy_file() {
diff --git a/lib/core/libimagstore/src/iter.rs b/lib/core/libimagstore/src/iter.rs
index 1aba5a58..4e66fb6e 100644
--- a/lib/core/libimagstore/src/iter.rs
+++ b/lib/core/libimagstore/src/iter.rs
@@ -27,10 +27,10 @@ macro_rules! mk_iterator_mod {
         fun       = $fun:expr
     } => {
         pub mod $modname {
-            use storeid::StoreId;
+            use crate::storeid::StoreId;
             #[allow(unused_imports)]
-            use store::FileLockEntry;
-            use store::Store;
+            use crate::store::FileLockEntry;
+            use crate::store::Store;
             use failure::Fallible as Result;
 
             pub struct $itername<'a>(Box<Iterator<Item = Result<StoreId>> + 'a>, &'a Store);
@@ -109,8 +109,8 @@ mod compile_test {
     // This module contains code to check whether this actually compiles the way we would like it to
     // compile
 
-    use store::Store;
-    use storeid::StoreId;
+    use crate::store::Store;
+    use crate::storeid::StoreId;
 
     fn store() -> Store {
         unimplemented!("Not implemented because in compile-test")
@@ -137,13 +137,13 @@ mod compile_test {
     }
 }
 
-use storeid::StoreId;
-use storeid::StoreIdIterator;
+use crate::storeid::StoreId;
+use crate::storeid::StoreIdIterator;
 use self::delete::StoreDeleteIterator;
 use self::get::StoreGetIterator;
 use self::retrieve::StoreRetrieveIterator;
-use file_abstraction::iter::PathIterator;
-use store::Store;
+use crate::file_abstraction::iter::PathIterator;
+use crate::store::Store;
 use failure::Fallible as Result;
 
 /// Iterator for iterating over all (or a subset of all) entries
@@ -186,8 +186,8 @@ impl<'a> Entries<'a> {
     /// Revisit whether this can be done in a cleaner way. See commit message for why this is
     /// needed.
     pub fn into_storeid_iter(self) -> StoreIdIterator {
-        use storeid::StoreIdWithBase;
-        use storeid::IntoStoreId;
+        use crate::storeid::StoreIdWithBase;
+        use crate::storeid::IntoStoreId;
 
         let storepath = self.1.path().to_path_buf();
 
@@ -243,9 +243,9 @@ mod tests {
         let _ = env_logger::try_init();
     }
 
-    use store::Store;
-    use storeid::StoreId;
-    use file_abstraction::inmemory::InMemoryFileAbstraction;
+    use crate::store::Store;
+    use crate::storeid::StoreId;
+    use crate::file_abstraction::inmemory::InMemoryFileAbstraction;
     use libimagutil::variants::generate_variants;
 
     pub fn get_store() -> Store {
diff --git a/lib/core/libimagstore/src/store.rs b/lib/core/libimagstore/src/store.rs
index 3cd0bfeb..8c45fa45 100644
--- a/lib/core/libimagstore/src/store.rs
+++ b/lib/core/libimagstore/src/store.rs
@@ -41,12 +41,12 @@ use failure::ResultExt;
 use failure::err_msg;
 use failure::Error;
 
-use storeid::{IntoStoreId, StoreId};
-use iter::Entries;
-use file_abstraction::FileAbstraction;
-use file_abstraction::FileAbstractionInstance;
-use file_abstraction::fs::FSFileAbstraction;
-use file_abstraction::inmemory::InMemoryFileAbstraction;
+use crate::storeid::{IntoStoreId, StoreId};
+use crate::iter::Entries;
+use crate::file_abstraction::FileAbstraction;
+use crate::file_abstraction::FileAbstractionInstance;
+use crate::file_abstraction::fs::FSFileAbstraction;
+use crate::file_abstraction::inmemory::InMemoryFileAbstraction;
 
 use libimagutil::debug_result::*;
 
@@ -188,7 +188,7 @@ impl Store {
     pub(crate) fn new_with_backend(location: PathBuf,
                         store_config: &Option<Value>,
                         backend: Arc<FileAbstraction>) -> Result<Store> {
-        use configuration::*;
+        use crate::configuration::*;
 
         debug!("Building new Store object");
         if !location.exists() {
@@ -813,7 +813,7 @@ impl Entry {
     /// - Header cannot be parsed into a TOML object
     ///
     pub fn from_str<S: IntoStoreId>(loc: S, s: &str) -> Result<Entry> {
-        use util::entry_buffer_to_header_content;
+        use crate::util::entry_buffer_to_header_content;
 
         let (header, content) = entry_buffer_to_header_content(s)?;
 
@@ -865,7 +865,7 @@ impl Entry {
     ///
     /// If an error is returned, the contents of neither the header nor the content are modified.
     pub fn replace_from_buffer(&mut self, buf: &str) -> Result<()> {
-        let (header, content) = ::util::entry_buffer_to_header_content(buf)?;
+        let (header, content) = crate::util::entry_buffer_to_header_content(buf)?;
         self.content          = content;
         self.header           = header;
         Ok(())
@@ -931,9 +931,9 @@ mod test {
     extern crate env_logger;
 
     use std::collections::BTreeMap;
-    use storeid::StoreId;
-    use store::has_main_section;
-    use store::has_imag_version_in_main_section;
+    use crate::storeid::StoreId;
+    use crate::store::has_main_section;
+    use crate::store::has_imag_version_in_main_section;
 
     use toml::Value;
 
@@ -1058,7 +1058,7 @@ mod store_tests {
     use super::Store;
 
     pub fn get_store() -> Store {
-        use file_abstraction::inmemory::InMemoryFileAbstraction;
+        use crate::file_abstraction::inmemory::InMemoryFileAbstraction;
         let backend = Arc::new(InMemoryFileAbstraction::default());
         Store::new_with_backend(PathBuf::from("/"), &None, backend).unwrap()
     }
@@ -1141,7 +1141,7 @@ mod store_tests {
 
     #[test]
     fn test_store_create_in_hm() {
-        use storeid::StoreId;
+        use crate::storeid::StoreId;
 
         let store = get_store();
 
@@ -1156,7 +1156,7 @@ mod store_tests {
 
     #[test]
     fn test_store_retrieve_in_hm() {
-        use storeid::StoreId;
+        use crate::storeid::StoreId;
 
         let store = get_store();
 
@@ -1195,7 +1195,7 @@ mod store_tests {
 
     #[test]
     fn test_store_move_moves_in_hm() {
-        use storeid::StoreId;
+        use crate::storeid::StoreId;
         setup_logging();
 
         let store = get_store();
diff --git a/lib/core/libimagstore/src/storeid.rs b/lib/core/libimagstore/src/storeid.rs
index 56177ea5..2c504f2c 100644
--- a/lib/core/libimagstore/src/storeid.rs
+++ b/lib/core/libimagstore/src/storeid.rs
@@ -31,12 +31,12 @@ use failure::Fallible as Result;
 use failure::err_msg;
 use failure::Error;
 
-use store::Store;
+use crate::store::Store;
 
-use iter::create::StoreCreateIterator;
-use iter::delete::StoreDeleteIterator;
-use iter::get::StoreGetIterator;
-use iter::retrieve::StoreRetrieveIterator;
+use crate::iter::create::StoreCreateIterator;
+use crate::iter::delete::StoreDeleteIterator;
+use crate::iter::get::StoreGetIterator;
+use crate::iter::retrieve::StoreRetrieveIterator;
 
 /// The Index into the Store
 ///
@@ -344,14 +344,14 @@ mod test {
 
     #[test]
     fn test_correct_path() {
-        let p = ::storeid::test::module_path::new_id("test");
+        let p = crate::storeid::test::module_path::new_id("test");
 
         assert_eq!(p.unwrap().to_str().unwrap(), "test/test");
     }
 
     #[test]
     fn storeid_in_collection() {
-        let p = ::storeid::test::module_path::new_id("1/2/3/4/5/6/7/8/9/0").unwrap();
+        let p = crate::storeid::test::module_path::new_id("1/2/3/4/5/6/7/8/9/0").unwrap();
 
         assert!(p.is_in_collection(&["test", "1"]));
         assert!(p.is_in_collection(&["test", "1", "2"]));
diff --git a/lib/domain/libimagbookmark/src/collection.rs b/lib/domain/libimagbook