servo: Merge #17561 - Upgrade to rustc 1.20.0-nightly (69c65d296 2017…

…-06-28) (from servo:rustup); r=nox

Fixes #17575.

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

servo/components/script_plugins/unrooted_must_root.rs

@@ -140,7 +140,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnrootedPass {
 
         if !in_derive_expn(span) {
             let def_id = cx.tcx.hir.local_def_id(id);
-            let sig = cx.tcx.type_of(def_id).fn_sig();
+            let sig = cx.tcx.type_of(def_id).fn_sig(cx.tcx);
 
             for (arg, ty) in decl.inputs.iter().zip(sig.inputs().0.iter()) {
                 if is_unrooted_ty(cx, ty, false) {

servo/python/servo/bootstrap_commands.py

@@ -135,8 +135,11 @@ def bootstrap_rustc(self, force=False, target=[], stable=False):
                            % (version, target_triple))
                 tgz_file = install_dir + ('rust-std-%s-%s.tar.gz' % (version, target_triple))
             else:
-                std_url = ("https://s3.amazonaws.com/rust-lang-ci/rustc-builds/%s/rust-std-nightly-%s.tar.gz"
-                           % (version, target_triple))
+                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
                 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)

servo/rust-commit-hash

@@ -1 +1 @@
-2416e222ecae76a36e958a8f7c4ac8083eb1ca45
+3bfc18a9619a5151ff4f11618db9cd882996ba6f