diff --git a/components/script_plugins/lib.rs b/components/script_plugins/lib.rs
index c1dc92abb09..128bec6b6c7 100644
--- a/components/script_plugins/lib.rs
+++ b/components/script_plugins/lib.rs
@@ -405,10 +405,7 @@ fn match_def_path(cx: &LateContext, def_id: DefId, path: &[Symbol]) -> bool {
 fn in_derive_expn(span: Span) -> bool {
     matches!(
         span.ctxt().outer_expn_data().kind,
-        ExpnKind::Macro {
-            kind: MacroKind::Derive,
-            ..
-        }
+        ExpnKind::Macro(MacroKind::Derive, ..)
     )
 }
 
diff --git a/rust-toolchain b/rust-toolchain
index b2eff28fe03..659c2bb8306 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly-2021-05-18
+nightly-2021-07-17