D: fix generics opaque structs

mozilla · Oct 4, 2024 · 65df2ad · 65df2ad
1 parent f36981c
commit 65df2ad
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 17 deletions.
diff --git a/src/bindgen/language_backend/clike.rs b/src/bindgen/language_backend/clike.rs
@@ -764,7 +764,9 @@ impl LanguageBackend for CLikeLanguageBackend<'_> {
 
         self.write_documentation(out, &o.documentation);
 
-        o.generic_params.write_with_default(self, self.config, out);
+        if self.config.language != Language::D {
+            o.generic_params.write_with_default(self, self.config, out);
+        }
 
         if self.generate_typedef() {
             write!(
@@ -774,7 +776,13 @@ impl LanguageBackend for CLikeLanguageBackend<'_> {
                 o.export_name()
             );
         } else {
-            write!(out, "struct {};", o.export_name());
+            if self.config.language == Language::D {
+                write!(out, "struct {}", o.export_name());
+                o.generic_params.write_with_default(self, self.config, out);
+                out.write(";");
+            } else {
+                write!(out, "struct {};", o.export_name());
+            }
         }
 
         condition.write_after(self.config, out);

diff --git a/tests/expectations/box.d b/tests/expectations/box.d
@@ -2,7 +2,7 @@ module cbindgen;
 
 @nogc nothrow @safe:
 
-(T = void)struct NotReprC;
+struct NotReprC(T = void);
 
 alias Foo = NotReprC!(int*);
 

diff --git a/tests/expectations/cell.d b/tests/expectations/cell.d
@@ -2,9 +2,9 @@ module cbindgen;
 
 @nogc nothrow @safe:
 
-(T = void)struct NotReprC;
+struct NotReprC(T = void);
 
-(T = void)struct RefCell;
+struct RefCell(T = void);
 
 alias Foo = NotReprC!(RefCell!(int));
 

diff --git a/tests/expectations/exclude_generic_monomorph.d b/tests/expectations/exclude_generic_monomorph.d
@@ -2,7 +2,7 @@ module cbindgen;
 
 @nogc nothrow @safe:
 
-(T = void)struct Option;
+struct Option(T = void);
 
 alias Foo = ulong;
 

diff --git a/tests/expectations/manuallydrop.d b/tests/expectations/manuallydrop.d
@@ -2,7 +2,7 @@ module cbindgen;
 
 @nogc nothrow @safe:
 
-(T = void)struct NotReprC;
+struct NotReprC(T = void);
 
 struct Point {
   @disable this();

diff --git a/tests/expectations/maybeuninit.d b/tests/expectations/maybeuninit.d
@@ -2,7 +2,7 @@ module cbindgen;
 
 @nogc nothrow @safe:
 
-(T = void)struct NotReprC;
+struct NotReprC(T = void);
 
 alias Foo = NotReprC!(const int*);
 

diff --git a/tests/expectations/monomorph_1.d b/tests/expectations/monomorph_1.d
@@ -2,7 +2,7 @@ module cbindgen;
 
 @nogc nothrow @safe:
 
-(T = void)struct Bar;
+struct Bar(T = void);
 
 struct Foo(T) {
   @disable this();

diff --git a/tests/expectations/monomorph_3.d b/tests/expectations/monomorph_3.d
@@ -2,7 +2,7 @@ module cbindgen;
 
 @nogc nothrow @safe:
 
-(T = void)struct Bar;
+struct Bar(T = void);
 
 union Foo(T) {
   const T *data;

diff --git a/tests/expectations/nonzero.d b/tests/expectations/nonzero.d
@@ -2,7 +2,7 @@ module cbindgen;
 
 @nogc nothrow @safe:
 
-(T = void)struct Option;
+struct Option(T = void);
 
 struct NonZeroAliases {
   @disable this();

diff --git a/tests/expectations/opaque.d b/tests/expectations/opaque.d
@@ -2,9 +2,9 @@ module cbindgen;
 
 @nogc nothrow @safe:
 
-(K = void, V = void, Hasher = void)struct HashMap;
+struct HashMap(K = void, V = void, Hasher = void);
 
-(T = void, E = void)struct Result;
+struct Result(T = void, E = void);
 
 /// Fast hash map used internally.
 alias FastHashMap(K, V) = HashMap!(K, V, BuildHasherDefault!(DefaultHasher));

diff --git a/tests/expectations/simplify_option_ptr.d b/tests/expectations/simplify_option_ptr.d
@@ -4,7 +4,7 @@ module cbindgen;
 
 struct Opaque;
 
-(T = void)struct Option;
+struct Option(T = void);
 
 struct Foo {
   @disable this();

diff --git a/tests/expectations/std_lib.d b/tests/expectations/std_lib.d
@@ -2,13 +2,13 @@ module cbindgen;
 
 @nogc nothrow @safe:
 
-(T = void)struct Option;
+struct Option(T = void);
 
-(T = void, E = void)struct Result;
+struct Result(T = void, E = void);
 
 struct String;
 
-(T = void)struct Vec;
+struct Vec(T = void);
 
 extern(C) {