Auto merge of #28549 - jdm:rustup2, r=jdm

Update to 7/17 nightly.
2025-08-06 22:15:33 +01:00 · 2021-07-17 17:39:19 -04:00 · 2021-07-17 17:39:19 -04:00 · e8cb9f56e3
commit e8cb9f56e3
parent 1522befabb 8d5dd66ed3
2 changed files with 2 additions and 5 deletions
--- 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, ..)
    )
 }

--- a/2
+++ b/2
@ -1 +1 @@
-nightly-2021-05-18
+nightly-2021-07-17