Drop IntoPyNativeFunc impl to fix Nightly/Beta breakages.

adrian17 · adrian17 · commit 585e6e5428c4 · 2019-04-12T19:28:09.000+02:00
diff --git a/vm/src/function.rs b/vm/src/function.rs
@@ -437,12 +437,6 @@ where
     }
 }
 
-impl IntoPyNativeFunc<PyFuncArgs, PyResult> for PyNativeFunc {
-    fn into_func(self) -> PyNativeFunc {
-        self
-    }
-}
-
 pub struct OwnedParam<T>(std::marker::PhantomData<T>);
 pub struct RefParam<T>(std::marker::PhantomData<T>);
 
diff --git a/wasm/lib/src/vm_class.rs b/wasm/lib/src/vm_class.rs
@@ -199,32 +199,31 @@ impl WASMVirtualMachine {
             fn error() -> JsValue {
                 TypeError::new("Unknown stdout option, please pass a function or 'console'").into()
             }
-            let print_fn: Box<Fn(&VirtualMachine, PyFuncArgs) -> PyResult> =
-                if let Some(s) = stdout.as_string() {
-                    match s.as_str() {
-                        "console" => Box::new(wasm_builtins::builtin_print_console),
-                        _ => return Err(error()),
-                    }
-                } else if stdout.is_function() {
-                    let func = js_sys::Function::from(stdout);
-                    Box::new(move |vm: &VirtualMachine, args: PyFuncArgs| -> PyResult {
+            let print_fn: PyObjectRef = if let Some(s) = stdout.as_string() {
+                match s.as_str() {
+                    "console" => vm.ctx.new_rustfunc(wasm_builtins::builtin_print_console),
+                    _ => return Err(error()),
+                }
+            } else if stdout.is_function() {
+                let func = js_sys::Function::from(stdout);
+                vm.ctx
+                    .new_rustfunc(move |vm: &VirtualMachine, args: PyFuncArgs| -> PyResult {
                         func.call1(
                             &JsValue::UNDEFINED,
                             &wasm_builtins::format_print_args(vm, args)?.into(),
                         )
                         .map_err(|err| convert::js_to_py(vm, err))?;
                         Ok(vm.get_none())
                     })
-                } else if stdout.is_undefined() || stdout.is_null() {
-                    fn noop(vm: &VirtualMachine, _args: PyFuncArgs) -> PyResult {
-                        Ok(vm.get_none())
-                    }
-                    Box::new(noop)
-                } else {
-                    return Err(error());
-                };
-            vm.set_attr(&vm.builtins, "print", vm.ctx.new_rustfunc(print_fn))
-                .unwrap();
+            } else if stdout.is_undefined() || stdout.is_null() {
+                fn noop(vm: &VirtualMachine, _args: PyFuncArgs) -> PyResult {
+                    Ok(vm.get_none())
+                }
+                vm.ctx.new_rustfunc(noop)
+            } else {
+                return Err(error());
+            };
+            vm.set_attr(&vm.builtins, "print", print_fn).unwrap();
             Ok(())
         })?
     }

Original file line number	Diff line number	Diff line change
`@@ -437,12 +437,6 @@ where`
`437`	`437`	`}`
`438`	`438`	`}`
`439`	`439`
`440`		`-impl IntoPyNativeFunc<PyFuncArgs, PyResult> for PyNativeFunc {`
`441`		`- fn into_func(self) -> PyNativeFunc {`
`442`		`- self`
`443`		`- }`
`444`		`-}`
`445`		`-`
`446`	`440`	`pub struct OwnedParam<T>(std::marker::PhantomData<T>);`
`447`	`441`	`pub struct RefParam<T>(std::marker::PhantomData<T>);`
`448`	`442`