Allow excluding monomorph structs in C mode.

src/bindgen/library.rs

@@ -54,7 +54,6 @@ impl Library {
     }
 
     pub fn generate(mut self) -> Result<Bindings, Error> {
-        self.remove_excluded();
         self.transfer_annotations();
         self.simplify_standard_types();
 
@@ -67,7 +66,10 @@ impl Library {
 
         if self.config.language == Language::C {
             self.instantiate_monomorphs();
+            self.remove_excluded();
             self.resolve_declaration_types();
+        } else {
+            self.remove_excluded();
         }
 
         self.rename_items();

tests/expectations/both/exclude_generic_monomorph.c

@@ -0,0 +1,15 @@
+#include <stdint.h>
+
+typedef uint64_t Option_Foo;
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Bar {
+  Option_Foo foo;
+} Bar;
+
+void root(Bar f);

tests/expectations/both/exclude_generic_monomorph.compat.c

@@ -0,0 +1,23 @@
+#include <stdint.h>
+
+typedef uint64_t Option_Foo;
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Bar {
+  Option_Foo foo;
+} Bar;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(Bar f);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus

tests/expectations/exclude_generic_monomorph.c

@@ -0,0 +1,15 @@
+#include <stdint.h>
+
+typedef uint64_t Option_Foo;
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct {
+  Option_Foo foo;
+} Bar;
+
+void root(Bar f);

tests/expectations/exclude_generic_monomorph.compat.c

@@ -0,0 +1,23 @@
+#include <stdint.h>
+
+typedef uint64_t Option_Foo;
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct {
+  Option_Foo foo;
+} Bar;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(Bar f);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus

tests/expectations/exclude_generic_monomorph.cpp

@@ -0,0 +1,15 @@
+#include <stdint.h>
+
+typedef uint64_t Option_Foo;
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct {
+  Option_Foo foo;
+} Bar;
+
+void root(Bar f);

tests/expectations/tag/exclude_generic_monomorph.c

@@ -0,0 +1,15 @@
+#include <stdint.h>
+
+typedef uint64_t Option_Foo;
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Bar {
+  Option_Foo foo;
+};
+
+void root(struct Bar f);

tests/expectations/tag/exclude_generic_monomorph.compat.c

@@ -0,0 +1,23 @@
+#include <stdint.h>
+
+typedef uint64_t Option_Foo;
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Bar {
+  Option_Foo foo;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Bar f);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus

tests/rust/exclude_generic_monomorph.rs

@@ -0,0 +1,10 @@
+#[repr(transparent)]
+pub struct Foo(NonZeroU64);
+
+#[repr(C)]
+pub struct Bar {
+  foo: Option<Foo>,
+}
+
+#[no_mangle]
+pub extern "C" fn root(f: Bar) {}

tests/rust/exclude_generic_monomorph.toml

@@ -0,0 +1,11 @@
+language = "C"
+header = """
+#include <stdint.h>
+
+typedef uint64_t Option_Foo;
+"""
+
+[export]
+exclude = [
+  "Option_Foo",
+]