diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index 61269909bec8a..5ed9d5e21937c 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -13708,7 +13708,7 @@ parking_lot
 .
 4
 .
-4
+8
 (
 registry
 +
@@ -20286,7 +20286,7 @@ parking_lot
 .
 4
 .
-4
+8
 (
 registry
 +
@@ -20993,7 +20993,7 @@ parking_lot
 .
 4
 .
-4
+8
 (
 registry
 +
@@ -29328,7 +29328,7 @@ version
 .
 4
 .
-4
+8
 "
 source
 =
@@ -29391,38 +29391,7 @@ parking_lot_core
 .
 2
 .
-2
-(
-registry
-+
-https
-:
-/
-/
-github
-.
-com
-/
-rust
--
-lang
-/
-crates
-.
-io
--
-index
-)
-"
-"
-thread
--
-id
-3
-.
-1
-.
-0
+6
 (
 registry
 +
@@ -29463,7 +29432,7 @@ version
 .
 2
 .
-2
+6
 "
 source
 =
@@ -34497,7 +34466,7 @@ parking_lot
 .
 4
 .
-4
+8
 (
 registry
 +
@@ -42399,7 +42368,7 @@ parking_lot
 .
 4
 .
-4
+8
 (
 registry
 +
@@ -43145,7 +43114,7 @@ parking_lot
 .
 4
 .
-4
+8
 (
 registry
 +
@@ -56977,7 +56946,7 @@ parking_lot
 .
 4
 .
-4
+8
 (
 registry
 +
@@ -57002,7 +56971,7 @@ index
 "
 =
 "
-37f364e2ce5efa24c7d0b6646d5bb61145551a0112f107ffd7499f1a3e322fbd
+149d8f5b97f3c1133e3cfcd8886449959e856b557ff281e292b733d7c69e005e
 "
 "
 checksum
@@ -57011,7 +56980,7 @@ parking_lot_core
 .
 2
 .
-2
+6
 (
 registry
 +
@@ -57036,7 +57005,7 @@ index
 "
 =
 "
-0ad2c4d148942b3560034785bf19df586ebba53351e8c78f84984147d5795eef
+4f610cb9664da38e417ea3225f23051f589851999535290e077939838ab7a595
 "
 "
 checksum
diff --git a/servo/components/script/lib.rs b/servo/components/script/lib.rs
index e1c8310b211a9..00d1f63f81c89 100644
--- 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
index a026ff3e0ac90..1c076b2ba324d 100644
--- a/servo/rust-toolchain
+++ b/servo/rust-toolchain
@@ -4,4 +4,4 @@ nightly
 -
 09
 -
-08
+17