move default conf & prefs into resource files

This makes it comre convenient to edit them when they're
not in strings in rust files.

Author: Canop

src/default_package_config.rs renamed to defaults/default-bacon.toml

@@ -1,4 +1,3 @@
-pub static DEFAULT_PACKAGE_CONFIG: &str = r#"
 # This is a configuration file for the bacon tool
 # More info at https://github.com/Canop/bacon
 
@@ -23,5 +22,3 @@ need_stdout = false
 command = ["cargo", "test", "--color", "always"]
 need_stdout = true
 watch = ["tests"]
-
-"#;

src/default_prefs.rs renamed to defaults/default-prefs.toml

@@ -1,4 +1,3 @@
-pub static DEFAULT_PREFS: &str = r#"
 # This is a preferences file for the bacon tool
 # More info at https://github.com/Canop/bacon
 
@@ -21,5 +20,3 @@ pub static DEFAULT_PREFS: &str = r#"
 # with g, G, j, k
 #
 # vim_keys = true
-
-"#;

src/defaults.rs

@@ -0,0 +1,5 @@
+
+pub static DEFAULT_PREFS: &str = include_str!("../defaults/default-prefs.toml");
+
+pub static DEFAULT_PACKAGE_CONFIG: &str = include_str!("../defaults/default-bacon.toml");
+

src/drawing.rs

@@ -2,7 +2,6 @@ use {
     crate::*,
     anyhow::*,
     crossterm::{cursor, execute, terminal},
-    std::io::Write,
 };
 
 pub fn goto(w: &mut W, y: u16) -> Result<()> {

src/main.rs

@@ -3,8 +3,7 @@ mod args;
 mod cli;
 mod command_output;
 mod command_result;
-mod default_package_config;
-mod default_prefs;
+mod defaults;
 mod drawing;
 mod executor;
 mod failure;
@@ -29,8 +28,7 @@ pub use {
     cli::*,
     command_output::*,
     command_result::*,
-    default_package_config::*,
-    default_prefs::*,
+    defaults::*,
     drawing::*,
     executor::*,
     failure::*,
@@ -50,12 +48,12 @@ pub use {
     wrap::*,
 };
 
-#[macro_use]
-extern crate log;
+#[macro_use] extern crate log;
+#[macro_use] extern crate cli_log;
 
 /// Knowledge is power
 fn main() -> anyhow::Result<()> {
-    cli_log::init("bacon");
+    init_cli_log!();
     cli::run()?;
     info!("bye");
     Ok(())