Skip to content

Commit 1c0c2c3

Browse files
KobzolKobzol
committed
Implement AsRef<Path> for TargetSelection 
1 parent 0cfbfa9 commit 1c0c2c3

File tree

9 files changed

+57
-61
lines changed

9 files changed

+57
-61
lines changed

‎src/bootstrap/src/core/build_steps/clean.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ fn clean(build: &Build, all: bool, stage: Option<u32>) {
121121

122122
fn clean_specific_stage(build: &Build, stage: u32) {
123123
for host in &build.hosts {
124-
let entries = match build.out.join(host.triple).read_dir() {
124+
let entries = match build.out.join(host).read_dir() {
125125
Ok(iter) => iter,
126126
Err(_) => continue,
127127
};
@@ -148,7 +148,7 @@ fn clean_default(build: &Build) {
148148
rm_rf(&build.out.join("bootstrap-shims-dump"));
149149
rm_rf(&build.out.join("rustfmt.stamp"));
150150

151-
let mut hosts: Vec<_> = build.hosts.iter().map(|t| build.out.join(t.triple)).collect();
151+
let mut hosts: Vec<_> = build.hosts.iter().map(|t| build.out.join(t)).collect();
152152
// After cross-compilation, artifacts of the host architecture (which may differ from build.host)
153153
// might not get removed.
154154
// Adding its path (linked one for easier accessibility) will solve this problem.

‎src/bootstrap/src/core/build_steps/compile.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ impl Step for Std {
246246
.rustc_snapshot_sysroot()
247247
.join("lib")
248248
.join("rustlib")
249-
.join(compiler.host.triple)
249+
.join(compiler.host)
250250
.join("bin");
251251
if src_sysroot_bin.exists() {
252252
let target_sysroot_bin =
@@ -651,8 +651,8 @@ impl Step for StdLink {
651651
compiler: self.compiler,
652652
force_recompile: self.force_recompile,
653653
});
654-
let libdir = sysroot.join(lib).join("rustlib").join(target.triple).join("lib");
655-
let hostdir = sysroot.join(lib).join("rustlib").join(compiler.host.triple).join("lib");
654+
let libdir = sysroot.join(lib).join("rustlib").join(target).join("lib");
655+
let hostdir = sysroot.join(lib).join("rustlib").join(compiler.host).join("lib");
656656
(libdir, hostdir)
657657
} else {
658658
let libdir = builder.sysroot_libdir(target_compiler, target);
@@ -670,12 +670,12 @@ impl Step for StdLink {
670670
.build
671671
.config
672672
.initial_rustc
673-
.starts_with(builder.out.join(compiler.host.triple).join("stage0/bin"))
673+
.starts_with(builder.out.join(compiler.host).join("stage0/bin"))
674674
{
675675
// Copy bin files from stage0/bin to stage0-sysroot/bin
676-
let sysroot = builder.out.join(compiler.host.triple).join("stage0-sysroot");
676+
let sysroot = builder.out.join(compiler.host).join("stage0-sysroot");
677677

678-
let host = compiler.host.triple;
678+
let host = compiler.host;
679679
let stage0_bin_dir = builder.out.join(host).join("stage0/bin");
680680
let sysroot_bin_dir = sysroot.join("bin");
681681
t!(fs::create_dir_all(&sysroot_bin_dir));
@@ -1554,7 +1554,7 @@ impl Step for Sysroot {
15541554
/// For all other stages, it's the same stage directory that the compiler lives in.
15551555
fn run(self, builder: &Builder<'_>) -> PathBuf {
15561556
let compiler = self.compiler;
1557-
let host_dir = builder.out.join(compiler.host.triple);
1557+
let host_dir = builder.out.join(compiler.host);
15581558

15591559
let sysroot_dir = |stage| {
15601560
if stage == 0 {

‎src/bootstrap/src/core/build_steps/dist.rs

+8-16
Original file line numberDiff line numberDiff line change
@@ -275,12 +275,8 @@ fn make_win_dist(
275275
}
276276

277277
//Copy platform tools to platform-specific bin directory
278-
let target_bin_dir = plat_root
279-
.join("lib")
280-
.join("rustlib")
281-
.join(target.triple)
282-
.join("bin")
283-
.join("self-contained");
278+
let target_bin_dir =
279+
plat_root.join("lib").join("rustlib").join(target).join("bin").join("self-contained");
284280
fs::create_dir_all(&target_bin_dir).expect("creating target_bin_dir failed");
285281
for src in target_tools {
286282
builder.copy_link_to_folder(&src, &target_bin_dir);
@@ -295,12 +291,8 @@ fn make_win_dist(
295291
);
296292

297293
//Copy platform libs to platform-specific lib directory
298-
let target_lib_dir = plat_root
299-
.join("lib")
300-
.join("rustlib")
301-
.join(target.triple)
302-
.join("lib")
303-
.join("self-contained");
294+
let target_lib_dir =
295+
plat_root.join("lib").join("rustlib").join(target).join("lib").join("self-contained");
304296
fs::create_dir_all(&target_lib_dir).expect("creating target_lib_dir failed");
305297
for src in target_libs {
306298
builder.copy_link_to_folder(&src, &target_lib_dir);
@@ -450,7 +442,7 @@ impl Step for Rustc {
450442
// component for now.
451443
maybe_install_llvm_runtime(builder, host, image);
452444

453-
let dst_dir = image.join("lib/rustlib").join(&*host.triple).join("bin");
445+
let dst_dir = image.join("lib/rustlib").join(host).join("bin");
454446
t!(fs::create_dir_all(&dst_dir));
455447

456448
// Copy over lld if it's there
@@ -607,7 +599,7 @@ fn verify_uefi_rlib_format(builder: &Builder<'_>, target: TargetSelection, stamp
607599

608600
/// Copy stamped files into an image's `target/lib` directory.
609601
fn copy_target_libs(builder: &Builder<'_>, target: TargetSelection, image: &Path, stamp: &Path) {
610-
let dst = image.join("lib/rustlib").join(target.triple).join("lib");
602+
let dst = image.join("lib/rustlib").join(target).join("lib");
611603
let self_contained_dst = dst.join("self-contained");
612604
t!(fs::create_dir_all(&dst));
613605
t!(fs::create_dir_all(&self_contained_dst));
@@ -769,7 +761,7 @@ impl Step for Analysis {
769761

770762
let src = builder
771763
.stage_out(compiler, Mode::Std)
772-
.join(target.triple)
764+
.join(target)
773765
.join(builder.cargo_dir())
774766
.join("deps")
775767
.join("save-analysis");
@@ -2087,7 +2079,7 @@ fn maybe_install_llvm(
20872079

20882080
/// Maybe add libLLVM.so to the target lib-dir for linking.
20892081
pub fn maybe_install_llvm_target(builder: &Builder<'_>, target: TargetSelection, sysroot: &Path) {
2090-
let dst_libdir = sysroot.join("lib/rustlib").join(&*target.triple).join("lib");
2082+
let dst_libdir = sysroot.join("lib/rustlib").join(target).join("lib");
20912083
// We do not need to copy LLVM files into the sysroot if it is not
20922084
// dynamically linked; it is already included into librustc_llvm
20932085
// statically.

‎src/bootstrap/src/core/build_steps/doc.rs

+4-5
Original file line numberDiff line numberDiff line change
@@ -699,13 +699,12 @@ fn doc_std(
699699
let compiler = builder.compiler(stage, builder.config.build);
700700

701701
let target_doc_dir_name = if format == DocumentationFormat::Json { "json-doc" } else { "doc" };
702-
let target_dir =
703-
builder.stage_out(compiler, Mode::Std).join(target.triple).join(target_doc_dir_name);
702+
let target_dir = builder.stage_out(compiler, Mode::Std).join(target).join(target_doc_dir_name);
704703

705704
// This is directory where the compiler will place the output of the command.
706705
// We will then copy the files from this directory into the final `out` directory, the specified
707706
// as a function parameter.
708-
let out_dir = target_dir.join(target.triple).join("doc");
707+
let out_dir = target_dir.join(target).join("doc");
709708

710709
let mut cargo =
711710
builder::Cargo::new(builder, compiler, Mode::Std, SourceType::InTree, target, Kind::Doc);
@@ -846,7 +845,7 @@ impl Step for Rustc {
846845

847846
let mut to_open = None;
848847

849-
let out_dir = builder.stage_out(compiler, Mode::Rustc).join(target.triple).join("doc");
848+
let out_dir = builder.stage_out(compiler, Mode::Rustc).join(target).join("doc");
850849
for krate in &*self.crates {
851850
// Create all crate output directories first to make sure rustdoc uses
852851
// relative links.
@@ -992,7 +991,7 @@ macro_rules! tool_doc {
992991
// see https://github.com/rust-lang/rust/pull/122066#issuecomment-1983049222
993992
// cargo.rustdocflag("--generate-link-to-definition");
994993

995-
let out_dir = builder.stage_out(compiler, Mode::ToolRustc).join(target.triple).join("doc");
994+
let out_dir = builder.stage_out(compiler, Mode::ToolRustc).join(target).join("doc");
996995
$(for krate in $crates {
997996
let dir_name = krate.replace("-", "_");
998997
t!(fs::create_dir_all(out_dir.join(&*dir_name)));

‎src/bootstrap/src/core/build_steps/test.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ You can skip linkcheck with --skip src/tools/linkchecker"
149149
let _guard =
150150
builder.msg(Kind::Test, compiler.stage, "Linkcheck", bootstrap_host, bootstrap_host);
151151
let _time = helpers::timeit(builder);
152-
linkchecker.delay_failure().arg(builder.out.join(host.triple).join("doc")).run(builder);
152+
linkchecker.delay_failure().arg(builder.out.join(host).join("doc")).run(builder);
153153
}
154154

155155
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
@@ -435,7 +435,7 @@ impl Miri {
435435
compiler: Compiler,
436436
target: TargetSelection,
437437
) -> PathBuf {
438-
let miri_sysroot = builder.out.join(compiler.host.triple).join("miri-sysroot");
438+
let miri_sysroot = builder.out.join(compiler.host).join("miri-sysroot");
439439
let mut cargo = builder::Cargo::new(
440440
builder,
441441
compiler,
@@ -1115,7 +1115,7 @@ HELP: to skip test's attempt to check tidiness, pass `--skip src/tools/tidy` to
11151115
}
11161116

11171117
fn testdir(builder: &Builder<'_>, host: TargetSelection) -> PathBuf {
1118-
builder.out.join(host.triple).join("test")
1118+
builder.out.join(host).join("test")
11191119
}
11201120

11211121
macro_rules! default_test {
@@ -2685,7 +2685,7 @@ impl Step for Crate {
26852685
if builder.download_rustc() && compiler.stage > 0 {
26862686
let sysroot = builder
26872687
.out
2688-
.join(compiler.host.triple)
2688+
.join(compiler.host)
26892689
.join(format!("stage{}-test-sysroot", compiler.stage));
26902690
cargo.env("RUSTC_SYSROOT", sysroot);
26912691
}

‎src/bootstrap/src/core/builder.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1171,7 +1171,7 @@ impl<'a> Builder<'a> {
11711171
.sysroot(self.compiler)
11721172
.join(lib)
11731173
.join("rustlib")
1174-
.join(self.target.triple)
1174+
.join(self.target)
11751175
.join("lib");
11761176
// Avoid deleting the rustlib/ directory we just copied
11771177
// (in `impl Step for Sysroot`).
@@ -1254,7 +1254,7 @@ impl<'a> Builder<'a> {
12541254

12551255
// Ensure that the downloaded LLVM libraries can be found.
12561256
if self.config.llvm_from_ci {
1257-
let ci_llvm_lib = self.out.join(&*compiler.host.triple).join("ci-llvm").join("lib");
1257+
let ci_llvm_lib = self.out.join(compiler.host).join("ci-llvm").join("lib");
12581258
dylib_dirs.push(ci_llvm_lib);
12591259
}
12601260

@@ -1504,9 +1504,9 @@ impl<'a> Builder<'a> {
15041504
Mode::Rustc | Mode::ToolRustc => self.compiler_doc_out(target),
15051505
Mode::Std => {
15061506
if self.config.cmd.json() {
1507-
out_dir.join(target.triple).join("json-doc")
1507+
out_dir.join(target).join("json-doc")
15081508
} else {
1509-
out_dir.join(target.triple).join("doc")
1509+
out_dir.join(target).join("doc")
15101510
}
15111511
}
15121512
_ => panic!("doc mode {mode:?} not expected"),

‎src/bootstrap/src/core/config/config.rs

+12-4
Original file line numberDiff line numberDiff line change
@@ -546,6 +546,14 @@ impl PartialEq<&str> for TargetSelection {
546546
}
547547
}
548548

549+
// Targets are often used as directory names throughout bootstrap.
550+
// This impl makes it more ergonomics to use them as such.
551+
impl AsRef<Path> for TargetSelection {
552+
fn as_ref(&self) -> &Path {
553+
self.triple.as_ref()
554+
}
555+
}
556+
549557
/// Per-target configuration stored in the global configuration structure.
550558
#[derive(Debug, Default, Clone, PartialEq, Eq)]
551559
pub struct Target {
@@ -1473,7 +1481,7 @@ impl Config {
14731481
config.download_beta_toolchain();
14741482
config
14751483
.out
1476-
.join(config.build.triple)
1484+
.join(config.build)
14771485
.join("stage0")
14781486
.join("bin")
14791487
.join(exe("rustc", config.build))
@@ -1488,7 +1496,7 @@ impl Config {
14881496
config.download_beta_toolchain();
14891497
config
14901498
.out
1491-
.join(config.build.triple)
1499+
.join(config.build)
14921500
.join("stage0")
14931501
.join("bin")
14941502
.join(exe("cargo", config.build))
@@ -2281,13 +2289,13 @@ impl Config {
22812289
/// The absolute path to the downloaded LLVM artifacts.
22822290
pub(crate) fn ci_llvm_root(&self) -> PathBuf {
22832291
assert!(self.llvm_from_ci);
2284-
self.out.join(&*self.build.triple).join("ci-llvm")
2292+
self.out.join(self.build).join("ci-llvm")
22852293
}
22862294

22872295
/// Directory where the extracted `rustc-dev` component is stored.
22882296
pub(crate) fn ci_rustc_dir(&self) -> PathBuf {
22892297
assert!(self.download_rustc());
2290-
self.out.join(self.build.triple).join("ci-rustc")
2298+
self.out.join(self.build).join("ci-rustc")
22912299
}
22922300

22932301
/// Determine whether llvm should be linked dynamically.

‎src/bootstrap/src/core/download.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ impl Config {
379379
let version = &self.stage0_metadata.compiler.version;
380380
let host = self.build;
381381

382-
let bin_root = self.out.join(host.triple).join("stage0");
382+
let bin_root = self.out.join(host).join("stage0");
383383
let clippy_stamp = bin_root.join(".clippy-stamp");
384384
let cargo_clippy = bin_root.join("bin").join(exe("cargo-clippy", host));
385385
if cargo_clippy.exists() && !program_out_of_date(&clippy_stamp, date) {
@@ -412,7 +412,7 @@ impl Config {
412412
let channel = format!("{version}-{date}");
413413

414414
let host = self.build;
415-
let bin_root = self.out.join(host.triple).join("rustfmt");
415+
let bin_root = self.out.join(host).join("rustfmt");
416416
let rustfmt_path = bin_root.join("bin").join(exe("rustfmt", host));
417417
let rustfmt_stamp = bin_root.join(".rustfmt-stamp");
418418
if rustfmt_path.exists() && !program_out_of_date(&rustfmt_stamp, &channel) {
@@ -519,7 +519,7 @@ impl Config {
519519
extra_components: &[&str],
520520
download_component: fn(&Config, String, &str, &str),
521521
) {
522-
let host = self.build.triple;
522+
let host = self.build;
523523
let bin_root = self.out.join(host).join(sysroot);
524524
let rustc_stamp = bin_root.join(".rustc-stamp");
525525

@@ -592,7 +592,7 @@ impl Config {
592592
t!(fs::create_dir_all(&cache_dir));
593593
}
594594

595-
let bin_root = self.out.join(self.build.triple).join(destination);
595+
let bin_root = self.out.join(self.build).join(destination);
596596
let tarball = cache_dir.join(&filename);
597597
let (base_url, url, should_verify) = match mode {
598598
DownloadSource::CI => {

0 commit comments

Comments
 (0)