---

yaml
---
r: 277981
b: refs/heads/auto
c: aaf56d7
h: refs/heads/master
i:
  277979: a8a1fa2

Author: nrc

[refs]

@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 52a2b33a4b1c9f10e7034a758d4dff4f53129a49
+refs/heads/auto: aaf56d7086e6dc5e436ec7064898f90295908312
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
 refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/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) {

branches/auto/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 {

branches/auto/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");
     }
 }