Made returns generic in local_future_into_py variants

Author: Andrew J Westlake

pytests/test_async_std_asyncio.rs

@@ -27,7 +27,7 @@ fn sleep<'p>(py: Python<'p>, secs: &'p PyAny) -> PyResult<&'p PyAny> {
 
     pyo3_asyncio::async_std::future_into_py(py, async move {
         task::sleep(Duration::from_secs(secs)).await;
-        Python::with_gil(|py| Ok(py.None()))
+        Ok(())
     })
 }
 

pytests/tokio_asyncio/mod.rs

@@ -26,7 +26,7 @@ fn sleep<'p>(py: Python<'p>, secs: &'p PyAny) -> PyResult<&'p PyAny> {
 
     pyo3_asyncio::tokio::future_into_py(py, async move {
         tokio::time::sleep(Duration::from_secs(secs)).await;
-        Python::with_gil(|py| Ok(py.None()))
+        Ok(())
     })
 }
 

src/async_std.rs

@@ -261,7 +261,7 @@ where
 ///         pyo3_asyncio::async_std::get_current_loop(py)?,
 ///         async move {
 ///             async_std::task::sleep(Duration::from_secs(secs)).await;
-///             Python::with_gil(|py| Ok(py.None()))
+///             Ok(())
 ///         }
 ///     )
 /// }
@@ -293,7 +293,7 @@ where
 ///     let secs = secs.extract()?;
 ///     pyo3_asyncio::async_std::future_into_py(py, async move {
 ///         async_std::task::sleep(Duration::from_secs(secs)).await;
-///         Python::with_gil(|py| Ok(py.None()))
+///         Ok(())
 ///     })
 /// }
 /// ```
@@ -327,7 +327,7 @@ where
 ///         pyo3_asyncio::async_std::get_current_loop(py)?,
 ///         async move {
 ///             async_std::task::sleep(Duration::from_secs(*secs)).await;
-///             Python::with_gil(|py| Ok(py.None()))
+///             Ok(())
 ///         }
 ///     )?.into())
 /// }
@@ -346,11 +346,12 @@ where
 /// # #[cfg(not(all(feature = "async-std-runtime", feature = "attributes")))]
 /// # fn main() {}
 /// ```
-pub fn local_future_into_py_with_loop<F>(event_loop: &PyAny, fut: F) -> PyResult<&PyAny>
+pub fn local_future_into_py_with_loop<F, T>(event_loop: &PyAny, fut: F) -> PyResult<&PyAny>
 where
-    F: Future<Output = PyResult<PyObject>> + 'static,
+    F: Future<Output = PyResult<T>> + 'static,
+    T: IntoPy<PyObject>,
 {
-    generic::local_future_into_py_with_loop::<AsyncStdRuntime, _>(event_loop, fut)
+    generic::local_future_into_py_with_loop::<AsyncStdRuntime, _, T>(event_loop, fut)
 }
 
 /// Convert a `!Send` Rust Future into a Python awaitable
@@ -373,7 +374,7 @@ where
 ///     let secs = Rc::new(secs);
 ///     pyo3_asyncio::async_std::local_future_into_py(py, async move {
 ///         async_std::task::sleep(Duration::from_secs(*secs)).await;
-///         Python::with_gil(|py| Ok(py.None()))
+///         Ok(())
 ///     })
 /// }
 ///
@@ -391,11 +392,12 @@ where
 /// # #[cfg(not(all(feature = "async-std-runtime", feature = "attributes")))]
 /// # fn main() {}
 /// ```
-pub fn local_future_into_py<F>(py: Python, fut: F) -> PyResult<&PyAny>
+pub fn local_future_into_py<F, T>(py: Python, fut: F) -> PyResult<&PyAny>
 where
-    F: Future<Output = PyResult<PyObject>> + 'static,
+    F: Future<Output = PyResult<T>> + 'static,
+    T: IntoPy<PyObject>,
 {
-    generic::local_future_into_py::<AsyncStdRuntime, _>(py, fut)
+    generic::local_future_into_py::<AsyncStdRuntime, _, T>(py, fut)
 }
 
 /// Convert a Python `awaitable` into a Rust Future

src/generic.rs

@@ -437,11 +437,11 @@ where
 /// #[pyfunction]
 /// fn sleep_for<'p>(py: Python<'p>, secs: &'p PyAny) -> PyResult<&'p PyAny> {
 ///     let secs = secs.extract()?;
-///     pyo3_asyncio::generic::future_into_py_with_loop::<MyCustomRuntime, _>(
+///     pyo3_asyncio::generic::future_into_py_with_loop::<MyCustomRuntime, _, _>(
 ///         pyo3_asyncio::generic::get_current_loop::<MyCustomRuntime>(py)?,
 ///         async move {
 ///             MyCustomRuntime::sleep(Duration::from_secs(secs)).await;
-///             Python::with_gil(|py| Ok(py.None()))
+///             Ok(())
 ///         }
 ///     )
 /// }
@@ -574,9 +574,9 @@ where
 /// #[pyfunction]
 /// fn sleep_for<'p>(py: Python<'p>, secs: &'p PyAny) -> PyResult<&'p PyAny> {
 ///     let secs = secs.extract()?;
-///     pyo3_asyncio::generic::future_into_py::<MyCustomRuntime, _>(py, async move {
+///     pyo3_asyncio::generic::future_into_py::<MyCustomRuntime, _, _>(py, async move {
 ///         MyCustomRuntime::sleep(Duration::from_secs(secs)).await;
-///         Python::with_gil(|py| Ok(py.None()))
+///         Ok(())
 ///     })
 /// }
 /// ```
@@ -764,19 +764,20 @@ where
 ///     // Rc is !Send so it cannot be passed into pyo3_asyncio::generic::future_into_py
 ///     let secs = Rc::new(secs);
 ///
-///     pyo3_asyncio::generic::local_future_into_py_with_loop::<MyCustomRuntime, _>(
+///     pyo3_asyncio::generic::local_future_into_py_with_loop::<MyCustomRuntime, _, _>(
 ///         pyo3_asyncio::get_running_loop(py)?,
 ///         async move {
 ///             MyCustomRuntime::sleep(Duration::from_secs(*secs)).await;
-///             Python::with_gil(|py| Ok(py.None()))
+///             Ok(())
 ///         }
 ///     )
 /// }
 /// ```
-pub fn local_future_into_py_with_loop<R, F>(event_loop: &PyAny, fut: F) -> PyResult<&PyAny>
+pub fn local_future_into_py_with_loop<R, F, T>(event_loop: &PyAny, fut: F) -> PyResult<&PyAny>
 where
     R: SpawnLocalExt,
-    F: Future<Output = PyResult<PyObject>> + 'static,
+    F: Future<Output = PyResult<T>> + 'static,
+    T: IntoPy<PyObject>,
 {
     let future_rx = create_future(event_loop)?;
     let future_tx1 = PyObject::from(future_rx);
@@ -798,8 +799,12 @@ where
                     return;
                 }
 
-                let _ = set_result(event_loop2.as_ref(py), future_tx1.as_ref(py), result)
-                    .map_err(dump_err(py));
+                let _ = set_result(
+                    event_loop2.as_ref(py),
+                    future_tx1.as_ref(py),
+                    result.map(|val| val.into_py(py)),
+                )
+                .map_err(dump_err(py));
             });
         })
         .await
@@ -914,16 +919,17 @@ where
 ///     // Rc is !Send so it cannot be passed into pyo3_asyncio::generic::future_into_py
 ///     let secs = Rc::new(secs);
 ///
-///     pyo3_asyncio::generic::local_future_into_py::<MyCustomRuntime, _>(py, async move {
+///     pyo3_asyncio::generic::local_future_into_py::<MyCustomRuntime, _, _>(py, async move {
 ///         MyCustomRuntime::sleep(Duration::from_secs(*secs)).await;
-///         Python::with_gil(|py| Ok(py.None()))
+///         Ok(())
 ///     })
 /// }
 /// ```
-pub fn local_future_into_py<R, F>(py: Python, fut: F) -> PyResult<&PyAny>
+pub fn local_future_into_py<R, F, T>(py: Python, fut: F) -> PyResult<&PyAny>
 where
     R: SpawnLocalExt,
-    F: Future<Output = PyResult<PyObject>> + 'static,
+    F: Future<Output = PyResult<T>> + 'static,
+    T: IntoPy<PyObject>,
 {
-    local_future_into_py_with_loop::<R, F>(get_current_loop::<R>(py)?, fut)
+    local_future_into_py_with_loop::<R, F, T>(get_current_loop::<R>(py)?, fut)
 }

src/tokio.rs

@@ -274,7 +274,7 @@ where
 ///         pyo3_asyncio::tokio::get_current_loop(py)?,
 ///         async move {
 ///             tokio::time::sleep(Duration::from_secs(secs)).await;
-///             Python::with_gil(|py| Ok(py.None()))
+///             Ok(())
 ///         }
 ///     )
 /// }
@@ -306,7 +306,7 @@ where
 ///     let secs = secs.extract()?;
 ///     pyo3_asyncio::tokio::future_into_py(py, async move {
 ///         tokio::time::sleep(Duration::from_secs(secs)).await;
-///         Python::with_gil(|py| Ok(py.None()))
+///         Ok(())
 ///     })
 /// }
 /// ```
@@ -341,7 +341,7 @@ where
 ///         pyo3_asyncio::tokio::get_current_loop(py)?,
 ///         async move {
 ///             tokio::time::sleep(Duration::from_secs(*secs)).await;
-///             Python::with_gil(|py| Ok(py.None()))
+///             Ok(())
 ///         }
 ///     )
 /// }
@@ -375,11 +375,12 @@ where
 /// # #[cfg(not(all(feature = "tokio-runtime", feature = "attributes")))]
 /// # fn main() {}
 /// ```
-pub fn local_future_into_py_with_loop<'p, F>(event_loop: &'p PyAny, fut: F) -> PyResult<&PyAny>
+pub fn local_future_into_py_with_loop<'p, F, T>(event_loop: &'p PyAny, fut: F) -> PyResult<&PyAny>
 where
-    F: Future<Output = PyResult<PyObject>> + 'static,
+    F: Future<Output = PyResult<T>> + 'static,
+    T: IntoPy<PyObject>,
 {
-    generic::local_future_into_py_with_loop::<TokioRuntime, _>(event_loop, fut)
+    generic::local_future_into_py_with_loop::<TokioRuntime, _, T>(event_loop, fut)
 }
 
 /// Convert a `!Send` Rust Future into a Python awaitable
@@ -402,7 +403,7 @@ where
 ///     let secs = Rc::new(secs);
 ///     pyo3_asyncio::tokio::local_future_into_py(py, async move {
 ///         tokio::time::sleep(Duration::from_secs(*secs)).await;
-///         Python::with_gil(|py| Ok(py.None()))
+///         Ok(())
 ///     })
 /// }
 ///
@@ -435,11 +436,12 @@ where
 /// # #[cfg(not(all(feature = "tokio-runtime", feature = "attributes")))]
 /// # fn main() {}
 /// ```
-pub fn local_future_into_py<F>(py: Python, fut: F) -> PyResult<&PyAny>
+pub fn local_future_into_py<F, T>(py: Python, fut: F) -> PyResult<&PyAny>
 where
-    F: Future<Output = PyResult<PyObject>> + 'static,
+    F: Future<Output = PyResult<T>> + 'static,
+    T: IntoPy<PyObject>,
 {
-    generic::local_future_into_py::<TokioRuntime, _>(py, fut)
+    generic::local_future_into_py::<TokioRuntime, _, T>(py, fut)
 }
 
 /// Convert a Python `awaitable` into a Rust Future