Cleanups

Author: Bromeon

godot-codegen/src/generator/extension_interface.rs

@@ -161,14 +161,16 @@ pub fn generate_interface_impl(header: &HeaderJson) -> TokenStream {
     }
 }
 
-/// Generate complete `gdextension_interface.rs` content from JSON: all type definitions.
+/// Generate complete `gdextension_interface.rs` content from JSON.
 ///
 /// This replaces the bindgen-generated file. Produces enums, structs, handles,
-/// aliases, function pointer type definitions, and per-interface-function typedefs
-/// from the JSON header model.
+/// aliases, function pointer type definitions, per-interface-function typedefs,
+/// the `GDExtensionInterface` struct, and its `load()` impl — all in one module.
 pub fn generate_sys_gdextension_interface_from_json(header: &HeaderJson) -> TokenStream {
     let header_types = generate_header_types(header);
     let interface_typedefs = generate_interface_typedefs(header);
+    let struct_def = generate_interface_struct(header);
+    let load_impl = generate_interface_impl(header);
 
     quote! {
         /// UTF-16 character type.
@@ -184,19 +186,6 @@ pub fn generate_sys_gdextension_interface_from_json(header: &HeaderJson) -> Toke
 
         // Per-interface-function typedefs (bare function pointers, version-gated).
         #interface_typedefs
-    }
-}
-
-/// Generate complete `interface.rs` content from JSON: struct definition + impl with `load()` method.
-///
-/// Includes `use crate::*;` so that GDExtension types (defined in the sibling `gdextension_interface` module) resolve correctly.
-/// The per-function typedefs are generated in `gdextension_interface.rs` alongside other type definitions.
-pub fn generate_sys_interface_from_json(header: &HeaderJson) -> TokenStream {
-    let struct_def = generate_interface_struct(header);
-    let load_impl = generate_interface_impl(header);
-
-    quote! {
-        use crate::*;
 
         #struct_def
         #load_impl

godot-codegen/src/generator/header_codegen.rs

@@ -12,6 +12,7 @@ use quote::quote;
 use crate::SubmitFn;
 use crate::context::Context;
 use crate::models::domain::{ClassCodegenLevel, ExtensionApi};
+use crate::models::header_json::HeaderJson;
 
 pub mod builtins;
 pub mod central_files;
@@ -20,7 +21,6 @@ pub mod constants;
 pub mod default_parameters;
 pub mod docs;
 pub mod enums;
-pub mod extension_interface;
 pub mod functions_common;
 pub mod gdext_build_struct;
 pub mod header_codegen;
@@ -56,7 +56,6 @@ pub fn generate_sys_module_file(sys_gen_path: &Path, submit_fn: &mut SubmitFn) {
 
         pub mod central;
         pub mod gdextension_interface;
-        pub mod interface;
     };
 
     submit_fn(sys_gen_path.join("mod.rs"), code);
@@ -72,6 +71,19 @@ pub fn generate_sys_central_file(
     submit_fn(sys_gen_path.join("central.rs"), sys_code);
 }
 
+/// Generate the `gdextension_interface.rs` module from JSON.
+///
+/// Produces all type definitions, per-interface-function typedefs, the `GDExtensionInterface` struct,
+/// and its `load()` impl.
+pub fn generate_sys_gdextension_interface_file(
+    header: &HeaderJson,
+    sys_gen_path: &Path,
+    submit_fn: &mut SubmitFn,
+) {
+    let code = header_codegen::generate_sys_gdextension_interface_from_json(header);
+    submit_fn(sys_gen_path.join("gdextension_interface.rs"), code);
+}
+
 pub fn generate_sys_classes_file(
     api: &ExtensionApi,
     sys_gen_path: &Path,

godot-codegen/src/generator/mod.rs

@@ -31,15 +31,13 @@ use proc_macro2::TokenStream;
 use crate::context::Context;
 use crate::generator::builtins::generate_builtin_class_files;
 use crate::generator::classes::generate_class_files;
-use crate::generator::extension_interface::{
-    generate_sys_gdextension_interface_file, generate_sys_interface_file,
-};
 use crate::generator::native_structures::generate_native_structures_files;
 use crate::generator::utility_functions::generate_utilities_file;
 use crate::generator::{
     generate_core_central_file, generate_core_mod_file, generate_sys_builtin_lifecycle_file,
     generate_sys_builtin_methods_file, generate_sys_central_file, generate_sys_classes_file,
-    generate_sys_module_file, generate_sys_utilities_file, virtual_definitions,
+    generate_sys_gdextension_interface_file, generate_sys_module_file, generate_sys_utilities_file,
+    virtual_definitions,
 };
 use crate::models::domain::{ApiView, ExtensionApi};
 use crate::models::header_json::HeaderJson;
@@ -136,9 +134,6 @@ pub fn generate_sys_files(sys_gen_path: &Path, watch: &mut godot_bindings::StopW
     generate_sys_gdextension_interface_file(&header_json, sys_gen_path, &mut submit_fn);
     watch.record("generate_gdextension_interface_file");
 
-    generate_sys_interface_file(&header_json, sys_gen_path, &mut submit_fn);
-    watch.record("generate_interface_file");
-
     generate_sys_module_file(sys_gen_path, &mut submit_fn);
     watch.record("generate_module_file");
 

godot-codegen/src/lib.rs

@@ -90,7 +90,6 @@ use std::sync::atomic::{AtomicBool, Ordering};
 pub use extras::*;
 pub use r#gen::central::*;
 pub use r#gen::gdextension_interface::*;
-pub use r#gen::interface::*;
 // Method tables
 pub use r#gen::table_builtins::*;
 pub use r#gen::table_builtins_lifecycle::*;