diff --git a/components/script_plugins/utils.rs b/components/script_plugins/utils.rs
index 0c22f2246472..686b104daf65 100644
--- a/components/script_plugins/utils.rs
+++ b/components/script_plugins/utils.rs
@@ -30,7 +30,7 @@ pub fn match_def_path(cx: &LateContext, def_id: DefId, path: &[Symbol]) -> bool
 }
 
 pub fn in_derive_expn(span: Span) -> bool {
-    if let Some(i) = span.ctxt().outer().expn_info() {
+    if let Some(i) = span.ctxt().outer_expn().expn_info() {
         if let ExpnKind::Macro(MacroKind::Attr, n) = i.kind {
             n.as_str().contains("derive")
         } else {
diff --git a/rust-toolchain b/rust-toolchain
index 664d9426cd4b..5cef440d01f4 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly-2019-07-16
+nightly-2019-07-22