Merge pull request #54 from spastorino/ui-test-cleanup

Make ui.rs a little bit clearer

dynosaur/tests/ui.rs

@@ -12,28 +12,25 @@ enum Mode {
 }
 
 fn cfg(path: &Path, mode: Mode) -> Config {
-    let mut program = CommandBuilder::rustc();
+    let mut config = Config {
+        program: CommandBuilder::rustc(),
+        ..Config::rustc(path)
+    };
 
     let exit_status = match mode {
         Mode::Expand => {
-            program.args.push("-Zunpretty=expanded".into());
+            config.program.args.push("-Zunpretty=expanded".into());
             0
         }
 
-        Mode::Compile => 0,
+        Mode::Compile => {
+            config.output_conflict_handling = ignore_output_conflict;
+            0
+        }
 
         Mode::Panic => 101,
     };
 
-    let mut config = Config {
-        program,
-        ..Config::rustc(path)
-    };
-
-    if matches!(mode, Mode::Compile) {
-        config.output_conflict_handling = ignore_output_conflict;
-    }
-
     let require_annotations = false; // we're not showing errors in a specific line anyway
     config.comment_defaults.base().exit_status = Spanned::dummy(exit_status).into();
     config.comment_defaults.base().require_annotations = Spanned::dummy(require_annotations).into();