feat: Refactor specific attribute solution to general solution

Author: konradkoschel

bindgen-tests/tests/expectations/tests/extern-fn-block-attrs-many.rs

@@ -0,0 +1,3 @@
+// bindgen-flags: --extern-fn-block-attrs '#[cfg_attr(windows, link(name = "<name>", kind = "raw-dylib"))]' --extern-fn-block-attrs '#[cfg_attr(not(windows), link(name = "<name>"))]'
+
+void test_function();

bindgen-tests/tests/expectations/tests/windows-raw-dylib-verbatim.rs renamed to bindgen-tests/tests/expectations/tests/extern-fn-block-attrs-wasm.rs

@@ -0,0 +1,3 @@
+// bindgen-flags: --extern-fn-block-attrs '#[cfg_attr(windows, link(name = "<name>", kind = "raw-dylib"))]' --wasm-import-module-name test-module
+
+void test_function();

bindgen-tests/tests/expectations/tests/windows-raw-dylib.rs renamed to bindgen-tests/tests/expectations/tests/extern-fn-block-attrs.rs

@@ -0,0 +1,3 @@
+// bindgen-flags: --extern-fn-block-attrs '#[cfg_attr(windows, link(name = "<name>", kind = "raw-dylib"))]'
+
+void test_function();

bindgen-tests/tests/headers/extern-fn-block-attrs-many.h

@@ -4666,28 +4666,19 @@ impl CodeGenerator for Function {
             }
         }
 
-        // Unfortunately this can't piggyback on the `attributes` list because
-        // the #[link(wasm_import_module)] needs to happen before the `extern
-        // "C"` block. It doesn't get picked up properly otherwise
-        let mut link_attribute = quote! {};
-        if let Some(ref wasm_name) = ctx.options().wasm_import_module_name {
-            link_attribute.extend(quote! {
-                #[link(wasm_import_module = #wasm_name)]
+        let mut block_attributes = quote! {};
+        for attr in &ctx.options().extern_fn_block_attrs {
+            let parsed_attr = proc_macro2::TokenStream::from_str(attr).unwrap_or_else(
+                |err| {
+                    panic!(
+                        "Error parsing extern fn block attribute `{attr}`: {err}"
+                    )
+                },
+            );
+            block_attributes.extend(quote! {
+                #parsed_attr
             });
         }
-        if let (Some(ref windows_name), verbatim) =
-            ctx.options().windows_link_as_raw_dylib
-        {
-            if verbatim {
-                link_attribute.extend(quote! {
-                    #[cfg_attr(windows, link(name = #windows_name, kind = "raw-dylib", modifiers = "+verbatim"))]
-                });
-            } else {
-                link_attribute.extend(quote! {
-                    #[cfg_attr(windows, link(name = #windows_name, kind = "raw-dylib"))]
-                });
-            }
-        }
 
         let should_wrap = is_internal
             && ctx.options().wrap_static_fns
@@ -4741,7 +4732,7 @@ impl CodeGenerator for Function {
             .then(|| quote!(unsafe));
 
         let tokens = quote! {
-            #link_attribute
+            #block_attributes
             #safety extern #abi {
                 #(#attributes)*
                 pub fn #ident ( #( #args ),* ) #ret;

bindgen-tests/tests/headers/extern-fn-block-attrs-wasm.h

@@ -423,12 +423,9 @@ struct BindgenCommand {
     /// The NAME to be used in a #[link(wasm_import_module = ...)] statement
     #[arg(long, value_name = "NAME")]
     wasm_import_module_name: Option<String>,
-    /// On Windows, link against NAME with kind `raw-dylib`.
-    #[arg(long, value_name = "NAME")]
-    windows_link_as_raw_dylib: Option<String>,
-    /// Do not append `.dll` suffix to the NAME provided to `--windows-link-as-raw-dylib`.
-    #[arg(long, requires = "windows_link_as_raw_dylib")]
-    windows_link_as_raw_dylib_verbatim: bool,
+    /// Attributes to apply to the extern function block.
+    #[arg(long, value_name = "ATTRS")]
+    extern_fn_block_attrs: Vec<String>,
     /// Use dynamic loading mode with the given library NAME.
     #[arg(long, value_name = "NAME")]
     dynamic_loading: Option<String>,
@@ -653,8 +650,7 @@ where
         enable_function_attribute_detection,
         use_array_pointers_in_arguments,
         wasm_import_module_name,
-        windows_link_as_raw_dylib,
-        windows_link_as_raw_dylib_verbatim,
+        extern_fn_block_attrs,
         dynamic_loading,
         dynamic_link_require_all,
         prefix_link_name,
@@ -772,8 +768,8 @@ where
         }
 
         fn add_derives(&self, info: &DeriveInfo<'_>) -> Vec<String> {
-            if self.kind.map_or(true, |kind| kind == info.kind) &&
-                self.regex_set.matches(info.name)
+            if self.kind.map_or(true, |kind| kind == info.kind)
+                && self.regex_set.matches(info.name)
             {
                 return self.derives.clone();
             }
@@ -812,8 +808,8 @@ where
         }
 
         fn add_attributes(&self, info: &AttributeInfo<'_>) -> Vec<String> {
-            if self.kind.map_or(true, |kind| kind == info.kind) &&
-                self.regex_set.matches(info.name)
+            if self.kind.map_or(true, |kind| kind == info.kind)
+                && self.regex_set.matches(info.name)
             {
                 return self.attributes.clone();
             }
@@ -915,6 +911,7 @@ where
             time_phases,
             use_array_pointers_in_arguments => Builder::array_pointers_in_arguments,
             wasm_import_module_name,
+            extern_fn_block_attrs => Builder::extern_fn_block_attrs,
             ctypes_prefix,
             anon_fields_prefix,
             generate => Builder::with_codegen_config,
@@ -1096,13 +1093,6 @@ where
         builder = builder.emit_diagnostics();
     }
 
-    if let Some(windows_link_as_raw_dylib) = windows_link_as_raw_dylib {
-        builder = builder.windows_link_as_raw_dylib(
-            windows_link_as_raw_dylib,
-            windows_link_as_raw_dylib_verbatim,
-        );
-    }
-
     Ok((builder, output, verbose))
 }