diff --git a/src/librustc_driver/lib.rs b/src/librustc_driver/lib.rs
index 2f847e3dd97..5ed549d0bbd 100644
--- a/src/librustc_driver/lib.rs
+++ b/src/librustc_driver/lib.rs
@@ -141,7 +141,8 @@ pub fn run<F>(run_compiler: F) -> isize
                         errors::emitter::EmitterWriter::stderr(errors::ColorConfig::Auto,
                                                                None,
                                                                true);
-                    let handler = errors::Handler::with_emitter(true, false, false, Box::new(emitter));
+                    let handler = errors::Handler::with_emitter(true, false, false,
+                                                                Box::new(emitter));
                     handler.emit(&MultiSpan::new(),
                                  "aborting due to previous error(s)",
                                  errors::Level::Fatal);
diff --git a/src/librustdoc/test.rs b/src/librustdoc/test.rs
index 03cb77422cf..cc59afb00d4 100644
--- a/src/librustdoc/test.rs
+++ b/src/librustdoc/test.rs
@@ -81,7 +81,9 @@ pub fn run(input: &str,
 
     let codemap = Rc::new(CodeMap::new(sessopts.file_path_mapping()));
     let handler =
-        errors::Handler::with_tty_emitter(ColorConfig::Auto, true, false, false, Some(codemap.clone()));
+        errors::Handler::with_tty_emitter(ColorConfig::Auto,
+                                          true, false, false,
+                                          Some(codemap.clone()));
 
     let cstore = Rc::new(CStore::new(box rustc_trans::LlvmMetadataLoader));
     let mut sess = session::build_session_(