run_make_support: move target checks into targets module

Author: jieyouxu

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

@@ -13,6 +13,7 @@ mod macros;
 pub mod run;
 pub mod rustc;
 pub mod rustdoc;
+pub mod targets;
 
 use std::env;
 use std::ffi::OsString;
@@ -37,6 +38,7 @@ pub use llvm::{
 pub use run::{cmd, run, run_fail, run_with_args};
 pub use rustc::{aux_build, bare_rustc, rustc, Rustc};
 pub use rustdoc::{bare_rustdoc, rustdoc, Rustdoc};
+pub use targets::{is_darwin, is_msvc, is_windows, target, uname};
 
 use command::{Command, CompletedProcess};
 
@@ -58,12 +60,6 @@ pub fn env_var_os(name: &str) -> OsString {
     }
 }
 
-/// `TARGET`
-#[must_use]
-pub fn target() -> String {
-    env_var("TARGET")
-}
-
 /// `AR`
 #[track_caller]
 pub fn ar(inputs: &[impl AsRef<Path>], output_path: impl AsRef<Path>) {
@@ -77,24 +73,6 @@ pub fn ar(inputs: &[impl AsRef<Path>], output_path: impl AsRef<Path>) {
     }
 }
 
-/// Check if target is windows-like.
-#[must_use]
-pub fn is_windows() -> bool {
-    target().contains("windows")
-}
-
-/// Check if target uses msvc.
-#[must_use]
-pub fn is_msvc() -> bool {
-    target().contains("msvc")
-}
-
-/// Check if target uses macOS.
-#[must_use]
-pub fn is_darwin() -> bool {
-    target().contains("darwin")
-}
-
 #[track_caller]
 #[must_use]
 pub fn python_command() -> Command {
@@ -341,20 +319,11 @@ pub fn cygpath_windows<P: AsRef<Path>>(path: P) -> String {
     output.stdout_utf8().trim().to_string()
 }
 
-/// Run `uname`. This assumes that `uname` is available on the platform!
-#[track_caller]
-#[must_use]
-pub fn uname() -> String {
-    let caller = panic::Location::caller();
-    let mut uname = Command::new("uname");
-    let output = uname.run();
-    if !output.status().success() {
-        handle_failed_output(&uname, output, caller.line());
-    }
-    output.stdout_utf8()
-}
-
-fn handle_failed_output(cmd: &Command, output: CompletedProcess, caller_line_number: u32) -> ! {
+pub(crate) fn handle_failed_output(
+    cmd: &Command,
+    output: CompletedProcess,
+    caller_line_number: u32,
+) -> ! {
     if output.status().success() {
         eprintln!("command unexpectedly succeeded at line {caller_line_number}");
     } else {

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

@@ -0,0 +1,41 @@
+use std::panic;
+
+use crate::command::Command;
+use crate::{env_var, handle_failed_output};
+
+/// `TARGET`
+#[must_use]
+pub fn target() -> String {
+    env_var("TARGET")
+}
+
+/// Check if target is windows-like.
+#[must_use]
+pub fn is_windows() -> bool {
+    target().contains("windows")
+}
+
+/// Check if target uses msvc.
+#[must_use]
+pub fn is_msvc() -> bool {
+    target().contains("msvc")
+}
+
+/// Check if target uses macOS.
+#[must_use]
+pub fn is_darwin() -> bool {
+    target().contains("darwin")
+}
+
+/// Run `uname`. This assumes that `uname` is available on the platform!
+#[track_caller]
+#[must_use]
+pub fn uname() -> String {
+    let caller = panic::Location::caller();
+    let mut uname = Command::new("uname");
+    let output = uname.run();
+    if !output.status().success() {
+        handle_failed_output(&uname, output, caller.line());
+    }
+    output.stdout_utf8()
+}