Scope 'options' derive attributes under trait name.

Author: SergioBenitez

diesel/src/macros/macros_from_codegen.rs

@@ -15,7 +15,7 @@ macro_rules! infer_schema {
     ($database_url: expr) => {
         mod __diesel_infer_schema {
             #[derive(InferSchema)]
-            #[options(database_url=$database_url)]
+            #[infer_schema_options(database_url=$database_url)]
             struct _Dummy;
         }
         pub use self::__diesel_infer_schema::*;
@@ -24,7 +24,7 @@ macro_rules! infer_schema {
     ($database_url: expr, $schema_name: expr) => {
         mod __diesel_infer_schema {
             #[derive(InferSchema)]
-            #[options(database_url=$database_url, schema_name=$schema_name)]
+            #[infer_schema_options(database_url=$database_url, schema_name=$schema_name)]
             struct _Dummy;
         }
         pub use self::__diesel_infer_schema::*;
@@ -53,7 +53,7 @@ macro_rules! infer_schema {
 macro_rules! infer_table_from_schema {
     ($database_url: expr, $table_name: expr) => {
         #[derive(InferTableFromSchema)]
-        #[options(database_url=$database_url, table_name=$table_name)]
+        #[infer_table_from_schema_options(database_url=$database_url, table_name=$table_name)]
         struct __DieselInferTableFromSchema;
     }
 }
@@ -83,7 +83,7 @@ macro_rules! embed_migrations {
     ($migrations_path: expr) => {
         mod embedded_migrations {
             #[derive(EmbedMigrations)]
-            #[options(migrations_path=$migrations_path)]
+            #[embed_migrations_options(migrations_path=$migrations_path)]
             struct _Dummy;
         }
     }

diesel_codegen/src/embed_migrations.rs

@@ -14,7 +14,7 @@ pub fn derive_embed_migrations(input: syn::MacroInput) -> quote::Tokens {
                with your invocation of `embed_migrations!");
     }
 
-    let options = get_options_from_input(&input.attrs, bug);
+    let options = get_options_from_input("embed_migrations_options", &input.attrs, bug);
     let migrations_path_opt = options.as_ref().map(|o| get_option(o, "migrations_path", bug));
     let migrations_expr = migration_directory_from_given_path(migrations_path_opt)
         .and_then(|path| migration_literals_from_path(&path));

diesel_codegen/src/lib.rs

@@ -57,19 +57,19 @@ pub fn derive_associations(input: TokenStream) -> TokenStream {
     expand_derive(input, associations::derive_associations)
 }
 
-#[proc_macro_derive(InferSchema, attributes(options))]
+#[proc_macro_derive(InferSchema, attributes(infer_schema_options))]
 #[cfg(any(feature = "sqlite", feature = "postgres"))]
 pub fn derive_infer_schema(input: TokenStream) -> TokenStream {
     expand_derive(input, schema_inference::derive_infer_schema)
 }
 
-#[proc_macro_derive(InferTableFromSchema, attributes(options))]
+#[proc_macro_derive(InferTableFromSchema, attributes(infer_table_from_schema_options))]
 #[cfg(any(feature = "sqlite", feature = "postgres"))]
 pub fn derive_infer_table_from_schema(input: TokenStream) -> TokenStream {
     expand_derive(input, schema_inference::derive_infer_table_from_schema)
 }
 
-#[proc_macro_derive(EmbedMigrations, attributes(options))]
+#[proc_macro_derive(EmbedMigrations, attributes(embed_migrations_options))]
 pub fn derive_embed_migrations(input: TokenStream) -> TokenStream {
     expand_derive(input, embed_migrations::derive_embed_migrations)
 }

diesel_codegen/src/schema_inference.rs

@@ -11,7 +11,8 @@ pub fn derive_infer_schema(input: syn::MacroInput) -> quote::Tokens {
                with your invocation of `infer_schema!");
     }
 
-    let options = get_options_from_input(&input.attrs, bug).unwrap_or_else(|| bug());
+    let options = get_options_from_input("infer_schema_options", &input.attrs, bug)
+        .unwrap_or_else(|| bug());
     let database_url = get_option(&options, "database_url", bug);
     let schema_name = get_optional_option(&options, "schema_name");
 
@@ -24,7 +25,8 @@ pub fn derive_infer_table_from_schema(input: syn::MacroInput) -> quote::Tokens {
                with your invocation of `infer_table_from_schema!");
     }
 
-    let options = get_options_from_input(&input.attrs, bug).unwrap_or_else(|| bug());
+    let options = get_options_from_input("infer_table_from_schema_options", &input.attrs, bug)
+        .unwrap_or_else(|| bug());
     let database_url = get_option(&options, "database_url", bug);
     let table_name = get_option(&options, "table_name", bug);
 

diesel_codegen/src/util.rs

@@ -109,10 +109,10 @@ pub fn inner_of_option_ty(ty: &Ty) -> Option<&Ty> {
     }
 }
 
-pub fn get_options_from_input(attrs: &[Attribute], on_bug: fn() -> !)
+pub fn get_options_from_input(name: &str, attrs: &[Attribute], on_bug: fn() -> !)
     -> Option<Vec<MetaItem>>
 {
-    let options = attrs.iter().find(|a| a.name() == "options").map(|a| &a.value);
+    let options = attrs.iter().find(|a| a.name() == name).map(|a| &a.value);
     match options {
         Some(&MetaItem::List(_, ref options)) => {
             Some(options.iter().map(|o| match o {