Merge branch 'minor'

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

bin/core/imag-git/src/main.rs

@@ -136,7 +136,10 @@ fn main() {
         Ok(exit_status) => {
             if !exit_status.success() {
                 debug!("git exited with non-zero exit code: {:?}", exit_status);
-                eprintln!("git exited with non-zero exit code");
+                let mut err = rt.stderr();
+                writeln!(err, "git exited with non-zero exit code")
+                    .to_exit_code()
+                    .unwrap_or_exit();
                 ::std::process::exit(exit_status.code().unwrap_or(1));
             }
             debug!("Successful exit!");

bin/core/imag-ids/src/id_filters.rs

@@ -581,23 +581,24 @@ pub mod header_filter_lang {
 
         #[test]
         fn test_list_of_val() {
+            setup_logging();
             {
                 let list = list_of_val(b"[]");
-                println!("list: {:?}", list);
+                debug!("list: {:?}", list);
                 let vals = list.unwrap().1;
                 assert_eq!(vals, vec![]);
             }
 
             {
                 let list = list_of_val(b"[1]");
-                println!("list: {:?}", list);
+                debug!("list: {:?}", list);
                 let vals = list.unwrap().1;
                 assert_eq!(vals, vec![Value::Integer(1)]);
             }
 
             {
                 let list = list_of_val(b"[12,13]");
-                println!("list: {:?}", list);
+                debug!("list: {:?}", list);
                 let vals = list.unwrap().1;
                 assert_eq!(vals, vec![Value::Integer(12), Value::Integer(13)]);
             }

lib/core/libimagrt/src/setup.rs

@@ -38,8 +38,8 @@ pub fn generate_runtime_setup<'a, B>(name: Name, version: Version<'a>, about: Ab
 
     Runtime::new(builder(Runtime::get_default_cli_builder(name, version, about)))
         .unwrap_or_else(|e| {
-            println!("Could not set up Runtime");
-            println!("{:?}", e);
+            eprintln!("Could not set up Runtime");
+            eprintln!("{:?}", e);
             trace_error_dbg(&e);
             exit(1);
         })

lib/core/libimagstore/src/store.rs

@@ -921,6 +921,10 @@ mod test {
 
     use toml::Value;
 
+    fn setup_logging() {
+        let _ = env_logger::try_init();
+    }
+
     #[test]
     fn test_imag_section() {
         let mut map = BTreeMap::new();
@@ -983,7 +987,10 @@ Hai
     fn test_entry_from_str() {
         use super::Entry;
         use std::path::PathBuf;
-        println!("{}", TEST_ENTRY);
+
+        setup_logging();
+
+        debug!("{}", TEST_ENTRY);
         let entry = Entry::from_str(StoreId::new_baseless(PathBuf::from("test/foo~1.3")).unwrap(),
                                     TEST_ENTRY).unwrap();
 
@@ -994,7 +1001,10 @@ Hai
     fn test_entry_to_str() {
         use super::Entry;
         use std::path::PathBuf;
-        println!("{}", TEST_ENTRY);
+
+        setup_logging();
+
+        debug!("{}", TEST_ENTRY);
         let entry = Entry::from_str(StoreId::new_baseless(PathBuf::from("test/foo~1.3")).unwrap(),
                                     TEST_ENTRY).unwrap();
         let string = entry.to_str().unwrap();
@@ -1006,7 +1016,10 @@ Hai
     fn test_entry_to_str_trailing_newline() {
         use super::Entry;
         use std::path::PathBuf;
-        println!("{}", TEST_ENTRY_TNL);
+
+        setup_logging();
+
+        debug!("{}", TEST_ENTRY_TNL);
         let entry = Entry::from_str(StoreId::new_baseless(PathBuf::from("test/foo~1.3")).unwrap(),
                                     TEST_ENTRY_TNL).unwrap();
         let string = entry.to_str().unwrap();
@@ -1017,9 +1030,15 @@ Hai
 
 #[cfg(test)]
 mod store_tests {
+    extern crate env_logger;
+
     use std::path::PathBuf;
     use std::sync::Arc;
 
+    fn setup_logging() {
+        let _ = env_logger::try_init();
+    }
+
     use super::Store;
     use file_abstraction::InMemoryFileAbstraction;
 
@@ -1165,6 +1184,7 @@ mod store_tests {
     #[test]
     fn test_store_move_moves_in_hm() {
         use storeid::StoreId;
+        setup_logging();
 
         let store = get_store();
 
@@ -1187,7 +1207,7 @@ mod store_tests {
                 }
 
                 let r = store.move_by_id(id.clone(), id_mv.clone());
-                assert!(r.map_err(|e| println!("ERROR: {:?}", e)).is_ok());
+                assert!(r.map_err(|e| debug!("ERROR: {:?}", e)).is_ok());
 
                 {
                     let id_mv_with_base = id_mv.clone().with_base(store.path().clone());

lib/entry/libimagentrycategory/src/store.rs

@@ -191,7 +191,7 @@ mod tests {
         }
 
         let id = PathBuf::from(format!("category/{}", category_name));
-        println!("Trying: {:?}", id);
+        debug!("Trying: {:?}", id);
         let category = store.get(id);
 
         assert!(category.is_ok(), format!("Expected Ok(_), got: {:?}", category));

lib/entry/libimagentrylink/src/internal.rs

@@ -840,11 +840,11 @@ mod test {
         {
             assert!(e1.remove_internal_link(&mut e2).is_ok());
 
-            println!("{:?}", e2.to_str());
+            debug!("{:?}", e2.to_str());
             let e2_links = e2.get_internal_links().unwrap().collect::<Vec<_>>();
             assert_eq!(e2_links.len(), 0, "Expected [], got: {:?}", e2_links);
 
-            println!("{:?}", e1.to_str());
+            debug!("{:?}", e1.to_str());
             let e1_links = e1.get_internal_links().unwrap().collect::<Vec<_>>();
             assert_eq!(e1_links.len(), 0, "Expected [], got: {:?}", e1_links);
 

lib/entry/libimagentrymarkdown/src/processor.rs

@@ -443,7 +443,7 @@ mod tests {
         let entries : Vec<_> = entries.unwrap().without_store().collect();
 
         assert_eq!(2, entries.len(), "Expected 2 links, got: {:?}", entries);
-        println!("{:?}", entries);
+        debug!("{:?}", entries);
     }
 
     #[test]
@@ -476,7 +476,7 @@ mod tests {
         let entries : Vec<_> = entries.unwrap().without_store().collect();
 
         assert_eq!(3, entries.len(), "Expected 3 links, got: {:?}", entries);
-        println!("{:?}", entries);
+        debug!("{:?}", entries);
     }
 
     #[test]
@@ -509,7 +509,7 @@ mod tests {
         let entries : Vec<_> = entries.unwrap().without_store().collect();
 
         assert_eq!(1, entries.len(), "Expected 1 entries, got: {:?}", entries);
-        println!("{:?}", entries);
+        debug!("{:?}", entries);
     }
 
     #[test]