about summary refs log tree commit diff
path: root/src/libsyntax_ext
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-12-31 16:49:27 +0000
committerbors <bors@rust-lang.org>2016-12-31 16:49:27 +0000
commit6185c5445210966cfd1acb011b4faf4b4eaf9d97 (patch)
tree00faeba85299705870a3f8ab2985c101873c9187 /src/libsyntax_ext
parentca0cc27ab6569c1afbd6aa1e3ab7b925b226b679 (diff)
parente9b5839918a1e36ef923a88f71c67da2d9f7b9e1 (diff)
downloadrust-6185c5445210966cfd1acb011b4faf4b4eaf9d97.tar.gz
rust-6185c5445210966cfd1acb011b4faf4b4eaf9d97.zip
Auto merge of #38737 - keeperofdakeys:proc-macro-derive-Dec-16, r=jseyfried
Fix panic when using a macros 1.1 custom derive on a struct containing a macro invocation

Fixes #38706

r? @jseyfried
Diffstat (limited to 'src/libsyntax_ext')
-rw-r--r--src/libsyntax_ext/deriving/custom.rs4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libsyntax_ext/deriving/custom.rs b/src/libsyntax_ext/deriving/custom.rs
index 6f02a348f91..64ec460a524 100644
--- a/src/libsyntax_ext/deriving/custom.rs
+++ b/src/libsyntax_ext/deriving/custom.rs
@@ -12,7 +12,7 @@ use std::panic;
 
 use errors::FatalError;
 use proc_macro::{TokenStream, __internal};
-use syntax::ast::{self, ItemKind, Attribute};
+use syntax::ast::{self, ItemKind, Attribute, Mac};
 use syntax::attr::{mark_used, mark_known};
 use syntax::codemap::Span;
 use syntax::ext::base::*;
@@ -28,6 +28,8 @@ impl<'a> Visitor<'a> for MarkAttrs<'a> {
             mark_known(attr);
         }
     }
+
+    fn visit_mac(&mut self, _mac: &Mac) {}
 }
 
 pub struct CustomDerive {