Replaced a bunch of println!()'s with proper log macros

Author: Michael-F-Bryan

src/bin/build.rs

@@ -30,6 +30,7 @@ pub fn execute(args: &ArgMatches) -> Result<()> {
     book.build()?;
 
     if args.is_present("open") {
+        // FIXME: What's the right behaviour if we don't use the HTML renderer?
         open(book.build_dir_for("html").join("index.html"));
     }
 

src/bin/init.rs

@@ -26,7 +26,11 @@ pub fn execute(args: &ArgMatches) -> Result<()> {
         // Skip this if `--force` is present
         if !args.is_present("force") {
             // Print warning
-            print!("\nCopying the default theme to {}", builder.config().book.src.display());
+            println!();
+            println!(
+                "Copying the default theme to {}",
+                builder.config().book.src.display()
+            );
             println!("This could potentially overwrite files already present in that directory.");
             print!("\nAre you sure you want to continue? (y/n) ");
 

src/bin/mdbook.rs

@@ -17,6 +17,7 @@ use chrono::Local;
 use log::LevelFilter;
 use env_logger::Builder;
 use error_chain::ChainedError;
+use mdbook::utils;
 
 pub mod build;
 pub mod init;
@@ -64,7 +65,7 @@ fn main() {
     };
 
     if let Err(e) = res {
-        eprintln!("{}", e.display_chain());
+        utils::log_backtrace(&e);
 
         ::std::process::exit(101);
     }
@@ -101,12 +102,12 @@ fn get_book_dir(args: &ArgMatches) -> PathBuf {
             p.to_path_buf()
         }
     } else {
-        env::current_dir().unwrap()
+        env::current_dir().expect("Unable to determine the current directory")
     }
 }
 
 fn open<P: AsRef<OsStr>>(path: P) {
     if let Err(e) = open::that(path) {
-        println!("Error opening web browser: {}", e);
+        error!("Error opening web browser: {}", e);
     }
 }

src/bin/serve.rs

@@ -7,6 +7,7 @@ use self::iron::{status, AfterMiddleware, Chain, Iron, IronError, IronResult, Re
                  Set};
 use clap::{App, ArgMatches, SubCommand};
 use mdbook::MDBook;
+use mdbook::utils;
 use mdbook::errors::*;
 use {get_book_dir, open};
 #[cfg(feature = "watch")]
@@ -80,7 +81,9 @@ pub fn execute(args: &ArgMatches) -> Result<()> {
 
     #[cfg(feature = "watch")]
     watch::trigger_on_change(&mut book, move |path, book_dir| {
-        println!("File changed: {:?}\nBuilding book...\n", path);
+        info!("File changed: {:?}", path);
+        info!("Building book...");
+
         // FIXME: This area is really ugly because we need to re-set livereload :(
 
         let livereload_url = livereload_url.clone();
@@ -94,10 +97,7 @@ pub fn execute(args: &ArgMatches) -> Result<()> {
 
         if let Err(e) = result {
             error!("Unable to load the book");
-            error!("Error: {}", e);
-            for cause in e.iter().skip(1) {
-                error!("\tCaused By: {}", cause);
-            }
+            utils::log_backtrace(&e);
         } else {
             let _ = broadcaster.send("reload");
         }

src/bin/watch.rs

@@ -6,6 +6,7 @@ use std::time::Duration;
 use std::sync::mpsc::channel;
 use clap::{App, ArgMatches, SubCommand};
 use mdbook::MDBook;
+use mdbook::utils;
 use mdbook::errors::Result;
 use {get_book_dir, open};
 
@@ -30,13 +31,13 @@ pub fn execute(args: &ArgMatches) -> Result<()> {
     }
 
     trigger_on_change(&book, |path, book_dir| {
-        println!("File changed: {:?}\nBuilding book...\n", path);
+        info!("File changed: {:?}\nBuilding book...\n", path);
         let result = MDBook::load(&book_dir).and_then(|b| b.build());
 
         if let Err(e) = result {
-            println!("Error while building: {}", e);
+            error!("Unable to build the book");
+            utils::log_backtrace(&e);
         }
-        println!();
     });
 
     Ok(())

src/utils/mod.rs

@@ -1,5 +1,6 @@
 pub mod fs;
 mod string;
+use errors::Error;
 
 use pulldown_cmark::{html, Event, Options, Parser, Tag, OPTION_ENABLE_FOOTNOTES,
                      OPTION_ENABLE_TABLES};
@@ -105,6 +106,15 @@ fn convert_quotes_to_curly(original_text: &str) -> String {
                  .collect()
 }
 
+/// Prints a "backtrace" of some `Error`.
+pub fn log_backtrace(e: &Error) {
+    error!("Error: {}", e);
+
+    for cause in e.iter().skip(1) {
+        error!("\tCaused By: {}", cause);
+    }
+}
+
 #[cfg(test)]
 mod tests {
     mod render_markdown {