Deprecated generic with_loop and cancellable variants, fixed warnings

Author: Andrew J Westlake

src/async_std.rs

@@ -280,6 +280,7 @@ where
     since = "0.15.0",
     note = "Use pyo3_asyncio::async_std::future_into_py_with_locals instead"
 )]
+#[allow(deprecated)]
 pub fn future_into_py_with_loop<F>(event_loop: &PyAny, fut: F) -> PyResult<&PyAny>
 where
     F: Future<Output = PyResult<PyObject>> + Send + 'static,
@@ -324,6 +325,7 @@ where
     since = "0.15.0",
     note = "Use pyo3_asyncio::async_std::future_into_py_with_locals instead"
 )]
+#[allow(deprecated)]
 pub fn cancellable_future_into_py_with_loop<F>(event_loop: &PyAny, fut: F) -> PyResult<&PyAny>
 where
     F: Future<Output = PyResult<PyObject>> + Send + 'static,
@@ -395,6 +397,7 @@ where
     since = "0.15.0",
     note = "Use pyo3_asyncio::async_std::future_into_py instead"
 )]
+#[allow(deprecated)]
 pub fn cancellable_future_into_py<F>(py: Python, fut: F) -> PyResult<&PyAny>
 where
     F: Future<Output = PyResult<PyObject>> + Send + 'static,
@@ -447,6 +450,7 @@ where
     since = "0.15.0",
     note = "Use pyo3_asyncio::async_std::local_future_into_py_with_locals instead"
 )]
+#[allow(deprecated)]
 pub fn local_future_into_py_with_loop<F>(event_loop: &PyAny, fut: F) -> PyResult<&PyAny>
 where
     F: Future<Output = PyResult<PyObject>> + 'static,
@@ -506,6 +510,7 @@ where
     since = "0.15.0",
     note = "Use pyo3_asyncio::async_std::local_future_into_py_with_locals instead"
 )]
+#[allow(deprecated)]
 pub fn local_cancellable_future_into_py_with_loop<F>(event_loop: &PyAny, fut: F) -> PyResult<&PyAny>
 where
     F: Future<Output = PyResult<PyObject>> + 'static,
@@ -607,6 +612,7 @@ where
     since = "0.15.0",
     note = "Use pyo3_asyncio::async_std::local_future_into_py instead"
 )]
+#[allow(deprecated)]
 pub fn local_cancellable_future_into_py<F>(py: Python, fut: F) -> PyResult<&PyAny>
 where
     F: Future<Output = PyResult<PyObject>> + 'static,

src/generic.rs

@@ -649,6 +649,10 @@ where
 ///     )
 /// }
 /// ```
+#[deprecated(
+    since = "0.15.0",
+    note = "Use pyo3_asyncio::generic::future_into_py_with_locals instead"
+)]
 pub fn future_into_py_with_loop<R, F>(event_loop: &PyAny, fut: F) -> PyResult<&PyAny>
 where
     R: Runtime + ContextExt,
@@ -826,6 +830,12 @@ impl PyDoneCallback {
 ///     )
 /// }
 /// ```
+
+#[deprecated(
+    since = "0.15.0",
+    note = "Use pyo3_asyncio::generic::future_into_py_with_locals instead"
+)]
+#[allow(deprecated)]
 pub fn cancellable_future_into_py_with_loop<R, F>(event_loop: &PyAny, fut: F) -> PyResult<&PyAny>
 where
     R: Runtime + ContextExt,
@@ -1010,12 +1020,16 @@ where
 ///     })
 /// }
 /// ```
+#[deprecated(
+    since = "0.15.0",
+    note = "Use pyo3_asyncio::generic::future_into_py instead"
+)]
 pub fn cancellable_future_into_py<R, F>(py: Python, fut: F) -> PyResult<&PyAny>
 where
     R: Runtime + ContextExt,
     F: Future<Output = PyResult<PyObject>> + Send + 'static,
 {
-    cancellable_future_into_py_with_loop::<R, F>(get_current_loop::<R>(py)?, fut)
+    future_into_py::<R, F>(py, fut)
 }
 
 /// Convert a Rust Future into a Python awaitable with a generic runtime
@@ -1482,6 +1496,10 @@ where
 ///     )
 /// }
 /// ```
+#[deprecated(
+    since = "0.15.0",
+    note = "Use pyo3_asyncio::generic::local_future_into_py_with_locals instead"
+)]
 pub fn local_cancellable_future_into_py_with_loop<R, F>(
     event_loop: &PyAny,
     fut: F,
@@ -1599,7 +1617,7 @@ where
     R: Runtime + ContextExt + SpawnLocalExt + LocalContextExt,
     F: Future<Output = PyResult<PyObject>> + 'static,
 {
-    local_future_into_py_with_loop::<R, F>(get_current_loop::<R>(py)?, fut)
+    local_future_into_py_with_locals::<R, F>(py, get_current_locals::<R>(py)?, fut)
 }
 /// Convert a Rust Future into a Python awaitable with a generic runtime
 ///
@@ -1711,10 +1729,15 @@ where
 ///     )
 /// }
 /// ```
+///
+#[deprecated(
+    since = "0.15.0",
+    note = "Use pyo3_asyncio::generic::local_future_into_py instead"
+)]
 pub fn local_cancellable_future_into_py<R, F>(py: Python, fut: F) -> PyResult<&PyAny>
 where
     R: Runtime + ContextExt + SpawnLocalExt + LocalContextExt,
     F: Future<Output = PyResult<PyObject>> + 'static,
 {
-    local_cancellable_future_into_py_with_loop::<R, F>(get_current_loop::<R>(py)?, fut)
+    local_future_into_py::<R, F>(py, fut)
 }

src/tokio.rs

@@ -296,6 +296,7 @@ where
     since = "0.15.0",
     note = "Use pyo3_asyncio::tokio::future_into_py_with_locals instead"
 )]
+#[allow(deprecated)]
 pub fn future_into_py_with_loop<F>(event_loop: &PyAny, fut: F) -> PyResult<&PyAny>
 where
     F: Future<Output = PyResult<PyObject>> + Send + 'static,
@@ -340,6 +341,7 @@ where
     since = "0.15.0",
     note = "Use pyo3_asyncio::tokio::future_into_py_with_locals instead"
 )]
+#[allow(deprecated)]
 pub fn cancellable_future_into_py_with_loop<F>(event_loop: &PyAny, fut: F) -> PyResult<&PyAny>
 where
     F: Future<Output = PyResult<PyObject>> + Send + 'static,
@@ -411,6 +413,7 @@ where
     since = "0.15.0",
     note = "Use pyo3_asyncio::tokio::future_into_py instead"
 )]
+#[allow(deprecated)]
 pub fn cancellable_future_into_py<F>(py: Python, fut: F) -> PyResult<&PyAny>
 where
     F: Future<Output = PyResult<PyObject>> + Send + 'static,
@@ -479,6 +482,7 @@ where
     since = "0.15.0",
     note = "Use pyo3_asyncio::tokio::local_future_into_py_with_locals instead"
 )]
+#[allow(deprecated)]
 pub fn local_future_into_py_with_loop<'p, F>(event_loop: &'p PyAny, fut: F) -> PyResult<&PyAny>
 where
     F: Future<Output = PyResult<PyObject>> + 'static,
@@ -623,6 +627,7 @@ where
     since = "0.15.0",
     note = "Use pyo3_asyncio::tokio::local_future_into_py_with_locals instead"
 )]
+#[allow(deprecated)]
 pub fn local_cancellable_future_into_py_with_loop<'p, F>(
     event_loop: &'p PyAny,
     fut: F,
@@ -757,6 +762,7 @@ where
     since = "0.15.0",
     note = "Use pyo3_asyncio::tokio::local_future_into_py instead"
 )]
+#[allow(deprecated)]
 pub fn local_cancellable_future_into_py<F>(py: Python, fut: F) -> PyResult<&PyAny>
 where
     F: Future<Output = PyResult<PyObject>> + 'static,