colocate imports with related templates

Signed-off-by: Chloe McKnight <[email protected]>
NordSecurity · Jan 14, 2025 · be1c6e5 · be1c6e5
1 parent 9817a00
commit be1c6e5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/bindgen/templates/Async.cs b/bindgen/templates/Async.cs
@@ -1,3 +1,5 @@
+{{ self.add_import("System.Threading.Tasks")}}
+
 [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
 delegate void UniFfiFutureCallback(IntPtr continuationHandle, byte pollResult);
 

diff --git a/bindgen/templates/ObjectTemplate.cs b/bindgen/templates/ObjectTemplate.cs
@@ -1,6 +1,7 @@
 {#/* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */#}
+{{- self.add_import("System.Threading")}}
 
 {%- let obj = ci.get_object_definition(name).unwrap() %}
 {%- if self.include_once_check("ObjectRuntime.cs") %}{% include "ObjectRuntime.cs" %}{% endif %}

diff --git a/bindgen/templates/Types.cs b/bindgen/templates/Types.cs
@@ -105,5 +105,5 @@
 {%- endfor %}
 
 {%- if ci.has_async_fns() %}
-{{ self.add_import("System.Threading.Tasks")}}
-{%- endif %}
+{% include "Async.cs" %}
+{%- endif %}
diff --git a/bindgen/templates/wrapper.cs b/bindgen/templates/wrapper.cs
@@ -24,7 +24,6 @@
 {{- self.add_import("System.IO") }}
 {{- self.add_import("System.Linq") }}
 {{- self.add_import("System.Runtime.InteropServices") }}
-{{- self.add_import("System.Threading")}}
 
 {%- for imported_class in self.imports() %}
 using {{ imported_class }};
@@ -46,10 +45,6 @@ namespace {{ config.namespace() }};
 // and the FFI Function declarations in a com.sun.jna.Library.
 {% include "NamespaceLibraryTemplate.cs" %}
 
-{%- if ci.has_async_fns() %}
-{% include "Async.cs" %}
-{%- endif %}
-
 // Public interface members begin here.
 {# details/1-empty-list-as-default-method-parameter.md #}
 #pragma warning disable 8625