about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorJoshua Nelson <jnelson@cloudflare.com>2022-05-27 17:58:32 -0500
committerJoshua Nelson <jnelson@cloudflare.com>2022-06-07 09:24:14 -0500
commit27b95016d45cd1c0dcaef014373d4bb04d5d30ef (patch)
tree68031449f3871a6bcad1e5a2b89534c1f3fc31b3 /src
parent7fe2c4b00dfbc33643e1af4b293eb057306a8339 (diff)
downloadrust-27b95016d45cd1c0dcaef014373d4bb04d5d30ef.tar.gz
rust-27b95016d45cd1c0dcaef014373d4bb04d5d30ef.zip
Rename `download_component` -> `download_ci_component`
It was confusing to have two functions with the same name but different behavior.
Diffstat (limited to 'src')
-rw-r--r--src/bootstrap/config.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
index 6cb0bd518e2..147a4a38c9c 100644
--- a/src/bootstrap/config.rs
+++ b/src/bootstrap/config.rs
@@ -1459,12 +1459,12 @@ fn download_ci_rustc(builder: &Builder<'_>, commit: &str) {
         }
         let filename = format!("rust-std-{CHANNEL}-{host}.tar.xz");
         let pattern = format!("rust-std-{host}");
-        download_component(builder, filename, &pattern, commit);
+        download_ci_component(builder, filename, &pattern, commit);
         let filename = format!("rustc-{CHANNEL}-{host}.tar.xz");
-        download_component(builder, filename, "rustc", commit);
+        download_ci_component(builder, filename, "rustc", commit);
         // download-rustc doesn't need its own cargo, it can just use beta's.
         let filename = format!("rustc-dev-{CHANNEL}-{host}.tar.xz");
-        download_component(builder, filename, "rustc-dev", commit);
+        download_ci_component(builder, filename, "rustc-dev", commit);
 
         builder.fix_bin_or_dylib(&bin_root.join("bin").join("rustc"));
         builder.fix_bin_or_dylib(&bin_root.join("bin").join("rustdoc"));
@@ -1481,7 +1481,7 @@ fn download_ci_rustc(builder: &Builder<'_>, commit: &str) {
 
 /// Download a single component of a CI-built toolchain (not necessarily a published nightly).
 // NOTE: intentionally takes an owned string to avoid downloading multiple times by accident
-fn download_component(builder: &Builder<'_>, filename: String, prefix: &str, commit: &str) {
+fn download_ci_component(builder: &Builder<'_>, filename: String, prefix: &str, commit: &str) {
     let cache_dst = builder.out.join("cache");
     let rustc_cache = cache_dst.join(commit);
     if !rustc_cache.exists() {