From 22f788c64417523e838bf367c83f8a426102809a Mon Sep 17 00:00:00 2001
From: Josh Driver <keeperofdakeys@gmail.com>
Date: Sat, 31 Dec 2016 16:02:06 +1030
Subject: Stop macro calls in structs for proc_macro_derive from panicing

---
 src/libsyntax_ext/deriving/custom.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/libsyntax_ext')

diff --git a/src/libsyntax_ext/deriving/custom.rs b/src/libsyntax_ext/deriving/custom.rs
index 6f02a348f91..811aea4a9eb 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,9 @@ impl<'a> Visitor<'a> for MarkAttrs<'a> {
             mark_known(attr);
         }
     }
+
+    fn visit_mac(&mut self, _mac: &Mac) {
+    }
 }
 
 pub struct CustomDerive {
-- 
cgit 1.4.1-3-g733a5


From e9b5839918a1e36ef923a88f71c67da2d9f7b9e1 Mon Sep 17 00:00:00 2001
From: Josh Driver <keeperofdakeys@gmail.com>
Date: Sat, 31 Dec 2016 17:55:59 +1030
Subject: Style fixes

---
 src/librustc_resolve/macros.rs                              | 3 +--
 src/libsyntax_ext/deriving/custom.rs                        | 3 +--
 src/test/run-pass-fulldeps/proc-macro/struct-field-macro.rs | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'src/libsyntax_ext')

diff --git a/src/librustc_resolve/macros.rs b/src/librustc_resolve/macros.rs
index c7e0b2733f0..47033f74e0e 100644
--- a/src/librustc_resolve/macros.rs
+++ b/src/librustc_resolve/macros.rs
@@ -28,8 +28,7 @@ use syntax::ext::expand::{Expansion, mark_tts};
 use syntax::ext::hygiene::Mark;
 use syntax::ext::tt::macro_rules;
 use syntax::feature_gate::{emit_feature_err, GateIssue};
-use syntax::fold::Folder;
-use syntax::fold;
+use syntax::fold::{self, Folder};
 use syntax::ptr::P;
 use syntax::symbol::keywords;
 use syntax::util::lev_distance::find_best_match_for_name;
diff --git a/src/libsyntax_ext/deriving/custom.rs b/src/libsyntax_ext/deriving/custom.rs
index 811aea4a9eb..64ec460a524 100644
--- a/src/libsyntax_ext/deriving/custom.rs
+++ b/src/libsyntax_ext/deriving/custom.rs
@@ -29,8 +29,7 @@ impl<'a> Visitor<'a> for MarkAttrs<'a> {
         }
     }
 
-    fn visit_mac(&mut self, _mac: &Mac) {
-    }
+    fn visit_mac(&mut self, _mac: &Mac) {}
 }
 
 pub struct CustomDerive {
diff --git a/src/test/run-pass-fulldeps/proc-macro/struct-field-macro.rs b/src/test/run-pass-fulldeps/proc-macro/struct-field-macro.rs
index 68da011e5a5..818308b05a4 100644
--- a/src/test/run-pass-fulldeps/proc-macro/struct-field-macro.rs
+++ b/src/test/run-pass-fulldeps/proc-macro/struct-field-macro.rs
@@ -25,5 +25,4 @@ struct S {
     x: int!(),
 }
 
-fn main() {
-}
+fn main() {}
-- 
cgit 1.4.1-3-g733a5