servo: Merge #18420 - Get rustc commit hash from channel manifest (fr…

…om servo:toml); r=nox,emilio

… added in rust-lang/rust#44218, instead of using the GitHub API.

Also upgrade to rustc 1.22.0-nightly (d93036a04 2017-09-07).

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

UltraBlame original commit: b674d9f6d1d65fba6b68cb847619d1c7d84c0d4c

servo/components/style/bloom.rs

@@ -121,6 +121,12 @@ impl<E: TElement> StyleBloom<E> {
 
 
 
+
+
+
+
+
+    #[inline(never)]
     pub fn new() -> Self {
         let bloom_arc = BLOOM_KEY.with(|b| b.clone());
         let filter = OwningHandle::new_with_fn(bloom_arc, |x| unsafe { x.as_ref() }.unwrap().borrow_mut());

servo/components/style/sharing/mod.rs

@@ -478,6 +478,12 @@ impl<E: TElement> StyleSharingCache<E> {
     }
 
 
+
+
+
+
+
+    #[inline(never)]
     pub fn new() -> Self {
         assert_eq!(mem::size_of::<SharingCache<E>>(), mem::size_of::<TypelessSharingCache>());
         assert_eq!(mem::align_of::<SharingCache<E>>(), mem::align_of::<TypelessSharingCache>());

servo/python/servo/bootstrap_commands.py

@@ -90,12 +90,8 @@ def bootstrap_rustc(self, force=False, target=[], stable=False):
                 base_url = static_s3
             else:
                 import toml
-                import re
                 channel = "%s/%s/channel-rust-nightly.toml" % (static_s3, self.rust_nightly_date())
-                version_string = toml.load(urllib2.urlopen(channel))["pkg"]["rustc"]["version"]
-                short_commit = re.search("\(([0-9a-f]+) ", version_string).group(1)
-                commit_api = "https://api.github.com/repos/rust-lang/rust/commits/" + short_commit
-                nightly_commit_hash = json.load(urllib2.urlopen(commit_api))["sha"]
+                nightly_commit_hash = toml.load(urllib2.urlopen(channel))["pkg"]["rustc"]["git_commit_hash"]
 
                 base_url = "https://s3.amazonaws.com/rust-lang-ci/rustc-builds"
                 if not self.config["build"]["llvm-assertions"]:

servo/python/servo/devenv_commands.py

@@ -262,7 +262,7 @@ def grep(self, params):
              description='Update the Rust version to latest Nightly',
              category='devenv')
     def rustup(self):
-        url = "https://static.rust-lang.org/dist/channel-rust-nightly-date.txt"
+        url = "https://static-rust-lang-org.s3.amazonaws.com/dist/channel-rust-nightly-date.txt"
         nightly_date = urllib2.urlopen(url).read()
         filename = path.join(self.context.topdir, "rust-toolchain")
         with open(filename, "w") as f:

servo/rust-toolchain

@@ -1 +1 @@
-nightly-2017-08-31
+nightly-2017-09-08