Small fixes

agerasev · Aug 1, 2023 · 5593941 · 5593941
1 parent 2df5e2c
commit 5593941
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/src/halves/cached.rs b/src/halves/cached.rs
@@ -151,7 +151,7 @@ impl<R: RbRef> Consumer for CachingCons<R> {
         unsafe { PopIter::new(self.frozen.into_rb_ref()) }
     }
 
-    type PopIter<'a> = PopIter<&'a R::Target> where R:'a, R::Target: 'a;
+    type PopIter<'a> = PopIter<&'a R::Target> where R:'a;
     fn pop_iter(&mut self) -> Self::PopIter<'_> {
         unsafe { PopIter::new(self.frozen.rb_ref().deref()) }
     }

diff --git a/src/halves/direct.rs b/src/halves/direct.rs
@@ -4,7 +4,7 @@ use crate::{
         iter::PopIter,
         traits::{RbRef, ToRbRef},
     },
-    traits::{Consumer, Observe, Observer, Producer, RingBuffer},
+    traits::{Consumer, Observe, Observer, Producer},
 };
 
 /// Observer of ring buffer.
@@ -100,9 +100,9 @@ impl<R: RbRef> Consumer for Cons<R> {
         unsafe { PopIter::new(self.rb) }
     }
 
-    type PopIter<'a> = PopIter<&'a R::Target> where R:'a, R::Target: 'a;
+    type PopIter<'a> = PopIter<&'a R::Target> where R:'a;
     fn pop_iter(&mut self) -> Self::PopIter<'_> {
-        unsafe { PopIter::new(&self.rb.deref()) }
+        unsafe { PopIter::new(self.rb.deref()) }
     }
 }
 

diff --git a/src/halves/frozen.rs b/src/halves/frozen.rs
@@ -90,9 +90,9 @@ impl<R: RbRef> Consumer for FrozenCons<R> {
         unsafe { PopIter::new(self.into_rb_ref()) }
     }
 
-    type PopIter<'a> = PopIter<&'a R::Target> where R:'a, R::Target: 'a;
+    type PopIter<'a> = PopIter<&'a R::Target> where R:'a;
     fn pop_iter(&mut self) -> Self::PopIter<'_> {
-        unsafe { PopIter::new(&self.rb.deref()) }
+        unsafe { PopIter::new(self.rb.deref()) }
     }
 }
 

diff --git a/src/rb/traits.rs b/src/rb/traits.rs
@@ -1,4 +1,4 @@
-use crate::traits::{Consumer, Producer, RingBuffer};
+use crate::traits::RingBuffer;
 #[cfg(feature = "alloc")]
 use alloc::{rc::Rc, sync::Arc};
 

diff --git a/src/tests/iter.rs b/src/tests/iter.rs
@@ -64,15 +64,15 @@ fn push_pop_iter_partial() {
     prod.try_push(0).unwrap();
     prod.try_push(1).unwrap();
     prod.try_push(2).unwrap();
-    for (i, v) in (0..2).zip(cons.pop_iter()) {
-        assert_eq!(i, v);
+    for (i, v) in cons.pop_iter().take(2).enumerate() {
+        assert_eq!(i as i32, v);
     }
 
     prod.try_push(3).unwrap();
     prod.try_push(4).unwrap();
     prod.try_push(5).unwrap();
-    for (i, v) in (2..5).zip(cons.pop_iter()) {
-        assert_eq!(i, v);
+    for (i, v) in cons.pop_iter().enumerate() {
+        assert_eq!(i as i32 + 2, v);
     }
     assert_eq!(cons.try_pop().unwrap(), 5);
     assert!(prod.is_empty());