servo: Merge #18541 - Upgrade to rustc 1.22.0-nightly (277476c4f 2017…

…-09-16) (from servo:rustup); r=SimonSapin rust-lang/rust#43017 Source-Repo: https://github.com/servo/servo Source-Revision: c28cf7490f2def7335c7c12e70e12e343eb1ec05 UltraBlame original commit: 14d7326af64d60a6be900427b468f94c7a2d2fda
marco-c · Oct 2, 2019 · 14bf3b7 · 14bf3b7
1 parent ea92534
commit 14bf3b7
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 45 deletions.
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 change
@@ Expand Up / @@ -93,6 +93,22 @@ const_fn @@
     [
     feature
     (
+    const_ptr_null
+    )
+    ]
+    #
+    !
+    [
+    feature
+    (
+    const_ptr_null_mut
+    )
+    ]
+    #
+    !
+    [
+    feature
+    (
     core_intrinsics
     )
     ]
@@ Expand Down @@