fix msrv

Author: bschoenmaeckers

pyo3-ffi/src/compat/py_3_15.rs

@@ -12,7 +12,7 @@ compat_function!(
             return std::ptr::null_mut();
         }
 
-        let writer: *mut crate::PyBytesWriter = crate::PyMem_Malloc(size_of::<crate::PyBytesWriter>()).cast();
+        let writer: *mut crate::PyBytesWriter = crate::PyMem_Malloc(std::mem::size_of::<crate::PyBytesWriter>()).cast();
         if writer.is_null() {
             crate::PyErr_NoMemory();
             return std::ptr::null_mut();
@@ -74,7 +74,7 @@ compat_function!(
                     PyBytesWriter_Discard(writer);
                     return std::ptr::null_mut();
             }
-            std::mem::take(&mut (*writer).obj)
+            std::mem::replace(&mut (*writer).obj, std::ptr::null_mut())
         };
 
         PyBytesWriter_Discard(writer);
@@ -89,7 +89,7 @@ compat_function!(
     #[inline]
     pub unsafe fn _PyBytesWriter_GetAllocated(writer: *mut crate::PyBytesWriter) -> crate::Py_ssize_t {
         if (*writer).obj.is_null() {
-            size_of_val(&(*writer).small_buffer) as _
+            std::mem::size_of_val(&(*writer).small_buffer) as _
         } else {
             crate::PyBytes_Size((*writer).obj)
         }
@@ -212,12 +212,12 @@ unsafe fn _PyBytesWriter_Resize_impl(
         }
 
         if resize > 0 {
-            assert!((size as usize) > size_of_val(&(*writer).small_buffer));
+            assert!((size as usize) > std::mem::size_of_val(&(*writer).small_buffer));
 
             std::ptr::copy_nonoverlapping(
                 (*writer).small_buffer.as_ptr(),
                 crate::PyBytes_AS_STRING((*writer).obj) as *mut _,
-                size_of_val(&(*writer).small_buffer),
+                std::mem::size_of_val(&(*writer).small_buffer),
             );
         }
     }

src/byteswriter.rs

@@ -1,13 +1,18 @@
-use crate::ffi_ptr_ext::FfiPtrExt;
-use crate::py_result_ext::PyResultExt;
 use crate::types::PyBytes;
-use crate::{ffi, Bound, IntoPyObject, PyErr, PyResult, Python};
 #[cfg(not(Py_LIMITED_API))]
-use pyo3_ffi::compat::{
-    PyBytesWriter_Create, PyBytesWriter_Discard, PyBytesWriter_Finish, PyBytesWriter_GetData,
-    PyBytesWriter_GetSize, PyBytesWriter_Grow, PyBytesWriter_WriteBytes,
-    _PyBytesWriter_GetAllocated,
+use crate::{
+    ffi::{
+        self,
+        compat::{
+            PyBytesWriter_Create, PyBytesWriter_Discard, PyBytesWriter_Finish,
+            PyBytesWriter_GetData, PyBytesWriter_GetSize, PyBytesWriter_Grow,
+            PyBytesWriter_WriteBytes, _PyBytesWriter_GetAllocated,
+        },
+    },
+    ffi_ptr_ext::FfiPtrExt,
+    py_result_ext::PyResultExt,
 };
+use crate::{Bound, IntoPyObject, PyErr, PyResult, Python};
 use std::io::IoSlice;
 #[cfg(not(Py_LIMITED_API))]
 use std::ptr::{self, NonNull};
@@ -95,7 +100,7 @@ impl<'py> TryFrom<PyBytesWriter<'py>> for Bound<'py, PyBytes> {
 impl<'py> From<PyBytesWriter<'py>> for Bound<'py, PyBytes> {
     #[inline]
     fn from(writer: PyBytesWriter<'py>) -> Self {
-        Ok(PyBytes::new(&writer.buffer))
+        PyBytes::new(writer.python, &writer.buffer)
     }
 }
 
@@ -186,7 +191,7 @@ impl std::io::Write for PyBytesWriter<'_> {
     }
 
     #[inline]
-    fn write_fmt(&mut self, args: Arguments<'_>) -> std::io::Result<()> {
+    fn write_fmt(&mut self, args: std::fmt::Arguments<'_>) -> std::io::Result<()> {
         self.buffer.write_fmt(args)
     }
 }
@@ -199,7 +204,7 @@ mod tests {
     #[test]
     fn test_io_write() {
         Python::attach(|py| {
-            let buf: [u8; _] = [1, 2, 3, 4];
+            let buf = [1, 2, 3, 4];
             let mut writer = PyBytesWriter::new(py).unwrap();
             writer.write(&buf).unwrap();
             let bytes: Bound<'_, PyBytes> = writer.try_into().unwrap();