From a0c13dda413dffb4d411aec6fa4d0e28b4230e75 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Fri, 14 Jul 2017 09:41:32 +0200 Subject: [PATCH 1/2] Upgrade to rustc 1.20.0-nightly (ab91c70cc 2017-07-14) --- rust-commit-hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-commit-hash b/rust-commit-hash index f674e43611d..554733c2dc5 100644 --- a/rust-commit-hash +++ b/rust-commit-hash @@ -1 +1 @@ -f85579d4a2c342654f9b158fafd565eb159fdb59 +ab91c70cc69450bc69b76df0fd2faa82bda42d6b From 7d68a5aeafeac3e25ef4e3d71b0dab084417a7a2 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Fri, 14 Jul 2017 09:36:54 +0200 Subject: [PATCH 2/2] Revert "Fetch "alt" rust std build when we do so for rustc" This reverts commit 6b523302e1159a4b89223d2e47f053e67240cf35. This is unnecessary now that https://github.com/rust-lang/rust/issues/42967 is fixed by https://github.com/rust-lang/rust/pull/43167. This migth be a fix for https://github.com/servo/servo/pull/17604 --- python/servo/bootstrap_commands.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/python/servo/bootstrap_commands.py b/python/servo/bootstrap_commands.py index 7f0be395d73..ceab1907f46 100644 --- a/python/servo/bootstrap_commands.py +++ b/python/servo/bootstrap_commands.py @@ -135,11 +135,8 @@ class MachCommands(CommandBase): % (version, target_triple)) tgz_file = install_dir + ('rust-std-%s-%s.tar.gz' % (version, target_triple)) else: - tarball = "%s/rust-std-nightly-%s.tar.gz" % (version, target_triple) - base_url = "https://s3.amazonaws.com/rust-lang-ci/rustc-builds" - if not self.config["build"]["llvm-assertions"]: - base_url += "-alt" - std_url = base_url + "/" + tarball + std_url = ("https://s3.amazonaws.com/rust-lang-ci/rustc-builds/%s/rust-std-nightly-%s.tar.gz" + % (version, target_triple)) tgz_file = install_dir + ('rust-std-nightly-%s.tar.gz' % target_triple) download_file("Host rust library for target %s" % target_triple, std_url, tgz_file)