rustup can't update nightly

[durka]

There seems to be a malformed URL in the rustup manifest since 1.27 got released today.

durska:rust alex$ rustup self update
info: checking for self-updates
durska:rust alex$ rustup update
info: syncing channel updates for 'stable-x86_64-apple-darwin'
info: syncing channel updates for 'beta-x86_64-apple-darwin'
info: syncing channel updates for 'nightly-x86_64-apple-darwin'
info: latest update on 2018-06-22, rust version 1.28.0-nightly (662c70a59 2018-06-21)
info: downloading component 'rustc'
error: failed to parse url: 1.28.0-nightly (662c70a59 2018-06-21)/2018-06-22/rustc-nightly-x86_64-apple-darwin.tar.xz
info: checking for self-updates

       stable-x86_64-apple-darwin unchanged - rustc 1.27.0 (3eda71b00 2018-06-19)
         beta-x86_64-apple-darwin unchanged - rustc 1.28.0-beta.1 (8e6052e77 2018-06-21)
  nightly-x86_64-apple-darwin update failed - rustc 1.28.0-nightly (990d8aa74 2018-05-25)

durska:rust alex$

[ishitatsuyuki]

Related to #51680?

[nrc]

This is causing problems on Travis too, see for example rustfmt

[Havvy]

This affects the mozilla overlay for nixpkgs as well, since that uses the same URLs.

[mati865]

Comparison of nightly and stable metadata for rustup:

# channel-rust-nightly.toml
[pkg.cargo.target.x86_64-unknown-linux-gnu]
available = true
url = "1.28.0-nightly (662c70a59 2018-06-21)/2018-06-22/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz"
hash = "039fc11d15fab9951061ee25991708659f6a3900d58fcd0a3db9e6f8b4987d51"
xz_url = "1.28.0-nightly (662c70a59 2018-06-21)/2018-06-22/cargo-nightly-x86_64-unknown-linux-gnu.tar.xz"
xz_hash = "27613570b55d12e7f3b66cf5296a41c8d7a8ee1c95cce7f9cfedee3f201b1e11"

# channel-rust-stable.toml
[pkg.cargo.target.x86_64-unknown-linux-gnu]
available = true
url = "https://static.rust-lang.org/dist/2018-06-21/cargo-0.28.0-x86_64-unknown-linux-gnu.tar.gz"
hash = "3612ae45bf4504836810a74e6cef177358fce7219794013536c354bbd6ee61ef"
xz_url = "https://static.rust-lang.org/dist/2018-06-21/cargo-0.28.0-x86_64-unknown-linux-gnu.tar.xz"
xz_hash = "386ba6e3c0a2b1718fe0487d03f96e1ad12796cfb44813dfc22c5be54657e7a4"

Somehow https://static.rust-lang.org/dist got replaced by 1.28.0-nightly (662c70a59 2018-06-21) for latest nightly, other things seem fine.
Opening https://static.rust-lang.org/dist/2018-06-22/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz in the browser starts downloading of the archive.

[kennytm]

Regression caused by #50336.

diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index 9092deeac461..73cda4b436d4 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -1756,6 +1740,7 @@ impl Step for HashSign {
         cmd.arg(builder.package_vers(&builder.release_num("cargo")));
         cmd.arg(builder.package_vers(&builder.release_num("rls")));
         cmd.arg(builder.package_vers(&builder.release_num("rustfmt")));
+        cmd.arg(builder.llvm_tools_vers());
         cmd.arg(addr);
 
         builder.create_dir(&distdir(builder));

[mati865]

@kennytm you were few minutes faster.
build-manifest tool doesn't expect additional argument:

rust/src/tools/build-manifest/src/main.rs

Lines 178 to 179 in 8d22af8

	let rls_release = args.next().unwrap();
	let s3_address = args.next().unwrap();

Btw rustfmt arg isn't there as well 😕 Forget about it, old commit

[kennytm]

@mati865 You're looking at an old commit 😄

rust/src/tools/build-manifest/src/main.rs

Lines 213 to 215 in 4b17d31

	let rls_release = args.next().unwrap();
	let rustfmt_release = args.next().unwrap();
	let s3_address = args.next().unwrap();

[mati865]

@kennytm Oops, commit from 27 Jul 2017.
Probably I should've had a bit more sleep 😒