diff --git a/components/allocator/lib.rs b/components/allocator/lib.rs
index c2f2d9796a4..3d933599688 100644
--- a/components/allocator/lib.rs
+++ b/components/allocator/lib.rs
@@ -17,7 +17,7 @@ pub use platform::*;
 mod platform {
     extern crate jemalloc_sys as ffi;
 
-    use std::alloc::{GlobalAlloc, Layout, Opaque};
+    use std::alloc::{GlobalAlloc, Layout, Opaque, System};
     use std::os::raw::{c_int, c_void};
 
     /// Get the size of a heap block.
@@ -94,6 +94,11 @@ mod platform {
             let flags = layout_to_flags(layout.align(), new_size);
             ffi::rallocx(ptr as *mut _, new_size, flags) as *mut Opaque
         }
+
+        #[inline]
+        fn oom(&self) -> ! {
+            System.oom()
+        }
     }
 }
 
diff --git a/components/dom_struct/lib.rs b/components/dom_struct/lib.rs
index ecf74684c39..86c7134a78f 100644
--- a/components/dom_struct/lib.rs
+++ b/components/dom_struct/lib.rs
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#![feature(proc_macro, proc_macro_non_items)]
+#![feature(proc_macro)]
 
 extern crate proc_macro;
 
diff --git a/components/gfx/lib.rs b/components/gfx/lib.rs
index 156170c40cf..9b1b455b6a4 100644
--- a/components/gfx/lib.rs
+++ b/components/gfx/lib.rs
@@ -2,6 +2,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+// For SIMD
+#![cfg_attr(feature = "unstable", feature(cfg_target_feature))]
+
 #![deny(unsafe_code)]
 
 extern crate app_units;
diff --git a/components/script_plugins/unrooted_must_root.rs b/components/script_plugins/unrooted_must_root.rs
index 6277b309c0c..502ae03de12 100644
--- a/components/script_plugins/unrooted_must_root.rs
+++ b/components/script_plugins/unrooted_must_root.rs
@@ -143,14 +143,14 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnrootedPass {
             let def_id = cx.tcx.hir.local_def_id(id);
             let sig = cx.tcx.type_of(def_id).fn_sig(cx.tcx);
 
-            for (arg, ty) in decl.inputs.iter().zip(sig.inputs().skip_binder().iter()) {
+            for (arg, ty) in decl.inputs.iter().zip(sig.inputs().0.iter()) {
                 if is_unrooted_ty(cx, ty, false) {
                     cx.span_lint(UNROOTED_MUST_ROOT, arg.span, "Type must be rooted")
                 }
             }
 
             if !in_new_function {
-                if is_unrooted_ty(cx, sig.output().skip_binder(), false) {
+                if is_unrooted_ty(cx, sig.output().0, false) {
                     cx.span_lint(UNROOTED_MUST_ROOT, decl.output.span(), "Type must be rooted")
                 }
             }
diff --git a/components/script_plugins/utils.rs b/components/script_plugins/utils.rs
index 0999467545b..45a348ea14f 100644
--- a/components/script_plugins/utils.rs
+++ b/components/script_plugins/utils.rs
@@ -25,7 +25,7 @@ pub fn match_def_path(cx: &LateContext, def_id: DefId, path: &[&str]) -> bool {
     other.into_iter()
          .map(|e| e.data)
          .zip(path)
-         .all(|(nm, p)| nm.as_interned_str().with(|nm| nm == *p))
+         .all(|(nm, p)| &*nm.as_interned_str() == *p)
 }
 
 pub fn in_derive_expn(span: Span) -> bool {
diff --git a/rust-toolchain b/rust-toolchain
index 01157e91c16..84ce4f35a64 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly-2018-05-03
+nightly-2018-04-15