Add factory impl for boxed fn and remove extra constructor

Author: OddCoincidence

vm/src/pyobject.rs

@@ -588,16 +588,6 @@ impl PyContext {
         )
     }
 
-    pub fn new_rustfunc_from_box(
-        &self,
-        function: Box<Fn(&mut VirtualMachine, PyFuncArgs) -> PyResult>,
-    ) -> PyObjectRef {
-        PyObject::new(
-            PyObjectPayload::RustFunction { function },
-            self.builtin_function_or_method_type(),
-        )
-    }
-
     pub fn new_frame(&self, code: PyObjectRef, scope: PyObjectRef) -> PyObjectRef {
         PyObject::new(
             PyObjectPayload::Frame {
@@ -1242,7 +1232,7 @@ tuple_from_py_func_args!(A, B, C);
 tuple_from_py_func_args!(A, B, C, D);
 tuple_from_py_func_args!(A, B, C, D, E);
 
-pub type PyNativeFunc = Box<dyn Fn(&mut VirtualMachine, PyFuncArgs) -> PyResult>;
+pub type PyNativeFunc = Box<dyn Fn(&mut VirtualMachine, PyFuncArgs) -> PyResult + 'static>;
 
 pub trait PyNativeFuncFactory<T, R> {
     fn create(self) -> PyNativeFunc;
@@ -1257,6 +1247,12 @@ where
     }
 }
 
+impl PyNativeFuncFactory<PyFuncArgs, PyResult> for PyNativeFunc {
+    fn create(self) -> PyNativeFunc {
+        self
+    }
+}
+
 macro_rules! py_native_func_factory_tuple {
     ($(($n:tt, $T:ident)),+) => {
         impl<F, $($T,)+ R> PyNativeFuncFactory<($($T,)+), R> for F
@@ -1378,7 +1374,7 @@ pub enum PyObjectPayload {
         dict: RefCell<PyAttributes>,
     },
     RustFunction {
-        function: Box<Fn(&mut VirtualMachine, PyFuncArgs) -> PyResult>,
+        function: PyNativeFunc,
     },
     Socket {
         socket: RefCell<Socket>,

wasm/lib/src/vm_class.rs

@@ -275,7 +275,7 @@ impl WASMVirtualMachine {
                         .into());
                     };
                 vm.ctx
-                    .set_attr(scope, "print", vm.ctx.new_rustfunc_from_box(print_fn));
+                    .set_attr(scope, "print", vm.ctx.new_rustfunc(print_fn));
                 Ok(())
             },
         )?