Reduce usage of RelPath in build_sysroot

Author: bjorn3

build_system/build_sysroot.rs

@@ -10,10 +10,6 @@ use crate::utils::{
 };
 use crate::{config, CodegenBackend, SysrootKind};
 
-static DIST_DIR: RelPath = RelPath::dist(".");
-static BIN_DIR: RelPath = RelPath::dist("bin");
-static LIB_DIR: RelPath = RelPath::dist("lib");
-
 pub(crate) fn build_sysroot(
     dirs: &Dirs,
     sysroot_kind: SysrootKind,
@@ -28,8 +24,8 @@ pub(crate) fn build_sysroot(
 
     remove_dir_if_exists(&dirs.dist_dir);
     fs::create_dir_all(&dirs.dist_dir).unwrap();
-    fs::create_dir_all(BIN_DIR.to_path(dirs)).unwrap();
-    fs::create_dir_all(LIB_DIR.to_path(dirs)).unwrap();
+    fs::create_dir_all(dirs.dist_dir.join("bin")).unwrap();
+    fs::create_dir_all(dirs.dist_dir.join("lib")).unwrap();
 
     let is_native = bootstrap_host_compiler.triple == target_triple;
 
@@ -39,11 +35,10 @@ pub(crate) fn build_sysroot(
             let cg_clif_dylib_path = if cfg!(windows) {
                 // Windows doesn't have rpath support, so the cg_clif dylib needs to be next to the
                 // binaries.
-                BIN_DIR
+                dirs.dist_dir.join("bin")
             } else {
-                LIB_DIR
+                dirs.dist_dir.join("lib")
             }
-            .to_path(dirs)
             .join(src_path.file_name().unwrap());
             try_hard_link(src_path, &cg_clif_dylib_path);
             CodegenBackend::Local(cg_clif_dylib_path)
@@ -57,7 +52,7 @@ pub(crate) fn build_sysroot(
         let wrapper_name = wrapper_base_name.replace("____", wrapper);
 
         let mut build_cargo_wrapper_cmd = Command::new(&bootstrap_host_compiler.rustc);
-        let wrapper_path = DIST_DIR.to_path(dirs).join(&wrapper_name);
+        let wrapper_path = dirs.dist_dir.join(&wrapper_name);
         build_cargo_wrapper_cmd
             .arg(dirs.source_dir.join("scripts").join(&format!("{wrapper}.rs")))
             .arg("-o")
@@ -80,7 +75,7 @@ pub(crate) fn build_sysroot(
             build_cargo_wrapper_cmd.env("BUILTIN_BACKEND", name);
         }
         spawn_and_wait(build_cargo_wrapper_cmd);
-        try_hard_link(wrapper_path, BIN_DIR.to_path(dirs).join(wrapper_name));
+        try_hard_link(wrapper_path, dirs.dist_dir.join("bin").join(wrapper_name));
     }
 
     let host = build_sysroot_for_triple(
@@ -89,7 +84,7 @@ pub(crate) fn build_sysroot(
         &cg_clif_dylib_path,
         sysroot_kind,
     );
-    host.install_into_sysroot(&DIST_DIR.to_path(dirs));
+    host.install_into_sysroot(&dirs.dist_dir);
 
     if !is_native {
         build_sysroot_for_triple(
@@ -103,20 +98,19 @@ pub(crate) fn build_sysroot(
             &cg_clif_dylib_path,
             sysroot_kind,
         )
-        .install_into_sysroot(&DIST_DIR.to_path(dirs));
+        .install_into_sysroot(&dirs.dist_dir);
     }
 
     // Copy std for the host to the lib dir. This is necessary for the jit mode to find
     // libstd.
     for lib in host.libs {
         let filename = lib.file_name().unwrap().to_str().unwrap();
         if filename.contains("std-") && !filename.contains(".rlib") {
-            try_hard_link(&lib, LIB_DIR.to_path(dirs).join(lib.file_name().unwrap()));
+            try_hard_link(&lib, dirs.dist_dir.join("lib").join(lib.file_name().unwrap()));
         }
     }
 
     let mut target_compiler = {
-        let dirs: &Dirs = &dirs;
         let rustc_clif = dirs.dist_dir.join(wrapper_base_name.replace("____", "rustc-clif"));
         let rustdoc_clif = dirs.dist_dir.join(wrapper_base_name.replace("____", "rustdoc-clif"));
 

build_system/path.rs

@@ -18,7 +18,6 @@ pub(crate) enum PathBase {
     Source,
     Download,
     Build,
-    Dist,
 }
 
 impl PathBase {
@@ -27,7 +26,6 @@ impl PathBase {
             PathBase::Source => dirs.source_dir.clone(),
             PathBase::Download => dirs.download_dir.clone(),
             PathBase::Build => dirs.build_dir.clone(),
-            PathBase::Dist => dirs.dist_dir.clone(),
         }
     }
 }
@@ -51,10 +49,6 @@ impl RelPath {
         RelPath { base: PathBase::Build, suffix }
     }
 
-    pub(crate) const fn dist(suffix: &'static str) -> RelPath {
-        RelPath { base: PathBase::Dist, suffix }
-    }
-
     pub(crate) fn to_path(&self, dirs: &Dirs) -> PathBuf {
         self.base.to_path(dirs).join(self.suffix)
     }