servo: Merge #17727 - Upgrade to rustc 1.20.0-nightly (ab91c70cc 2017-07-14), use non-"alt" std (from servo:rustup); r=nox
authorSimon Sapin <simon.sapin@exyr.org>
Mon, 17 Jul 2017 05:06:01 -0700
changeset 420279 8321474ca566ca5c3a7b137b16baccb97d9efe5a
parent 420278 6fa1a719ca7426c540b9ced88f7a0469d914fa90
child 420280 86ee390b7596064015f8bbc53250ec08097eb1d9
push id1517
push userjlorenzo@mozilla.com
push dateThu, 14 Sep 2017 16:50:54 +0000
treeherdermozilla-release@3b41fd564418 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnox
milestone56.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
servo: Merge #17727 - Upgrade to rustc 1.20.0-nightly (ab91c70cc 2017-07-14), use non-"alt" std (from servo:rustup); r=nox <s>Possibly</s> fixes https://github.com/servo/servo/pull/17604 Source-Repo: https://github.com/servo/servo Source-Revision: 9d30e5b4e0fe9ccdfcd47d5134b5fbfba2e68096
servo/python/servo/bootstrap_commands.py
servo/rust-commit-hash
--- a/servo/python/servo/bootstrap_commands.py
+++ b/servo/python/servo/bootstrap_commands.py
@@ -130,21 +130,18 @@ class MachCommands(CommandBase):
                 print("Use |bootstrap-rust --force| to download again.")
                 continue
 
             if self.use_stable_rust():
                 std_url = ("https://static-rust-lang-org.s3.amazonaws.com/dist/rust-std-%s-%s.tar.gz"
                            % (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)
             print("Extracting Rust stdlib for target %s..." % target_triple)
             extract(tgz_file, install_dir)
             shutil.copytree(path.join(install_dir,
                                       "rust-std%s%s-%s" % (nightly_suffix, stable_version, target_triple),
                                       "rust-std-%s" % target_triple, "lib", "rustlib", target_triple),
--- a/servo/rust-commit-hash
+++ b/servo/rust-commit-hash
@@ -1,1 +1,1 @@
-f85579d4a2c342654f9b158fafd565eb159fdb59
+ab91c70cc69450bc69b76df0fd2faa82bda42d6b