fix the build

Author: Oneirical

src/tools/run-make-support/src/run.rs

@@ -1,6 +1,8 @@
 use std::env;
 use std::path::{Path, PathBuf};
 use std::process::{Command, Output};
+use std::io::{self, BufReader, Write};
+use std::fs::File;
 
 use crate::is_windows;
 
@@ -39,7 +41,10 @@ fn run_common(name: &str) -> (Command, Output) {
 
 /// Run a command taking in standard input from a file, and passing an argument
 /// referring to a different file.
-pub fn stdin_command<P: AsRef<Path>>(command: &str, stdin: P, argument: P) {
+pub fn stdin_command<P>(command: &str, stdin: P, argument: P)
+    where
+    P: AsRef<Path> + AsRef<OsStr>,
+{
     let file = File::open(stdin).unwrap();
     let reader = BufReader::new(file);
 

tests/run-make/pgo-branch-weights/rmake.rs

@@ -15,14 +15,13 @@
 //@ ignore-cross-compile
 
 use run_make_support::{llvm_profdata, rustc, rustdoc, stdin_command, target, tmp_dir};
-use std::io::{self, Write};
-use std::process::Command;
 
 fn main() {
     // For some very small programs GNU ld seems to not properly handle
     // instrumentation sections correctly. Neither Gold nor LLD have that
     // problem.
-    let link_args = (cfg!(target_os = "linux") && target().contains("x86")).then_some("-Clink-args=-fuse-ld=gold");
+    let link_args = (cfg!(target_os = "linux") && target().contains("x86"))
+        .then_some("-Clink-args=-fuse-ld=gold");
 
     let path_prof_data_dir = tmp_dir().join("prof_data_dir");
     let path_merged_profdata = path_prof_data_dir.join("merged.profdata");
@@ -32,24 +31,28 @@ fn main() {
     }
     invoc.run();
     fs::create_dir_all(&path_prof_data_dir);
-    let invoc = rustc().input("interesting.rs")
+    let invoc = rustc()
+        .input("interesting.rs")
         .profile_generate(&path_prof_data_dir)
         .opt()
         .codegen_units(1);
     if let Some(link_args) = link_args {
         invoc.arg(link_args);
     }
     invoc.run();
-    let invoc = rustc().input("main.rs")
-        .profile_generate(&path_prof_data_dir)
-        .opt();
+    let invoc = rustc().input("main.rs").profile_generate(&path_prof_data_dir).opt();
     if let Some(link_args) = link_args {
         invoc.arg(link_args);
     }
     invoc.run();
     run("main");
-    llvm_profdata().merge().output(&path_merged_profdata).input(path_prof_data_dir).command_output();
-    let invoc = rustc().input("interesting.rs")
+    llvm_profdata()
+        .merge()
+        .output(&path_merged_profdata)
+        .input(path_prof_data_dir)
+        .command_output();
+    let invoc = rustc()
+        .input("interesting.rs")
         .profile_use(path_merged_profdata)
         .opt()
         .codegen_units(1)