rust: update to PyO3 0.22

Closes #257.

Author: ngoldbaum

.github/workflows/test.yml

@@ -89,16 +89,15 @@ jobs:
         run: |
           python -m pip install --require-hashes -r ci/requirements.txt
 
-      # TODO enable once PyO3 supports 3.13.
       - name: Build (Rust)
-        if: matrix.arch == 'x64' && matrix.py != '3.13'
+        if: matrix.arch == 'x64'
         env:
           PIP_CONSTRAINT: 'ci/constraints.txt'
         run: |
           python -m pip install --config-settings='--build-option=--rust-backend' -e .
 
       - name: Build (No Rust)
-        if: matrix.arch != 'x64' || matrix.py == '3.13'
+        if: matrix.arch != 'x64'
         run: |
           python -m pip install -e .
 

Cargo.lock

@@ -26,5 +26,5 @@ version = "2.0.10+zstd.1.5.6"
 features = ["experimental", "legacy", "zstdmt"]
 
 [dependencies.pyo3]
-version = "0.21.2"
+version = "0.22.6"
 features = ["extension-module"]

Cargo.toml

@@ -62,6 +62,7 @@ Changes
   we never ran tests for the Windows ARM platform.
 * We now `collections.abs.Buffer` on Python 3.12+ instead of `typing.ByteString`,
   as `typing.ByteString` was deprecated and later removed. (#238, #262)
+* PyO3 Rust crate upgraded from 0.21 to 0.22. (#257)
 
 Backwards Compatibility Notes
 -----------------------------

docs/news.rst

@@ -85,7 +85,7 @@ impl ZstdCompressionChunker {
 
         let source = make_in_buffer_source(py, data, zstd_safe::CCtx::in_size())?;
 
-        let it = Py::new(
+        let it = Bound::new(
             py,
             ZstdCompressionChunkerIterator {
                 cctx: self.cctx.clone(),
@@ -96,9 +96,9 @@ impl ZstdCompressionChunker {
             },
         )?;
 
-        self.iterator = Some(it.clone());
+        self.iterator = Some(it.clone().unbind());
 
-        Ok(it)
+        Ok(it.unbind())
     }
 
     fn flush<'p>(&mut self, py: Python<'p>) -> PyResult<Py<ZstdCompressionChunkerIterator>> {
@@ -119,7 +119,7 @@ impl ZstdCompressionChunker {
         let source =
             make_in_buffer_source(py, &PyBytes::new_bound(py, &[]), zstd_safe::CCtx::in_size())?;
 
-        let it = Py::new(
+        let it = Bound::new(
             py,
             ZstdCompressionChunkerIterator {
                 cctx: self.cctx.clone(),
@@ -130,9 +130,9 @@ impl ZstdCompressionChunker {
             },
         )?;
 
-        self.iterator = Some(it.clone());
+        self.iterator = Some(it.clone().unbind());
 
-        Ok(it)
+        Ok(it.unbind())
     }
 
     fn finish<'p>(&mut self, py: Python<'p>) -> PyResult<Py<ZstdCompressionChunkerIterator>> {
@@ -153,7 +153,7 @@ impl ZstdCompressionChunker {
         let source =
             make_in_buffer_source(py, &PyBytes::new_bound(py, &[]), zstd_safe::CCtx::in_size())?;
 
-        let it = Py::new(
+        let it = Bound::new(
             py,
             ZstdCompressionChunkerIterator {
                 cctx: self.cctx.clone(),
@@ -164,9 +164,9 @@ impl ZstdCompressionChunker {
             },
         )?;
 
-        self.iterator = Some(it.clone());
+        self.iterator = Some(it.clone().unbind());
 
-        Ok(it)
+        Ok(it.unbind())
     }
 }
 

rust-ext/src/compression_chunker.rs

@@ -184,6 +184,7 @@ impl ZstdCompressionWriter {
         false
     }
 
+    #[pyo3(signature = (size=None))]
     #[allow(unused_variables)]
     fn truncate(&self, py: Python, size: Option<&Bound<'_, PyAny>>) -> PyResult<()> {
         let io = py.import_bound("io")?;

rust-ext/src/compression_writer.rs

@@ -66,6 +66,7 @@ impl ZstdCompressionObj {
         Ok(PyBytes::new_bound(py, &compressed))
     }
 
+    #[pyo3(signature = (flush_mode=None))]
     fn flush<'p>(
         &mut self,
         py: Python<'p>,

rust-ext/src/compressionobj.rs

@@ -68,7 +68,7 @@ pub fn multi_compress_to_buffer(
                 total_source_size += slice.len();
             }
         }
-    } else if let Ok(list) = data.extract::<&PyList>() {
+    } else if let Ok(list) = data.extract::<Bound<'_, PyList>>() {
         sources.reserve_exact(list.len());
 
         for (i, item) in list.iter().enumerate() {

rust-ext/src/compressor_multi.rs

@@ -102,6 +102,7 @@ impl ZstdDecompressionObj {
         empty.call_method1("join", (chunks,))
     }
 
+    #[pyo3(signature = (length=None))]
     #[allow(unused_variables)]
     fn flush<'p>(&self, py: Python<'p>, length: Option<usize>) -> PyResult<Bound<'p, PyBytes>> {
         Ok(PyBytes::new_bound(py, &[]))

rust-ext/src/decompressionobj.rs

@@ -99,7 +99,7 @@ pub fn multi_decompress_to_buffer(
                 offset += 1;
             }
         }
-    } else if let Ok(list) = frames.extract::<&PyList>() {
+    } else if let Ok(list) = frames.extract::<Bound<'_, PyList>>() {
         if decompressed_sizes.is_some() && frame_sizes.len() != list.len() {
             return Err(PyValueError::new_err(format!(
                 "decompressed_sizes size mismatch; expected {}; got {}",