implement easiest review suggestions

Author: Oneirical

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

@@ -14,22 +14,21 @@
 //@ ignore-windows-gnu
 //@ ignore-cross-compile
 
-use run_make_support::{llvm_profdata, rustc, rustdoc, tmp_dir};
+use run_make_support::{llvm_profdata, rustc, rustdoc, 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 common_flags = if env::consts::OS == "linux"
-        && env::var("TARGET").unwrap_or_default().contains("x86") {
-        "-Clink-args=-fuse-ld=gold" // FIXME, Why was there a comma at the start?
+    let common_flags = if cfg!(target_os = "linux") && target().contains("x86") {
+        "-Clink-args=-fuse-ld=gold"
     } else {
         ""
     };
     let path_prof_data_dir = tmp_dir().join("prof_data_dir");
-    let path_merged_profdata = path_prof_data_dir.clone().join("merged.profdata");
+    let path_merged_profdata = path_prof_data_dir.join("merged.profdata");
     rustc().arg(common_flags).input("opaque.rs").run();
     fs::create_dir_all(&path_prof_data_dir);
     rustc().arg(common_flags)