Remove RustPyFunc trait, just use Fn(..) everywhere

Author: coolreader18

vm/src/pyobject.rs

@@ -452,7 +452,7 @@ impl PyContext {
         )
     }
 
-    pub fn new_rustfunc<F: 'static + RustPyFunc>(
+    pub fn new_rustfunc<F: 'static + Fn(&mut VirtualMachine, PyFuncArgs) -> PyResult>(
         &self,
         function: F,
     ) -> PyObjectRef {
@@ -466,7 +466,7 @@ impl PyContext {
 
     pub fn new_rustfunc_from_box(
         &self,
-        function: Box<RustPyFunc>,
+        function: Box<Fn(&mut VirtualMachine, PyFuncArgs) -> PyResult>,
     ) -> PyObjectRef {
         PyObject::new(
             PyObjectKind::RustFunction { function },
@@ -478,7 +478,7 @@ impl PyContext {
         PyObject::new(PyObjectKind::Frame { frame: frame }, self.frame_type())
     }
 
-    pub fn new_property<F: 'static + RustPyFunc>(
+    pub fn new_property<F: 'static + Fn(&mut VirtualMachine, PyFuncArgs) -> PyResult>(
         &self,
         function: F,
     ) -> PyObjectRef {
@@ -523,7 +523,7 @@ impl PyContext {
         )
     }
 
-    pub fn new_member_descriptor<F: 'static + RustPyFunc>(
+    pub fn new_member_descriptor<F: 'static + Fn(&mut VirtualMachine, PyFuncArgs) -> PyResult>(
         &self,
         function: F,
     ) -> PyObjectRef {
@@ -783,9 +783,6 @@ impl PyFuncArgs {
     }
 }
 
-pub trait RustPyFunc: (Fn(&mut VirtualMachine, PyFuncArgs) -> PyResult) {}
-impl<T: Fn(&mut VirtualMachine, PyFuncArgs) -> PyResult> RustPyFunc for T {}
-
 /// Rather than determining the type of a python object, this enum is more
 /// a holder for the rust payload of a python object. It is more a carrier
 /// of rust data for a particular python object. Determine the python type
@@ -862,7 +859,7 @@ pub enum PyObjectKind {
         dict: PyObjectRef,
     },
     RustFunction {
-        function: Box<RustPyFunc>,
+        function: Box<Fn(&mut VirtualMachine, PyFuncArgs) -> PyResult>,
     },
 }
 

wasm/lib/src/lib.rs

@@ -148,7 +148,7 @@ pub fn eval_py(source: &str, options: Option<Object>) -> Result<JsValue, JsValue
     };
     let mut vm = VirtualMachine::new();
 
-    let print_fn: Box<pyobject::RustPyFunc> = match stdout {
+    let print_fn: Box<Fn(&mut VirtualMachine, PyFuncArgs) -> PyResult> = match stdout {
         Some(val) => {
             if let Some(selector) = val.as_string() {
                 Box::new(