Fix tests

src/librustc_driver/lib.rs

@@ -447,7 +447,10 @@ impl<'a> CompilerCalls<'a> for RustcDefaultCalls {
             .and_then(|| RustcDefaultCalls::list_metadata(sess, matches, input))
     }
 
-    fn build_controller(&mut self, sess: &Session, matches: &getopts::Matches) -> CompileController<'a> {
+    fn build_controller(&mut self,
+                        sess: &Session,
+                        matches: &getopts::Matches)
+                        -> CompileController<'a> {
         let mut control = CompileController::basic();
 
         if let Some((ppm, opt_uii)) = parse_pretty(sess, matches) {

src/librustc_driver/pretty.rs

@@ -949,7 +949,9 @@ fn print_with_analysis<'tcx, 'a: 'tcx>(sess: &'a Session,
                         });
                         match ppm {
                             PpmMir => write_mir_pretty(tcx, iter::once((&nodeid, mir)), &mut out),
-                            PpmMirCFG => write_mir_graphviz(tcx, iter::once((&nodeid, mir)), &mut out),
+                            PpmMirCFG => {
+                                write_mir_graphviz(tcx, iter::once((&nodeid, mir)), &mut out)
+                            }
                             _ => unreachable!(),
                         }?;
                     } else {

src/test/run-pass-fulldeps/compiler-calls.rs

@@ -69,7 +69,10 @@ impl<'a> CompilerCalls<'a> for TestCalls {
         panic!("This shouldn't happen");
     }
 
-    fn build_controller(&mut self, _: &Session, _: &getopts::Matches) -> driver::CompileController<'a> {
+    fn build_controller(&mut self,
+                        _: &Session,
+                        _: &getopts::Matches)
+                        -> driver::CompileController<'a> {
         panic!("This shouldn't be called");
     }
 }