servo: Merge #18541 - Upgrade to rustc 1.22.0-nightly (277476c4f 2017-09-16) (from servo:rustup); r=SimonSapin

marco-c · marco-c · commit 14bf3b7f4c32 · 2019-10-02T00:27:07.000Z
rust-lang/rust#43017 Source-Repo: https://github.com/servo/servo Source-Revision: c28cf7490f2def7335c7c12e70e12e343eb1ec05 UltraBlame original commit: 14d7326af64d60a6be900427b468f94c7a2d2fda
diff --git a/servo/Cargo.lock b/servo/Cargo.lock
diff --git a/servo/components/script/lib.rs b/servo/components/script/lib.rs
@@ -93,6 +93,22 @@ const_fn
 [
 feature
 (
+const_ptr_null
+)
+]
+#
+!
+[
+feature
+(
+const_ptr_null_mut
+)
+]
+#
+!
+[
+feature
+(
 core_intrinsics
 )
 ]
diff --git a/servo/rust-toolchain b/servo/rust-toolchain
@@ -4,4 +4,4 @@ nightly
 -
 09
 -
-08
+17

Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,22 @@ const_fn`
`93`	`93`	`[`
`94`	`94`	`feature`
`95`	`95`	`(`
	`96`	`+const_ptr_null`
	`97`	`+)`
	`98`	`+]`
	`99`	`+#`
	`100`	`+!`
	`101`	`+[`
	`102`	`+feature`
	`103`	`+(`
	`104`	`+const_ptr_null_mut`
	`105`	`+)`
	`106`	`+]`
	`107`	`+#`
	`108`	`+!`
	`109`	`+[`
	`110`	`+feature`
	`111`	`+(`
`96`	`112`	`core_intrinsics`
`97`	`113`	`)`
`98`	`114`	`]`
Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@ nightly`
`4`	`4`	`-`
`5`	`5`	`09`
`6`	`6`	`-`
`7`		`-08`
	`7`	`+17`