fix build on GIL-enabled and limited API builds

PyO3 · Jan 6, 2025 · 994bc49 · 994bc49
1 parent 2967b21
commit 994bc49
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/src/types/list.rs b/src/types/list.rs
@@ -587,6 +587,7 @@ impl<'py> BoundListIterator<'py> {
         }
     }
 
+    #[cfg(not(Py_LIMITED_API))]
     fn with_critical_section<R>(
         &mut self,
         f: impl FnOnce(&mut Index, &mut Length, &Bound<'py, PyList>) -> R,
@@ -605,20 +606,21 @@ impl<'py> Iterator for BoundListIterator<'py> {
 
     #[inline]
     fn next(&mut self) -> Option<Self::Item> {
-        #[cfg(Py_GIL_DISABLED)]
+        #[cfg(not(Py_LIMITED_API))]
         {
             self.with_critical_section(|index, length, list| unsafe {
                 Self::next_unchecked(index, length, list)
             })
         }
         #[cfg(Py_LIMITED_API)]
         {
+            let Self {
+                index,
+                length,
+                list,
+            } = self;
             Self::next(index, length, list)
         }
-        #[cfg(all(not(Py_GIL_DISABLED), not(Py_LIMITED_API)))]
-        {
-            unsafe { Self::next_unchecked(index, length, list) }
-        }
     }
 
     #[inline]
@@ -751,20 +753,21 @@ impl<'py> Iterator for BoundListIterator<'py> {
 impl DoubleEndedIterator for BoundListIterator<'_> {
     #[inline]
     fn next_back(&mut self) -> Option<Self::Item> {
-        #[cfg(Py_GIL_DISABLED)]
+        #[cfg(not(Py_LIMITED_API))]
         {
             self.with_critical_section(|index, length, list| unsafe {
                 Self::next_back_unchecked(index, length, list)
             })
         }
         #[cfg(Py_LIMITED_API)]
         {
+            let Self {
+                index,
+                length,
+                list,
+            } = self;
             Self::next_back(index, length, list)
         }
-        #[cfg(all(not(Py_GIL_DISABLED), not(Py_LIMITED_API)))]
-        {
-            unsafe { Self::next_back_unchecked(index, length, list) }
-        }
     }
 
     #[inline]