Merge pull request #513 from davidcole1340/revert-511-373-stubs-missing-for-rustclosure

Revert "feat(stubs): add stubs for `RustClosure`"

Author: Xenira

src/args.rs

@@ -203,7 +203,6 @@ impl From<Arg<'_>> for Parameter {
             name: val.name.into(),
             ty: Some(val.r#type).into(),
             nullable: val.allow_null,
-            variadic: val.variadic,
             default: val.default_value.map(abi::RString::from).into(),
         }
     }

src/describe/mod.rs

@@ -76,25 +76,19 @@ pub struct Module {
 impl From<ModuleBuilder<'_>> for Module {
     fn from(builder: ModuleBuilder) -> Self {
         let functions = builder.functions;
-
-        #[allow(unused_mut)]
-        let mut classes = builder
-            .classes
-            .into_iter()
-            .map(|c| c().into())
-            .collect::<StdVec<_>>();
-
-        #[cfg(feature = "closure")]
-        classes.push(Class::closure());
-
         Self {
             name: builder.name.into(),
             functions: functions
                 .into_iter()
                 .map(Function::from)
                 .collect::<StdVec<_>>()
                 .into(),
-            classes: classes.into(),
+            classes: builder
+                .classes
+                .into_iter()
+                .map(|c| c().into())
+                .collect::<StdVec<_>>()
+                .into(),
             constants: builder
                 .constants
                 .into_iter()
@@ -157,8 +151,6 @@ pub struct Parameter {
     pub ty: Option<DataType>,
     /// Whether the parameter is nullable.
     pub nullable: bool,
-    /// Whether the parameter is variadic.
-    pub variadic: bool,
     /// Default value of the parameter.
     pub default: Option<RString>,
 }
@@ -183,43 +175,6 @@ pub struct Class {
     pub constants: Vec<Constant>,
 }
 
-#[cfg(feature = "closure")]
-impl Class {
-    /// Creates a new class representing a Rust closure used for generating
-    /// the stubs if the `closure` feature is enabled.
-    #[must_use]
-    pub fn closure() -> Self {
-        Self {
-            name: "RustClosure".into(),
-            docs: DocBlock(StdVec::new().into()),
-            extends: Option::None,
-            implements: StdVec::new().into(),
-            properties: StdVec::new().into(),
-            methods: vec![Method {
-                name: "__invoke".into(),
-                docs: DocBlock(StdVec::new().into()),
-                ty: MethodType::Member,
-                params: vec![Parameter {
-                    name: "args".into(),
-                    ty: Option::Some(DataType::Mixed),
-                    nullable: false,
-                    variadic: true,
-                    default: Option::None,
-                }]
-                .into(),
-                retval: Option::Some(Retval {
-                    ty: DataType::Mixed,
-                    nullable: false,
-                }),
-                r#static: false,
-                visibility: Visibility::Public,
-            }]
-            .into(),
-            constants: StdVec::new().into(),
-        }
-    }
-}
-
 impl From<ClassBuilder> for Class {
     fn from(val: ClassBuilder) -> Self {
         Self {
@@ -471,8 +426,6 @@ impl From<(String, Box<dyn IntoConst + Send>, DocComments)> for Constant {
 #[cfg(test)]
 mod tests {
     #![cfg_attr(windows, feature(abi_vectorcall))]
-    use cfg_if::cfg_if;
-
     use super::*;
 
     use crate::{args::Arg, test::test_function};
@@ -507,13 +460,7 @@ mod tests {
         let module: Module = builder.into();
         assert_eq!(module.name, "test".into());
         assert_eq!(module.functions.len(), 1);
-        cfg_if! {
-            if #[cfg(feature = "closure")] {
-                assert_eq!(module.classes.len(), 1);
-            } else {
-                assert_eq!(module.classes.len(), 0);
-            }
-        }
+        assert_eq!(module.classes.len(), 0);
         assert_eq!(module.constants.len(), 0);
     }
 
@@ -532,7 +479,6 @@ mod tests {
                 name: "foo".into(),
                 ty: Option::Some(DataType::Long),
                 nullable: false,
-                variadic: false,
                 default: Option::None,
             }]
             .into()
@@ -622,7 +568,6 @@ mod tests {
                 name: "foo".into(),
                 ty: Option::Some(DataType::Long),
                 nullable: false,
-                variadic: false,
                 default: Option::None,
             }]
             .into()

src/describe/stub.rs

@@ -154,10 +154,6 @@ impl ToStub for Parameter {
             write!(buf, " ")?;
         }
 
-        if self.variadic {
-            write!(buf, "...")?;
-        }
-
         write!(buf, "${}", self.name)
     }
 }