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 · 0a7604c · 0a7604c
1 parent 23a6acd
commit 0a7604c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 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
@@ -6,6 +6,8 @@
 #![feature(box_syntax)]
 #![feature(conservative_impl_trait)]
 #![feature(const_fn)]
+#![feature(const_ptr_null)]
+#![feature(const_ptr_null_mut)]
 #![feature(core_intrinsics)]
 #![feature(mpsc_select)]
 #![feature(nonzero)]

diff --git a/servo/rust-toolchain b/servo/rust-toolchain
@@ -1 +1 @@
-nightly-2017-09-08
+nightly-2017-09-17