Couple of minor build system changes

Author: bjorn3

build_system/bench.rs

@@ -1,11 +1,12 @@
 use std::env;
 use std::io::Write;
 use std::path::Path;
+use std::process::Command;
 
 usecrate::path::{Dirs,RelPath};
 usecrate::prepare::GitRepo;
 usecrate::rustc_info::get_file_name;
-usecrate::utils::{hyperfine_command,spawn_and_wait,Compiler};
+usecrate::utils::{spawn_and_wait,Compiler};
 
 staticSIMPLE_RAYTRACER_REPO:GitRepo = GitRepo::github(
 "ebobby",
@@ -128,3 +129,37 @@ fn benchmark_simple_raytracer(dirs: &Dirs, bootstrap_host_compiler: &Compiler) {
  gha_step_summary.write_all(b"\n").unwrap();
 }
 }
+
+#[must_use]
+fnhyperfine_command(
+warmup:u64,
+runs:u64,
+prepare:Option<&str>,
+cmds:&[(&str,&str)],
+markdown_export:&Path,
+) -> Command{
+letmut bench = Command::new("hyperfine");
+
+ bench.arg("--export-markdown").arg(markdown_export);
+
+if warmup != 0{
+ bench.arg("--warmup").arg(warmup.to_string());
+}
+
+if runs != 0{
+ bench.arg("--runs").arg(runs.to_string());
+}
+
+ifletSome(prepare) = prepare {
+ bench.arg("--prepare").arg(prepare);
+}
+
+for&(name, cmd)in cmds {
+if name != ""{
+ bench.arg("-n").arg(name);
+}
+ bench.arg(cmd);
+}
+
+ bench
+}

build_system/build_sysroot.rs

@@ -136,6 +136,7 @@ pub(crate) fn build_sysroot(
  target_compiler
 }
 
+#[must_use]
 structSysrootTarget{
 triple:String,
 libs:Vec<PathBuf>,
@@ -161,7 +162,6 @@ pub(crate) static STANDARD_LIBRARY: CargoProject =
 CargoProject::new(&STDLIB_SRC.join("library/sysroot"),"stdlib_target");
 pub(crate)staticRTSTARTUP_SYSROOT:RelPath = RelPath::BUILD.join("rtstartup");
 
-#[must_use]
 fnbuild_sysroot_for_triple(
 dirs:&Dirs,
 compiler:Compiler,
@@ -176,7 +176,6 @@ fn build_sysroot_for_triple(
 }
 }
 
-#[must_use]
 fnbuild_llvm_sysroot_for_triple(compiler:Compiler) -> SysrootTarget{
 let default_sysroot = crate::rustc_info::get_default_sysroot(&compiler.rustc);
 
@@ -210,7 +209,6 @@ fn build_llvm_sysroot_for_triple(compiler: Compiler) -> SysrootTarget {
  target_libs
 }
 
-#[must_use]
 fnbuild_clif_sysroot_for_triple(
 dirs:&Dirs,
 mutcompiler:Compiler,

build_system/prepare.rs

@@ -8,7 +8,7 @@ use crate::build_sysroot::STDLIB_SRC;
 usecrate::path::{Dirs,RelPath};
 usecrate::rustc_info::get_default_sysroot;
 usecrate::utils::{
- copy_dir_recursively,git_command,remove_dir_if_exists, retry_spawn_and_wait, spawn_and_wait,
+ copy_dir_recursively, remove_dir_if_exists, retry_spawn_and_wait, spawn_and_wait,
 };
 
 pub(crate)fnprepare(dirs:&Dirs){
@@ -285,3 +285,22 @@ pub(crate) fn apply_patches(dirs: &Dirs, crate_name: &str, source_dir: &Path, ta
 spawn_and_wait(apply_patch_cmd);
 }
 }
+
+#[must_use]
+fngit_command<'a>(repo_dir:implInto<Option<&'aPath>>,cmd:&str) -> Command{
+letmut git_cmd = Command::new("git");
+ git_cmd
+.arg("-c")
+.arg("user.name=Dummy")
+.arg("-c")
+.arg("user.email=dummy@example.com")
+.arg("-c")
+.arg("core.autocrlf=false")
+.arg("-c")
+.arg("commit.gpgSign=false")
+.arg(cmd);
+ifletSome(repo_dir) = repo_dir.into(){
+ git_cmd.current_dir(repo_dir);
+}
+ git_cmd
+}

build_system/utils.rs

@@ -141,59 +141,6 @@ impl CargoProject {
 }
 }
 
-#[must_use]
-pub(crate)fnhyperfine_command(
-warmup:u64,
-runs:u64,
-prepare:Option<&str>,
-cmds:&[(&str,&str)],
-markdown_export:&Path,
-) -> Command{
-letmut bench = Command::new("hyperfine");
-
- bench.arg("--export-markdown").arg(markdown_export);
-
-if warmup != 0{
- bench.arg("--warmup").arg(warmup.to_string());
-}
-
-if runs != 0{
- bench.arg("--runs").arg(runs.to_string());
-}
-
-ifletSome(prepare) = prepare {
- bench.arg("--prepare").arg(prepare);
-}
-
-for&(name, cmd)in cmds {
-if name != ""{
- bench.arg("-n").arg(name);
-}
- bench.arg(cmd);
-}
-
- bench
-}
-
-#[must_use]
-pub(crate)fngit_command<'a>(repo_dir:implInto<Option<&'aPath>>,cmd:&str) -> Command{
-letmut git_cmd = Command::new("git");
- git_cmd
-.arg("-c")
-.arg("user.name=Dummy")
-.arg("-c")
-.arg("user.email=dummy@example.com")
-.arg("-c")
-.arg("core.autocrlf=false")
-.arg("-c")
-.arg("commit.gpgSign=false")
-.arg(cmd);
-ifletSome(repo_dir) = repo_dir.into(){
- git_cmd.current_dir(repo_dir);
-}
- git_cmd
-}
-
 #[track_caller]
 pub(crate)fntry_hard_link(src:implAsRef<Path>,dst:implAsRef<Path>){
 let src = src.as_ref();