Made return types generic for future_into_py variants

Author: awestlake87

pytests/test_async_std_asyncio.rs

@@ -135,9 +135,10 @@ async fn test_other_awaitables() -> PyResult<()> {
 #[pyo3_asyncio::async_std::test]
 async fn test_panic() -> PyResult<()> {
     let fut = Python::with_gil(|py| -> PyResult<_> {
-        pyo3_asyncio::async_std::into_future(pyo3_asyncio::async_std::future_into_py(py, async {
-            panic!("this panic was intentional!")
-        })?)
+        pyo3_asyncio::async_std::into_future(pyo3_asyncio::async_std::future_into_py::<_, ()>(
+            py,
+            async { panic!("this panic was intentional!") },
+        )?)
     })?;
 
     match fut.await {

pytests/tokio_asyncio/mod.rs

@@ -149,7 +149,7 @@ fn test_local_future_into_py(event_loop: PyObject) -> PyResult<()> {
 #[pyo3_asyncio::tokio::test]
 async fn test_panic() -> PyResult<()> {
     let fut = Python::with_gil(|py| -> PyResult<_> {
-        pyo3_asyncio::tokio::into_future(pyo3_asyncio::tokio::future_into_py(py, async {
+        pyo3_asyncio::tokio::into_future(pyo3_asyncio::tokio::future_into_py::<_, ()>(py, async {
             panic!("this panic was intentional!")
         })?)
     })?;

src/async_std.rs

@@ -266,11 +266,12 @@ where
 ///     )
 /// }
 /// ```
-pub fn future_into_py_with_loop<F>(event_loop: &PyAny, fut: F) -> PyResult<&PyAny>
+pub fn future_into_py_with_loop<F, T>(event_loop: &PyAny, fut: F) -> PyResult<&PyAny>
 where
-    F: Future<Output = PyResult<PyObject>> + Send + 'static,
+    F: Future<Output = PyResult<T>> + Send + 'static,
+    T: IntoPy<PyObject>,
 {
-    generic::future_into_py_with_loop::<AsyncStdRuntime, F>(event_loop, fut)
+    generic::future_into_py_with_loop::<AsyncStdRuntime, F, T>(event_loop, fut)
 }
 
 /// Convert a Rust Future into a Python awaitable
@@ -296,11 +297,12 @@ where
 ///     })
 /// }
 /// ```
-pub fn future_into_py<F>(py: Python, fut: F) -> PyResult<&PyAny>
+pub fn future_into_py<F, T>(py: Python, fut: F) -> PyResult<&PyAny>
 where
-    F: Future<Output = PyResult<PyObject>> + Send + 'static,
+    F: Future<Output = PyResult<T>> + Send + 'static,
+    T: IntoPy<PyObject>,
 {
-    generic::future_into_py::<AsyncStdRuntime, _>(py, fut)
+    generic::future_into_py::<AsyncStdRuntime, _, T>(py, fut)
 }
 
 /// Convert a `!Send` Rust Future into a Python awaitable

src/generic.rs

@@ -146,9 +146,9 @@ where
     R: Runtime,
     F: Future<Output = PyResult<()>> + Send + 'static,
 {
-    let coro = future_into_py_with_loop::<R, _>(event_loop, async move {
+    let coro = future_into_py_with_loop::<R, _, ()>(event_loop, async move {
         fut.await?;
-        Ok(Python::with_gil(|py| py.None()))
+        Ok(())
     })?;
 
     event_loop.call_method1("run_until_complete", (coro,))?;
@@ -446,10 +446,11 @@ where
 ///     )
 /// }
 /// ```
-pub fn future_into_py_with_loop<R, F>(event_loop: &PyAny, fut: F) -> PyResult<&PyAny>
+pub fn future_into_py_with_loop<R, F, T>(event_loop: &PyAny, fut: F) -> PyResult<&PyAny>
 where
     R: Runtime,
-    F: Future<Output = PyResult<PyObject>> + Send + 'static,
+    F: Future<Output = PyResult<T>> + Send + 'static,
+    T: IntoPy<PyObject>,
 {
     let future_rx = create_future(event_loop)?;
     let future_tx1 = PyObject::from(future_rx);
@@ -471,8 +472,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
@@ -575,12 +580,13 @@ where
 ///     })
 /// }
 /// ```
-pub fn future_into_py<R, F>(py: Python, fut: F) -> PyResult<&PyAny>
+pub fn future_into_py<R, F, T>(py: Python, fut: F) -> PyResult<&PyAny>
 where
     R: Runtime,
-    F: Future<Output = PyResult<PyObject>> + Send + 'static,
+    F: Future<Output = PyResult<T>> + Send + 'static,
+    T: IntoPy<PyObject>,
 {
-    future_into_py_with_loop::<R, F>(get_current_loop::<R>(py)?, fut)
+    future_into_py_with_loop::<R, F, T>(get_current_loop::<R>(py)?, fut)
 }
 
 /// Convert a Rust Future into a Python awaitable with a generic runtime
@@ -668,7 +674,7 @@ where
     R: Runtime,
     F: Future<Output = PyResult<PyObject>> + Send + 'static,
 {
-    Ok(future_into_py_with_loop::<R, F>(get_event_loop(py), fut)?.into())
+    Ok(future_into_py_with_loop::<R, F, PyObject>(get_event_loop(py), fut)?.into())
 }
 
 /// Convert a `!Send` Rust Future into a Python awaitable with a generic runtime

src/tokio.rs

@@ -279,11 +279,12 @@ where
 ///     )
 /// }
 /// ```
-pub fn future_into_py_with_loop<F>(event_loop: &PyAny, fut: F) -> PyResult<&PyAny>
+pub fn future_into_py_with_loop<F, T>(event_loop: &PyAny, fut: F) -> PyResult<&PyAny>
 where
-    F: Future<Output = PyResult<PyObject>> + Send + 'static,
+    F: Future<Output = PyResult<T>> + Send + 'static,
+    T: IntoPy<PyObject>,
 {
-    generic::future_into_py_with_loop::<TokioRuntime, F>(event_loop, fut)
+    generic::future_into_py_with_loop::<TokioRuntime, F, T>(event_loop, fut)
 }
 
 /// Convert a Rust Future into a Python awaitable
@@ -309,11 +310,12 @@ where
 ///     })
 /// }
 /// ```
-pub fn future_into_py<F>(py: Python, fut: F) -> PyResult<&PyAny>
+pub fn future_into_py<F, T>(py: Python, fut: F) -> PyResult<&PyAny>
 where
-    F: Future<Output = PyResult<PyObject>> + Send + 'static,
+    F: Future<Output = PyResult<T>> + Send + 'static,
+    T: IntoPy<PyObject>,
 {
-    generic::future_into_py::<TokioRuntime, _>(py, fut)
+    generic::future_into_py::<TokioRuntime, _, T>(py, fut)
 }
 
 /// Convert a `!Send` Rust Future into a Python awaitable