Bump dependencies (#66)

Author: robsdedude

Cargo.lock

@@ -10,4 +10,4 @@ name = "neo4j_rust_ext"
 crate-type = ["cdylib"]
 
 [dependencies]
-pyo3 = "0.25.1"
+pyo3 = "0.26.0"

Cargo.toml

@@ -0,0 +1 @@
+Bump dependency PyO3 (Rust binding for Python) from `0.25.1` to `0.26.0`<ISSUES_LIST>.

changelog.d/66.improve.md

@@ -43,7 +43,7 @@ pub(super) fn init_module(m: &Bound<PyModule>, name: &str) -> PyResult<()> {
 pub struct Structure {
     tag: u8,
     #[pyo3(get)]
-    fields: Vec<PyObject>,
+    fields: Vec<Py<PyAny>>,
 }
 
 impl Structure {
@@ -85,7 +85,7 @@ impl Structure {
     #[new]
     #[pyo3(signature = (tag, *fields))]
     #[pyo3(text_signature = "(tag, *fields)")]
-    fn new(tag: &[u8], fields: Vec<PyObject>) -> PyResult<Self> {
+    fn new(tag: &[u8], fields: Vec<Py<PyAny>>) -> PyResult<Self> {
         if tag.len() != 1 {
             return Err(PyErr::new::<PyValueError, _>("tag must be a single byte"));
         }
@@ -109,7 +109,7 @@ impl Structure {
         Ok(format!("Structure({args})"))
     }
 
-    fn __richcmp__(&self, other: &Self, op: CompareOp, py: Python<'_>) -> PyResult<PyObject> {
+    fn __richcmp__(&self, other: &Self, op: CompareOp, py: Python<'_>) -> PyResult<Py<PyAny>> {
         Ok(match op {
             CompareOp::Eq => self.eq(other, py)?.into_py_any(py)?,
             CompareOp::Ne => (!self.eq(other, py)?).into_py_any(py)?,
@@ -121,11 +121,11 @@ impl Structure {
         self.fields.len()
     }
 
-    fn __getitem__(&self, index: isize, py: Python<'_>) -> PyResult<PyObject> {
+    fn __getitem__(&self, index: isize, py: Python<'_>) -> PyResult<Py<PyAny>> {
         Ok(self.fields[self.compute_index(index)?].clone_ref(py))
     }
 
-    fn __setitem__(&mut self, index: isize, value: PyObject) -> PyResult<()> {
+    fn __setitem__(&mut self, index: isize, value: Py<PyAny>) -> PyResult<()> {
         let index = self.compute_index(index)?;
         self.fields[index] = value;
         Ok(())

src/codec/packstream.rs

@@ -32,14 +32,14 @@ use super::{
 
 #[derive(Debug)]
 struct TypeMappings {
-    none_values: Vec<PyObject>,
-    true_values: Vec<PyObject>,
-    false_values: Vec<PyObject>,
-    int_types: PyObject,
-    float_types: PyObject,
-    sequence_types: PyObject,
-    mapping_types: PyObject,
-    bytes_types: PyObject,
+    none_values: Vec<Py<PyAny>>,
+    true_values: Vec<Py<PyAny>>,
+    false_values: Vec<Py<PyAny>>,
+    int_types: Py<PyAny>,
+    float_types: Py<PyAny>,
+    sequence_types: Py<PyAny>,
+    mapping_types: Py<PyAny>,
+    bytes_types: Py<PyAny>,
 }
 
 impl TypeMappings {
@@ -274,7 +274,7 @@ impl<'a> PackStreamEncoder<'a> {
     fn write_exact_value(
         &mut self,
         value: &Bound<PyAny>,
-        values: &[PyObject],
+        values: &[Py<PyAny>],
         bytes: &[u8],
     ) -> PyResult<bool> {
         for v in values {

src/codec/packstream/v1/pack.rs

@@ -32,7 +32,7 @@ pub(super) fn unpack(
     bytes: Bound<PyByteArray>,
     idx: usize,
     hydration_hooks: Option<Bound<PyDict>>,
-) -> PyResult<(PyObject, usize)> {
+) -> PyResult<(Py<PyAny>, usize)> {
     let py = bytes.py();
     let mut decoder = PackStreamDecoder::new(py, bytes, idx, hydration_hooks);
     let result = decoder.read()?;
@@ -61,12 +61,12 @@ impl<'a> PackStreamDecoder<'a> {
         }
     }
 
-    fn read(&mut self) -> PyResult<PyObject> {
+    fn read(&mut self) -> PyResult<Py<PyAny>> {
         let marker = self.read_byte()?;
         self.read_value(marker)
     }
 
-    fn read_value(&mut self, marker: u8) -> PyResult<PyObject> {
+    fn read_value(&mut self, marker: u8) -> PyResult<Py<PyAny>> {
         let high_nibble = marker & 0xF0;
 
         Ok(match marker {
@@ -141,7 +141,7 @@ impl<'a> PackStreamDecoder<'a> {
         })
     }
 
-    fn read_list(&mut self, length: usize) -> PyResult<PyObject> {
+    fn read_list(&mut self, length: usize) -> PyResult<Py<PyAny>> {
         if length == 0 {
             return Ok(PyList::empty(self.py).into_any().unbind());
         }
@@ -152,7 +152,7 @@ impl<'a> PackStreamDecoder<'a> {
         items.into_py_any(self.py)
     }
 
-    fn read_string(&mut self, length: usize) -> PyResult<PyObject> {
+    fn read_string(&mut self, length: usize) -> PyResult<Py<PyAny>> {
         if length == 0 {
             return "".into_py_any(self.py);
         }
@@ -174,11 +174,11 @@ impl<'a> PackStreamDecoder<'a> {
         data.into_py_any(self.py)
     }
 
-    fn read_map(&mut self, length: usize) -> PyResult<PyObject> {
+    fn read_map(&mut self, length: usize) -> PyResult<Py<PyAny>> {
         if length == 0 {
             return Ok(PyDict::new(self.py).into_any().unbind());
         }
-        let mut key_value_pairs: Vec<(PyObject, PyObject)> = Vec::with_capacity(length);
+        let mut key_value_pairs: Vec<(Py<PyAny>, Py<PyAny>)> = Vec::with_capacity(length);
         for _ in 0..length {
             let len = self.read_string_length()?;
             let key = self.read_string(len)?;
@@ -188,7 +188,7 @@ impl<'a> PackStreamDecoder<'a> {
         Ok(key_value_pairs.into_py_dict(self.py)?.into())
     }
 
-    fn read_bytes(&mut self, length: usize) -> PyResult<PyObject> {
+    fn read_bytes(&mut self, length: usize) -> PyResult<Py<PyAny>> {
         if length == 0 {
             return Ok(PyBytes::new(self.py, &[]).into_any().unbind());
         }
@@ -208,7 +208,7 @@ impl<'a> PackStreamDecoder<'a> {
         Ok(PyBytes::new(self.py, &data).into_any().unbind())
     }
 
-    fn read_struct(&mut self, length: usize) -> PyResult<PyObject> {
+    fn read_struct(&mut self, length: usize) -> PyResult<Py<PyAny>> {
         let tag = self.read_byte()?;
         let mut fields = Vec::with_capacity(length);
         for _ in 0..length {