servo: Merge #14397 - Upgrade to cargo 0.16.0-nightly (built 2016-12-06) (from servo:cargoup); r=SimonSapin

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [ ] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: e2d956eb62f35e6646501b058296da33ca96fe00

servo/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

servo/cargo-commit-hash

@@ -0,0 +1 @@
+5e3221eac240f1e2c719524ea3c15fde9329dec2

servo/cargo-nightly-build

@@ -1 +0,0 @@
-2016-10-27

servo/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)

servo/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