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

@@ -1075,6 +1075,71 @@ thread
 will
 panic
 .
+/
+/
+Forced
+out
+of
+line
+to
+limit
+stack
+frame
+sizes
+after
+extra
+inlining
+from
+/
+/
+https
+:
+/
+/
+github
+.
+com
+/
+rust
+-
+lang
+/
+rust
+/
+pull
+/
+43931
+/
+/
+/
+/
+See
+https
+:
+/
+/
+github
+.
+com
+/
+servo
+/
+servo
+/
+pull
+/
+18420
+#
+issuecomment
+-
+328769322
+#
+[
+inline
+(
+never
+)
+]
 pub
 fn
 new

servo/components/style/sharing/mod.rs

@@ -3821,6 +3821,71 @@ sharing
 candidate
 cache
 .
+/
+/
+Forced
+out
+of
+line
+to
+limit
+stack
+frame
+sizes
+after
+extra
+inlining
+from
+/
+/
+https
+:
+/
+/
+github
+.
+com
+/
+rust
+-
+lang
+/
+rust
+/
+pull
+/
+43931
+/
+/
+/
+/
+See
+https
+:
+/
+/
+github
+.
+com
+/
+servo
+/
+servo
+/
+pull
+/
+18420
+#
+issuecomment
+-
+328769322
+#
+[
+inline
+(
+never
+)
+]
 pub
 fn
 new

servo/python/servo/bootstrap_commands.py

@@ -755,9 +755,6 @@
 import
 toml
 
-import
-re
-
 channel
 =
 "
@@ -785,7 +782,7 @@
 )
 )
 
-version_string
+nightly_commit_hash
 =
 toml
 .
@@ -810,81 +807,7 @@
 ]
 [
 "
-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
+git_commit_hash
 "
 ]
 

servo/python/servo/devenv_commands.py

@@ -2275,12 +2275,18 @@
 /
 /
 static
-.
+-
 rust
 -
 lang
-.
+-
 org
+.
+s3
+.
+amazonaws
+.
+com
 /
 dist
 /

servo/rust-toolchain

@@ -2,6 +2,6 @@ nightly
 -
 2017
 -
-08
+09
 -
-31
+08