diff options
| author | bors <bors@rust-lang.org> | 2022-11-02 14:35:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-11-02 14:35:54 +0000 |
| commit | 897e37553bba8b42751c67658967889d11ecd120 (patch) | |
| tree | aa32c4b4e49c517ab2a0bdbc845fcdb0ac2ad617 /src/bootstrap/native.rs | |
| parent | d939e5a3e5eb34dd1e828b9ad244ee6e6a0a989b (diff) | |
| parent | 3100c850b0b33cd65e066b91e0a898ff1d633bc7 (diff) | |
| download | rust-1.65.0.tar.gz rust-1.65.0.zip | |
Auto merge of #103859 - Mark-Simulacrum:stable-next, r=flip1995 1.65.0
[stable] Lower lint level for READ_ZERO_BYTE_VEC This avoids reporting false-positives; see rust-lang/rust-clippy#9274 for details. cc `@rust-lang/clippy` -- do we want a direct change landed on stable here? If so, please r+ this PR, otherwise we can just close it. Would appreciate confirmation this is the right change to make as well. cc `@joshtriplett` -- filing due to https://rust-lang.zulipchat.com/#narrow/stream/301329-t-devtools/topic/clippy.20false.20positive
Diffstat (limited to 'src/bootstrap/native.rs')
| -rw-r--r-- | src/bootstrap/native.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs index 62b56994afe..fc3bfaf1b9f 100644 --- a/src/bootstrap/native.rs +++ b/src/bootstrap/native.rs @@ -260,8 +260,8 @@ fn download_ci_llvm(builder: &Builder<'_>, llvm_sha: &str) { } else { &builder.config.stage0_metadata.config.artifacts_server }; - let channel = builder.config.artifact_channel(llvm_sha); - let filename = format!("rust-dev-{}-{}.tar.xz", channel, builder.build.build.triple); + let version = builder.config.artifact_version_part(llvm_sha); + let filename = format!("rust-dev-{}-{}.tar.xz", version, builder.build.build.triple); let tarball = rustc_cache.join(&filename); if !tarball.exists() { let help_on_error = "error: failed to download llvm from ci |