@@ -12,7 +12,7 @@ compat_function!(
1212 return std:: ptr:: null_mut( ) ;
1313 }
1414
15- let writer: * mut crate :: PyBytesWriter = crate :: PyMem_Malloc ( size_of:: <crate :: PyBytesWriter >( ) ) . cast( ) ;
15+ let writer: * mut crate :: PyBytesWriter = crate :: PyMem_Malloc ( std :: mem :: size_of:: <crate :: PyBytesWriter >( ) ) . cast( ) ;
1616 if writer. is_null( ) {
1717 crate :: PyErr_NoMemory ( ) ;
1818 return std:: ptr:: null_mut( ) ;
@@ -74,7 +74,7 @@ compat_function!(
7474 PyBytesWriter_Discard ( writer) ;
7575 return std:: ptr:: null_mut( ) ;
7676 }
77- std:: mem:: take ( & mut ( * writer) . obj)
77+ std:: mem:: replace ( & mut ( * writer) . obj, std :: ptr :: null_mut ( ) )
7878 } ;
7979
8080 PyBytesWriter_Discard ( writer) ;
@@ -89,7 +89,7 @@ compat_function!(
8989 #[ inline]
9090 pub unsafe fn _PyBytesWriter_GetAllocated( writer: * mut crate :: PyBytesWriter ) -> crate :: Py_ssize_t {
9191 if ( * writer) . obj. is_null( ) {
92- size_of_val( & ( * writer) . small_buffer) as _
92+ std :: mem :: size_of_val( & ( * writer) . small_buffer) as _
9393 } else {
9494 crate :: PyBytes_Size ( ( * writer) . obj)
9595 }
@@ -212,12 +212,12 @@ unsafe fn _PyBytesWriter_Resize_impl(
212212 }
213213
214214 if resize > 0 {
215- assert ! ( ( size as usize ) > size_of_val( & ( * writer) . small_buffer) ) ;
215+ assert ! ( ( size as usize ) > std :: mem :: size_of_val( & ( * writer) . small_buffer) ) ;
216216
217217 std:: ptr:: copy_nonoverlapping (
218218 ( * writer) . small_buffer . as_ptr ( ) ,
219219 crate :: PyBytes_AS_STRING ( ( * writer) . obj ) as * mut _ ,
220- size_of_val ( & ( * writer) . small_buffer ) ,
220+ std :: mem :: size_of_val ( & ( * writer) . small_buffer ) ,
221221 ) ;
222222 }
223223 }
0 commit comments