rename to output_file and swap args

Author: Oneirical

tests/run-make/reset-codegen-1/rmake.rs

@@ -10,9 +10,9 @@
 use run_make_support::{rustc, tmp_dir};
 use std::fs;
 
-fn compile(emit: Option<&str>, output_dir: &str) {
+fn compile(output_file: &str, emit: Option<&str>) {
     let mut rustc = rustc();
-    let rustc = rustc.codegen_units(4).output(tmp_dir().join(output_dir)).input("foo.rs");
+    let rustc = rustc.codegen_units(4).output(tmp_dir().join(output_file)).input("foo.rs");
     if let Some(emit) = emit {
         rustc.emit(emit);
     }
@@ -30,9 +30,9 @@ fn main() {
         ("dep-output", Some("dep-info")),
         ("multi-output", Some("asm,obj")),
     ];
-    for (output_dir, emit) in flags {
-        fs::remove_file(output_dir).unwrap_or_default();
-        compile(emit, output_dir);
-        fs::remove_file(output_dir);
+    for (output_file, emit) in flags {
+        fs::remove_file(output_file).unwrap_or_default();
+        compile(output_file, emit);
+        fs::remove_file(output_file);
     }
 }