Merge pull request #191 from projectsyn/pyo3/replace-deprecated-downcast

Replace deprecated PyO3 `downcast*` calls with equivalent `cast*` calls

Author: simu

src/types/from.rs

@@ -135,15 +135,15 @@ impl TryFrom<Bound<'_, PyAny>> for Value {
                 Ok(Self::String(v.to_string()))
             }
             "list" => {
-                let v = value.downcast::<PySequence>()?;
+                let v = value.cast::<PySequence>()?;
                 let mut items: Vec<Value> = vec![];
                 for it in v.try_iter()? {
                     items.push(TryInto::try_into(it?)?);
                 }
                 Ok(Self::Sequence(items))
             }
             "dict" => {
-                let dict = value.downcast::<PyDict>()?;
+                let dict = value.cast::<PyDict>()?;
                 let mut mapping = crate::types::Mapping::new();
                 for (k, v) in dict {
                     let kv = TryInto::try_into(k)?;

src/types/mapping.rs

@@ -796,10 +796,10 @@ mod mapping_tests {
             assert_eq!(format!("{:?}", m.keys()), "['a', 'b', 'c', 'd', 'e', 'f']");
             let a = m.get_item(&"a").unwrap().unwrap();
             assert!(a.is_instance_of::<pyo3::types::PyInt>());
-            assert!(a.downcast_exact::<pyo3::types::PyInt>().unwrap().eq(&1));
+            assert!(a.cast_exact::<pyo3::types::PyInt>().unwrap().eq(&1));
             let f = m.get_item(&"f").unwrap().unwrap();
             assert!(f.is_instance_of::<PyDict>());
-            let f = f.downcast_exact::<PyDict>().unwrap();
+            let f = f.cast_exact::<PyDict>().unwrap();
             assert_eq!(f.len(), 1);
             assert_eq!(format!("{:?}", f.keys()), "['foo']");
             assert_eq!(format!("{:?}", f.values()), "['bar']");

src/types/value/value_as_py_obj_tests.rs

@@ -14,7 +14,7 @@ fn test_as_py_obj_bool() {
     Python::attach(|py| {
         let b = Value::Bool(true).as_py_obj(py).unwrap();
         assert!(b.is_instance_of::<pyo3::types::PyBool>());
-        assert!(b.downcast_exact::<pyo3::types::PyBool>().unwrap().is_true());
+        assert!(b.cast_exact::<pyo3::types::PyBool>().unwrap().is_true());
     });
 }
 
@@ -27,7 +27,7 @@ fn test_as_py_obj_int() {
             let pyn = n.as_py_obj(py).unwrap();
             let n = n.as_i64().unwrap();
             assert!(pyn.is_instance_of::<pyo3::types::PyInt>());
-            assert!(pyn.downcast_exact::<pyo3::types::PyInt>().unwrap().eq(&n));
+            assert!(pyn.cast_exact::<pyo3::types::PyInt>().unwrap().eq(&n));
         }
     });
 }
@@ -39,10 +39,7 @@ fn test_as_py_obj_float() {
         let n: Value = 3.14.into();
         let n = n.as_py_obj(py).unwrap();
         assert!(n.is_instance_of::<pyo3::types::PyFloat>());
-        assert!(n
-            .downcast_exact::<pyo3::types::PyFloat>()
-            .unwrap()
-            .eq(&3.14));
+        assert!(n.cast_exact::<pyo3::types::PyFloat>().unwrap().eq(&3.14));
     });
 }
 
@@ -54,7 +51,7 @@ fn test_as_py_obj_sequence() {
         let s = s.as_py_obj(py).unwrap();
         assert!(s.is_instance_of::<pyo3::types::PyList>());
         assert!(s
-            .downcast_exact::<pyo3::types::PyList>()
+            .cast_exact::<pyo3::types::PyList>()
             .unwrap()
             .eq(&vec![1, 2, 3])
             .unwrap());
@@ -70,7 +67,7 @@ fn test_as_py_obj_string() {
             .unwrap();
         assert!(s.is_instance_of::<pyo3::types::PyString>());
         assert_eq!(
-            s.downcast_exact::<pyo3::types::PyString>()
+            s.cast_exact::<pyo3::types::PyString>()
                 .unwrap()
                 .to_str()
                 .unwrap(),