Clean from duplicated code

Author: Norbytus

crates/macros/src/interface.rs

@@ -54,12 +54,11 @@ impl ToTokens for InterfaceData<'_> {
         let name = &self.name;
         let implements = &self.attrs.extends;
         let methods_sig = &self.methods;
-        let path = &self.path;
         let constants = &self.constants;
 
-        let constructor = self.constructor
+        let _constructor = self.constructor
             .as_ref()
-            .map(|func| func.constructor_meta(&path))
+            .map(|func| func.constructor_meta(&self.path))
             .option_tokens();
 
         quote! {
@@ -209,15 +208,7 @@ impl<'a> Parse<'a, InterfaceData<'a>> for ItemTrait {
         let interface_name = format_ident!("PhpInterface{ident}");
         let ts = quote! { #interface_name };
         let path: Path = syn::parse2(ts)?;
-        let mut data = InterfaceData::new(
-            ident,
-            name,
-            path,
-            attrs,
-            None,
-            Vec::new(),
-            Vec::new()
-        );
+        let mut data = InterfaceData::new(ident, name, path, attrs, None, Vec::new(), Vec::new());
 
         for item in &mut self.items {
             match item {
@@ -230,7 +221,7 @@ impl<'a> Parse<'a, InterfaceData<'a>> for ItemTrait {
                             }
                         }
                     };
-                },
+                }
                 TraitItem::Const(c) => data.constants.push(c.parse()?),
                 _ => {}
             }
@@ -265,15 +256,10 @@ impl<'a> Parse<'a, MethodKind<'a>> for TraitItemFn {
             bail!(self => "Interface could not have default impl");
         }
 
-        let php_attr = PhpFunctionInterfaceAttribute::from_attributes(
-            &self.attrs
-        )?;
+        let php_attr = PhpFunctionInterfaceAttribute::from_attributes(&self.attrs)?;
         self.attrs.clean_php();
 
-        let mut args = Args::parse_from_fnargs(
-            self.sig.inputs.iter(),
-            php_attr.defaults
-        )?;
+        let mut args = Args::parse_from_fnargs(self.sig.inputs.iter(), php_attr.defaults)?;
 
         let docs = get_docs(&php_attr.attrs)?;
 

src/builders/class.rs

@@ -258,7 +258,6 @@ impl ClassBuilder {
             },
             MethodFlags::Public,
         )
-
     }
 
     /// Function to register the class with PHP. This function is called after

src/builders/interface.rs

@@ -7,7 +7,6 @@ mod enum_builder;
 mod function;
 #[cfg(all(php82, feature = "embed"))]
 mod ini;
-mod interface;
 mod module;
 #[cfg(feature = "embed")]
 mod sapi;

src/builders/mod.rs

@@ -4,12 +4,12 @@ use super::{ClassBuilder, FunctionBuilder};
 #[cfg(feature = "enum")]
 use crate::{builders::enum_builder::EnumBuilder, enum_::RegisteredEnum};
 use crate::{
-    builders::interface::InterfaceBuilder,
     class::RegisteredClass,
     constant::IntoConst,
     describe::DocComments,
     error::Result,
     ffi::{ext_php_rs_php_build_id, ZEND_MODULE_API_NO},
+    flags::ClassFlags,
     zend::{FunctionEntry, ModuleEntry},
     PHP_DEBUG, PHP_ZTS,
 };
@@ -201,7 +201,7 @@ impl ModuleBuilder<'_> {
     /// * Panics if a constant could not be registered.
     pub fn interface<T: RegisteredClass>(mut self) -> Self {
         self.interfaces.push(|| {
-            let mut builder = InterfaceBuilder::new(T::CLASS_NAME);
+            let mut builder = ClassBuilder::new(T::CLASS_NAME);
             for (method, flags) in T::method_builders() {
                 builder = builder.method(method, flags);
             }
@@ -214,13 +214,12 @@ impl ModuleBuilder<'_> {
                     .expect("Failed to register constant");
             }
 
-            let mut class_builder = builder.builder();
-
             if let Some(modifier) = T::BUILDER_MODIFIER {
-                class_builder = modifier(class_builder);
+                builder = modifier(builder);
             }
 
-            class_builder
+            builder = builder.flags(ClassFlags::Interface);
+            builder
                 .object_override::<T>()
                 .registration(|ce| {
                     T::get_metadata().set_ce(ce);

src/builders/module.rs

@@ -227,7 +227,7 @@ impl Class {
                 }),
                 r#static: false,
                 visibility: Visibility::Public,
-                r#abstract: false
+                r#abstract: false,
             }]
             .into(),
             constants: StdVec::new().into(),
@@ -274,7 +274,7 @@ impl From<ClassBuilder> for Class {
                 .map(Constant::from)
                 .collect::<StdVec<_>>()
                 .into(),
-            flags: flags
+            flags: flags,
         }
     }
 }

src/describe/mod.rs

@@ -1,7 +1,7 @@
-use ext_php_rs::types::ZendClassObject;
-use ext_php_rs::zend::ce;
 use ext_php_rs::php_interface;
 use ext_php_rs::prelude::ModuleBuilder;
+use ext_php_rs::types::ZendClassObject;
+use ext_php_rs::zend::ce;
 
 #[php_interface]
 #[php(extends(ce = ce::throwable, stub = "\\Throwable"))]