Fixed compile errors after upgrading pyo3 version

Author: Andrew J Westlake

pyo3-asyncio-macros/src/lib.rs

@@ -188,11 +188,9 @@ pub fn async_std_test(_attr: TokenStream, item: TokenStream) -> TokenStream {
         #fn_impl
 
         pyo3_asyncio::inventory::submit! {
-            #![crate = pyo3_asyncio] {
-                pyo3_asyncio::testing::Test {
-                    name: format!("{}::{}", std::module_path!(), stringify!(#name)),
-                    test_fn: &#name
-                }
+            pyo3_asyncio::testing::Test {
+                name: concat!(std::module_path!(), "::", stringify!(#name)),
+                test_fn: &#name
             }
         }
     };
@@ -299,11 +297,9 @@ pub fn tokio_test(_attr: TokenStream, item: TokenStream) -> TokenStream {
         #fn_impl
 
         pyo3_asyncio::inventory::submit! {
-            #![crate = pyo3_asyncio] {
-                pyo3_asyncio::testing::Test {
-                    name: format!("{}::{}", std::module_path!(), stringify!(#name)),
-                    test_fn: &#name
-                }
+            pyo3_asyncio::testing::Test {
+                name: concat!(std::module_path!(), "::", stringify!(#name)),
+                test_fn: &#name
             }
         }
     };

pytests/test_async_std_asyncio.rs

@@ -101,7 +101,7 @@ async fn test_panic() -> PyResult<()> {
     match fut.await {
         Ok(_) => panic!("coroutine should panic"),
         Err(e) => Python::with_gil(|py| {
-            if e.is_instance::<pyo3_asyncio::err::RustPanic>(py) {
+            if e.is_instance_of::<pyo3_asyncio::err::RustPanic>(py) {
                 Ok(())
             } else {
                 panic!("expected RustPanic err")
@@ -220,14 +220,16 @@ fn test_local_cancel(event_loop: PyObject) -> PyResult<()> {
 #[pymodule]
 fn test_mod(_py: Python, m: &PyModule) -> PyResult<()> {
     #![allow(deprecated)]
-    #[pyfn(m, "sleep")]
+    #[pyfunction]
     fn sleep(py: Python) -> PyResult<&PyAny> {
         pyo3_asyncio::async_std::future_into_py(py, async move {
             async_std::task::sleep(Duration::from_millis(500)).await;
             Ok(())
         })
     }
 
+    m.add_function(wrap_pyfunction!(sleep, m)?)?;
+
     Ok(())
 }
 
@@ -265,8 +267,8 @@ fn test_multiple_asyncio_run() -> PyResult<()> {
 #[pymodule]
 fn cvars_mod(_py: Python, m: &PyModule) -> PyResult<()> {
     #![allow(deprecated)]
-    #[pyfn(m, "async_callback")]
-    fn async_callback(py: Python, callback: PyObject) -> PyResult<&PyAny> {
+    #[pyfunction]
+    pub(crate) fn async_callback(py: Python, callback: PyObject) -> PyResult<&PyAny> {
         pyo3_asyncio::async_std::future_into_py(py, async move {
             Python::with_gil(|py| {
                 pyo3_asyncio::async_std::into_future(callback.as_ref(py).call0()?)
@@ -277,6 +279,8 @@ fn cvars_mod(_py: Python, m: &PyModule) -> PyResult<()> {
         })
     }
 
+    m.add_function(wrap_pyfunction!(async_callback, m)?)?;
+
     Ok(())
 }
 

pytests/tokio_asyncio/mod.rs

@@ -121,7 +121,7 @@ async fn test_panic() -> PyResult<()> {
     match fut.await {
         Ok(_) => panic!("coroutine should panic"),
         Err(e) => Python::with_gil(|py| {
-            if e.is_instance::<pyo3_asyncio::err::RustPanic>(py) {
+            if e.is_instance_of::<pyo3_asyncio::err::RustPanic>(py) {
                 Ok(())
             } else {
                 panic!("expected RustPanic err")
@@ -226,14 +226,16 @@ fn test_local_cancel(event_loop: PyObject) -> PyResult<()> {
 #[pymodule]
 fn test_mod(_py: Python, m: &PyModule) -> PyResult<()> {
     #![allow(deprecated)]
-    #[pyfn(m, "sleep")]
+    #[pyfunction]
     fn sleep(py: Python) -> PyResult<&PyAny> {
         pyo3_asyncio::tokio::future_into_py(py, async move {
             tokio::time::sleep(Duration::from_millis(500)).await;
             Ok(())
         })
     }
 
+    m.add_function(wrap_pyfunction!(sleep, m)?)?;
+
     Ok(())
 }
 
@@ -271,7 +273,7 @@ fn test_multiple_asyncio_run() -> PyResult<()> {
 #[pymodule]
 fn cvars_mod(_py: Python, m: &PyModule) -> PyResult<()> {
     #![allow(deprecated)]
-    #[pyfn(m, "async_callback")]
+    #[pyfunction]
     fn async_callback(py: Python, callback: PyObject) -> PyResult<&PyAny> {
         pyo3_asyncio::tokio::future_into_py(py, async move {
             Python::with_gil(|py| pyo3_asyncio::tokio::into_future(callback.as_ref(py).call0()?))?
@@ -281,6 +283,8 @@ fn cvars_mod(_py: Python, m: &PyModule) -> PyResult<()> {
         })
     }
 
+    m.add_function(wrap_pyfunction!(async_callback, m)?)?;
+
     Ok(())
 }
 

src/testing.rs

@@ -181,7 +181,7 @@
 
 use std::{future::Future, pin::Pin};
 
-use clap::{App, Arg};
+use clap::{Arg, Command};
 use futures::stream::{self, StreamExt};
 use pyo3::prelude::*;
 
@@ -232,9 +232,9 @@ impl Default for Args {
 /// <TESTNAME>    If specified, only run tests containing this string in their names
 /// ```
 pub fn parse_args() -> Args {
-    let matches = App::new("PyO3 Asyncio Test Suite")
+    let matches = Command::new("PyO3 Asyncio Test Suite")
         .arg(
-            Arg::with_name("TESTNAME")
+            Arg::new("TESTNAME")
                 .help("If specified, only run tests containing this string in their names"),
         )
         .get_matches();
@@ -250,7 +250,7 @@ type TestFn = dyn Fn() -> Pin<Box<dyn Future<Output = PyResult<()>> + Send>> + S
 #[derive(Clone)]
 pub struct Test {
     /// The fully qualified name of the test
-    pub name: String,
+    pub name: &'static str,
     /// The function used to create the task that runs the test.
     pub test_fn: &'static TestFn,
 }