Skip to content

Commit 27b9501

Browse files
committed
Rename download_component -> download_ci_component
It was confusing to have two functions with the same name but different behavior.
1 parent 7fe2c4b commit 27b9501

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/bootstrap/config.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1459,12 +1459,12 @@ fn download_ci_rustc(builder: &Builder<'_>, commit: &str) {
14591459
}
14601460
let filename = format!("rust-std-{CHANNEL}-{host}.tar.xz");
14611461
let pattern = format!("rust-std-{host}");
1462-
download_component(builder, filename, &pattern, commit);
1462+
download_ci_component(builder, filename, &pattern, commit);
14631463
let filename = format!("rustc-{CHANNEL}-{host}.tar.xz");
1464-
download_component(builder, filename, "rustc", commit);
1464+
download_ci_component(builder, filename, "rustc", commit);
14651465
// download-rustc doesn't need its own cargo, it can just use beta's.
14661466
let filename = format!("rustc-dev-{CHANNEL}-{host}.tar.xz");
1467-
download_component(builder, filename, "rustc-dev", commit);
1467+
download_ci_component(builder, filename, "rustc-dev", commit);
14681468

14691469
builder.fix_bin_or_dylib(&bin_root.join("bin").join("rustc"));
14701470
builder.fix_bin_or_dylib(&bin_root.join("bin").join("rustdoc"));
@@ -1481,7 +1481,7 @@ fn download_ci_rustc(builder: &Builder<'_>, commit: &str) {
14811481

14821482
/// Download a single component of a CI-built toolchain (not necessarily a published nightly).
14831483
// NOTE: intentionally takes an owned string to avoid downloading multiple times by accident
1484-
fn download_component(builder: &Builder<'_>, filename: String, prefix: &str, commit: &str) {
1484+
fn download_ci_component(builder: &Builder<'_>, filename: String, prefix: &str, commit: &str) {
14851485
let cache_dst = builder.out.join("cache");
14861486
let rustc_cache = cache_dst.join(commit);
14871487
if !rustc_cache.exists() {

0 commit comments

Comments
 (0)