From f5af40d6942ac903ff3b849ab590c8164367bb10 Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Mon, 28 Nov 2016 20:24:08 +0100
Subject: [PATCH] Upgrade to cargo 0.16.0-nightly (built 2016-12-06)

Instead of once per day (or night) with a date in the URL,
Cargo binaries are now built and published for every merge to master
(with the merge commit hash in the URL).
---
 appveyor.yml                       | 4 ++--
 cargo-commit-hash                  | 1 +
 cargo-nightly-build                | 1 -
 python/servo/bootstrap_commands.py | 2 +-
 python/servo/command_base.py       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 cargo-commit-hash
 delete mode 100644 cargo-nightly-build

diff --git a/appveyor.yml b/appveyor.yml
index 109c8aca897..7955a4fadf6 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -39,8 +39,8 @@ platform:
   - x64
 
 cache:
-  - .servo -> rust-nightly-date, cargo-nightly-build
-  - .cargo -> rust-nightly-date, cargo-nightly-build
+  - .servo -> rust-nightly-date, cargo-commit-hash
+  - .cargo -> rust-nightly-date, cargo-commit-hash
 
 install:
   - if %TARGET:*-msvc=msvc%==msvc set BUILD_ENV=msvc
diff --git a/cargo-commit-hash b/cargo-commit-hash
new file mode 100644
index 00000000000..8092107d38a
--- /dev/null
+++ b/cargo-commit-hash
@@ -0,0 +1 @@
+5e3221eac240f1e2c719524ea3c15fde9329dec2
diff --git a/cargo-nightly-build b/cargo-nightly-build
deleted file mode 100644
index 759d0344f7b..00000000000
--- a/cargo-nightly-build
+++ /dev/null
@@ -1 +0,0 @@
-2016-10-27
diff --git a/python/servo/bootstrap_commands.py b/python/servo/bootstrap_commands.py
index 8df02304529..9bc7c60fd4a 100644
--- a/python/servo/bootstrap_commands.py
+++ b/python/servo/bootstrap_commands.py
@@ -295,7 +295,7 @@ class MachCommands(CommandBase):
         os.makedirs(cargo_dir)
 
         tgz_file = "cargo-nightly-%s.tar.gz" % host_triple()
-        nightly_url = "https://static-rust-lang-org.s3.amazonaws.com/cargo-dist/%s/%s" % \
+        nightly_url = "https://s3.amazonaws.com/rust-lang-ci/cargo-builds/%s/%s" % \
             (self.cargo_build_id(), tgz_file)
 
         download_file("Cargo nightly", nightly_url, tgz_file)
diff --git a/python/servo/command_base.py b/python/servo/command_base.py
index f43e4917dd3..9fc797b28f9 100644
--- a/python/servo/command_base.py
+++ b/python/servo/command_base.py
@@ -336,7 +336,7 @@ class CommandBase(object):
 
     def cargo_build_id(self):
         if self._cargo_build_id is None:
-            filename = path.join(self.context.topdir, "cargo-nightly-build")
+            filename = path.join(self.context.topdir, "cargo-commit-hash")
             with open(filename) as f:
                 self._cargo_build_id = f.read().strip()
         return self._cargo_build_id