Merge pull request #1826 from davidhewitt/pysequence-tidy

sequence: tidy up implementation
PyO3 · Aug 24, 2021 · 688823f · 688823f
2 parents 50cd4c6 + 7ff7c76
commit 688823f
Showing 1 changed file with 11 additions and 26 deletions.
diff --git a/src/types/sequence.rs b/src/types/sequence.rs
@@ -40,13 +40,8 @@ impl PySequence {
     #[inline]
     pub fn concat(&self, other: &PySequence) -> PyResult<&PySequence> {
         unsafe {
-            let ptr = self
-                .py()
-                .from_owned_ptr_or_err::<PyAny>(ffi::PySequence_Concat(
-                    self.as_ptr(),
-                    other.as_ptr(),
-                ))?;
-            Ok(&*(ptr as *const PyAny as *const PySequence))
+            self.py()
+                .from_owned_ptr_or_err(ffi::PySequence_Concat(self.as_ptr(), other.as_ptr()))
         }
     }
 
@@ -56,13 +51,10 @@ impl PySequence {
     #[inline]
     pub fn repeat(&self, count: usize) -> PyResult<&PySequence> {
         unsafe {
-            let ptr = self
-                .py()
-                .from_owned_ptr_or_err::<PyAny>(ffi::PySequence_Repeat(
-                    self.as_ptr(),
-                    get_ssize_index(count),
-                ))?;
-            Ok(&*(ptr as *const PyAny as *const PySequence))
+            self.py().from_owned_ptr_or_err(ffi::PySequence_Repeat(
+                self.as_ptr(),
+                get_ssize_index(count),
+            ))
         }
     }
 
@@ -76,13 +68,8 @@ impl PySequence {
     #[inline]
     pub fn in_place_concat(&self, other: &PySequence) -> PyResult<&PySequence> {
         unsafe {
-            let ptr = self
-                .py()
-                .from_owned_ptr_or_err::<PyAny>(ffi::PySequence_InPlaceConcat(
-                    self.as_ptr(),
-                    other.as_ptr(),
-                ))?;
-            Ok(&*(ptr as *const PyAny as *const PySequence))
+            self.py()
+                .from_owned_ptr_or_err(ffi::PySequence_InPlaceConcat(self.as_ptr(), other.as_ptr()))
         }
     }
 
@@ -96,13 +83,11 @@ impl PySequence {
     #[inline]
     pub fn in_place_repeat(&self, count: usize) -> PyResult<&PySequence> {
         unsafe {
-            let ptr = self
-                .py()
-                .from_owned_ptr_or_err::<PyAny>(ffi::PySequence_InPlaceRepeat(
+            self.py()
+                .from_owned_ptr_or_err(ffi::PySequence_InPlaceRepeat(
                     self.as_ptr(),
                     get_ssize_index(count),
-                ))?;
-            Ok(&*(ptr as *const PyAny as *const PySequence))
+                ))
         }
     }