PyPy doesn't have pyo3::ffi::PyObject_CallOneArg

Author: gi0baro

Cargo.lock

@@ -39,6 +39,9 @@ socket2 = "=0.5"
 [target.'cfg(unix)'.dependencies]
 libc = "0.2.159"
 
+[build-dependencies]
+pyo3-build-config = "=0.23"
+
 [profile.release]
 codegen-units = 1
 debug = false

Cargo.toml

@@ -0,0 +1,3 @@
+fn main() {
+    pyo3_build_config::use_pyo3_cfgs();
+}

build.rs

@@ -4,9 +4,12 @@ use std::sync::{atomic, Arc};
 use crate::{
     event_loop::{EventLoop, EventLoopRunState},
     log::LogExc,
-    py::{run_in_ctx, run_in_ctx0, run_in_ctx1},
+    py::{run_in_ctx, run_in_ctx0},
 };
 
+#[cfg(not(PyPy))]
+use crate::py::run_in_ctx1;
+
 pub(crate) trait Handle {
     fn run(self: Arc<Self>, py: Python, event_loop: &EventLoop, state: &mut EventLoopRunState);
     fn cancel(&self) {}
@@ -119,6 +122,7 @@ impl Handle for CBHandleNoArgs {
 impl Handle for CBHandleOneArg {
     handle_cancel_impl!();
 
+    #[cfg(not(PyPy))]
     fn run(self: Arc<Self>, py: Python, event_loop: &EventLoop, _state: &mut EventLoopRunState) {
         let ctx = self.context.as_ptr();
         let cb = self.callback.as_ptr();
@@ -133,6 +137,22 @@ impl Handle for CBHandleOneArg {
             _ = event_loop.log_exception(py, err_ctx);
         }
     }
+
+    #[cfg(PyPy)]
+    fn run(self: Arc<Self>, py: Python, event_loop: &EventLoop, _state: &mut EventLoopRunState) {
+        let ctx = self.context.as_ptr();
+        let cb = self.callback.as_ptr();
+        let args = (self.arg.clone_ref(py),).into_pyobject(py).unwrap().into_ptr();
+
+        if let Err(err) = run_in_ctx!(py, ctx, cb, args) {
+            let err_ctx = LogExc::cb_handle(
+                err,
+                format!("Exception in callback {:?}", self.callback.bind(py)),
+                PyHandle { handle: self }.into_py_any(py).unwrap(),
+            );
+            _ = event_loop.log_exception(py, err_ctx);
+        }
+    }
 }
 
 #[pyclass(frozen, name = "CBHandle", module = "rloop._rloop")]

src/handles.rs

@@ -64,6 +64,7 @@ macro_rules! run_in_ctx0 {
     };
 }
 
+#[cfg(not(PyPy))]
 macro_rules! run_in_ctx1 {
     ($py:expr, $ctx:expr, $cb:expr, $arg:expr) => {
         unsafe {
@@ -88,4 +89,6 @@ macro_rules! run_in_ctx {
 
 pub(crate) use run_in_ctx;
 pub(crate) use run_in_ctx0;
+
+#[cfg(not(PyPy))]
 pub(crate) use run_in_ctx1;