Update to new attribute whitelisting setup

postgres-derive/Cargo.toml

@@ -14,9 +14,7 @@ test = false
 
 [dependencies]
 postgres-derive-internals = { version = "0.2.0", path = "../postgres-derive-internals" }
-post-expansion = "0.2"
 syn = "0.10"
-quote = "0.3"
 
 [dev-dependencies]
 postgres = "0.12"

postgres-derive/src/lib.rs

@@ -2,45 +2,24 @@
 
 extern crate proc_macro;
 extern crate postgres_derive_internals;
-#[macro_use]
-extern crate post_expansion;
+
 extern crate syn;
-extern crate quote;
 
 use proc_macro::TokenStream;
-use quote::{ToTokens, Tokens};
-
-register_post_expansion!(PostExpansion_postgres_derive);
 
-#[proc_macro_derive(ToSql)]
+#[proc_macro_derive(ToSql, attributes(postgres))]
 pub fn derive_tosql(input: TokenStream) -> TokenStream {
     derive(input, postgres_derive_internals::expand_derive_tosql)
 }
 
-#[proc_macro_derive(FromSql)]
+#[proc_macro_derive(FromSql, attributes(postgres))]
 pub fn derive_fromsql(input: TokenStream) -> TokenStream {
     derive(input, postgres_derive_internals::expand_derive_fromsql)
 }
 
 fn derive(input: TokenStream, expand: fn(&str) -> Result<String, String>) -> TokenStream {
-    let source = input.to_string();
-
-    let decl = expand_decl(&source);
-
-    let impl_ = match expand(&source) {
-        Ok(impl_) => impl_,
+    match expand(&input.to_string()) {
+        Ok(impl_) => impl_.parse().unwrap(),
         Err(e) => panic!("{}", e),
-    };
-
-    let expanded = format!("{}\n{}", decl, impl_);
-    expanded.parse().unwrap()
-}
-
-fn expand_decl(source: &str) -> String {
-    let ast = syn::parse_macro_input(source).unwrap();
-    let stripped = post_expansion::strip_attrs_later(ast, &["postgres"], "postgres_derive");
-
-    let mut tokens = Tokens::new();
-    stripped.to_tokens(&mut tokens);
-    tokens.to_string()
+    }
 }