Auto merge of #17780 - servo:cargoup, r=nox,SimonSapin

Update to cargo 0.21.0-nightly (eb6cf012a 2017-07-02)

Cargo binaries are now produced on Rust’s CI, not Cargo’s. Remove cargo-commit-hash and find Cargo based on rust-commit-hash.

Unfortunately, Cargo binaries are not available for every Cargo PR anymore: https://github.com/rust-lang/cargo/pull/4123#issuecomment-316201869

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17780)
<!-- Reviewable:end -->

1 files changed, 0 insertions, 15 deletions

diff --git a/python/servo/devenv_commands.py b/python/servo/devenv_commands.py
index ff70769771a..e66fa7b457d 100644
--- a/python/servo/devenv_commands.py
+++ b/python/servo/devenv_commands.py
@@ -284,21 +284,6 @@ class MachCommands(CommandBase):
         # Reset self.config["tools"]["rust-root"]
         self._rust_version = None
         self.set_use_stable_rust(False)
-
-        self.fetch()
-
-    @Command('cargoup',
-             description='Update the Cargo version to latest master',
-             category='devenv')
-    def cargoup(self):
-        url = "https://api.github.com/repos/rust-lang/cargo/git/refs/heads/master"
-        commit = json.load(urllib2.urlopen(url))["object"]["sha"]
-        filename = path.join(self.context.topdir, "cargo-commit-hash")
-        with open(filename, "w") as f:
-            f.write(commit + "\n")
-
-        # Reset self.config["tools"]["cargo-root"]
-        self._cargo_build_id = None
         self.set_cargo_root()
 
         self.fetch()