diff --git a/async/src/rb.rs b/async/src/rb.rs index b904306..cdedf4e 100644 --- a/async/src/rb.rs +++ b/async/src/rb.rs @@ -102,7 +102,7 @@ impl<S: Storage> SplitRef for AsyncRb<S> { type RefProd<'a> = AsyncProd<&'a Self> where Self: 'a; type RefCons<'a> = AsyncCons<&'a Self> where Self: 'a; - fn split_ref(&mut self) -> (Self::RefProd<'_>, Self::RefCons<'_>) { + fn split_ref(&self) -> (Self::RefProd<'_>, Self::RefCons<'_>) { unsafe { (AsyncProd::new(self), AsyncCons::new(self)) } } } diff --git a/blocking/src/rb.rs b/blocking/src/rb.rs index 3ee19a9..dbaa14f 100644 --- a/blocking/src/rb.rs +++ b/blocking/src/rb.rs @@ -98,7 +98,7 @@ impl<S: Storage, X: Semaphore> SplitRef for BlockingRb<S, X> { type RefProd<'a> = BlockingProd<&'a Self> where Self: 'a; type RefCons<'a> = BlockingCons<&'a Self> where Self: 'a; - fn split_ref(&mut self) -> (Self::RefProd<'_>, Self::RefCons<'_>) { + fn split_ref(&self) -> (Self::RefProd<'_>, Self::RefCons<'_>) { (BlockingProd::new(self), BlockingCons::new(self)) } } diff --git a/examples/static.rs b/examples/static.rs index 8a72d8d..ba745a7 100644 --- a/examples/static.rs +++ b/examples/static.rs @@ -4,7 +4,7 @@ use ringbuf::{traits::*, StaticRb}; fn main() { const RB_SIZE: usize = 1; - let mut rb = StaticRb::<i32, RB_SIZE>::default(); + let rb = StaticRb::<i32, RB_SIZE>::default(); let (mut prod, mut cons) = rb.split_ref(); assert_eq!(prod.try_push(123), Ok(())); diff --git a/src/rb/local.rs b/src/rb/local.rs index 40f0496..e751bfa 100644 --- a/src/rb/local.rs +++ b/src/rb/local.rs @@ -166,7 +166,7 @@ impl<S: Storage + ?Sized> SplitRef for LocalRb<S> { type RefProd<'a> = Prod<&'a Self> where Self: 'a; type RefCons<'a> = Cons<&'a Self> where Self: 'a; - fn split_ref(&mut self) -> (Self::RefProd<'_>, Self::RefCons<'_>) { + fn split_ref(&self) -> (Self::RefProd<'_>, Self::RefCons<'_>) { (Prod::new(self), Cons::new(self)) } } diff --git a/src/rb/shared.rs b/src/rb/shared.rs index abada88..807b39d 100644 --- a/src/rb/shared.rs +++ b/src/rb/shared.rs @@ -181,7 +181,7 @@ impl<S: Storage + ?Sized> SplitRef for SharedRb<S> { type RefProd<'a> = CachingProd<&'a Self> where Self: 'a; type RefCons<'a> = CachingCons<&'a Self> where Self: 'a; - fn split_ref(&mut self) -> (Self::RefProd<'_>, Self::RefCons<'_>) { + fn split_ref(&self) -> (Self::RefProd<'_>, Self::RefCons<'_>) { (CachingProd::new(self), CachingCons::new(self)) } } diff --git a/src/tests/access.rs b/src/tests/access.rs index 333193a..17e7beb 100644 --- a/src/tests/access.rs +++ b/src/tests/access.rs @@ -4,7 +4,7 @@ use core::mem::MaybeUninit; #[test] fn try_push() { - let mut rb = Rb::<Array<i32, 3>>::default(); + let rb = Rb::<Array<i32, 3>>::default(); let (mut prod, mut cons) = rb.split_ref(); let vs_20 = (123, 456); @@ -47,7 +47,7 @@ fn try_push() { #[test] fn pop_full() { const CAP: usize = 2; - let mut rb = Rb::<Array<i32, CAP>>::default(); + let rb = Rb::<Array<i32, CAP>>::default(); let (mut prod, mut cons) = rb.split_ref(); for i in 0..CAP { @@ -71,7 +71,7 @@ fn pop_full() { #[test] fn pop_empty() { - let mut rb = Rb::<Array<i32, 2>>::default(); + let rb = Rb::<Array<i32, 2>>::default(); let (_, cons) = rb.split_ref(); { @@ -84,7 +84,7 @@ fn pop_empty() { #[test] fn try_pop() { - let mut rb = Rb::<Array<i32, 3>>::default(); + let rb = Rb::<Array<i32, 3>>::default(); let (mut prod, mut cons) = rb.split_ref(); let vs_20 = (123, 456, 789); @@ -133,7 +133,7 @@ fn try_pop() { #[test] fn push_return() { - let mut rb = Rb::<Array<i32, 2>>::default(); + let rb = Rb::<Array<i32, 2>>::default(); let (mut prod, mut cons) = rb.split_ref(); { @@ -166,7 +166,7 @@ fn push_return() { #[test] fn pop_return() { - let mut rb = Rb::<Array<i32, 2>>::default(); + let rb = Rb::<Array<i32, 2>>::default(); let (mut prod, cons) = rb.split_ref(); assert_eq!(prod.try_push(12), Ok(())); @@ -201,7 +201,7 @@ fn pop_return() { #[test] fn push_pop() { - let mut rb = Rb::<Array<i32, 3>>::default(); + let rb = Rb::<Array<i32, 3>>::default(); let (mut prod, cons) = rb.split_ref(); let vs_20 = (123, 456); diff --git a/src/tests/basic.rs b/src/tests/basic.rs index 6fb1803..a641dcc 100644 --- a/src/tests/basic.rs +++ b/src/tests/basic.rs @@ -14,7 +14,7 @@ fn capacity() { #[test] fn split_capacity() { const CAP: usize = 13; - let mut rb = Rb::<Array<i32, CAP>>::default(); + let rb = Rb::<Array<i32, CAP>>::default(); let (prod, cons) = rb.split_ref(); assert_eq!(prod.capacity().get(), CAP); @@ -23,7 +23,7 @@ fn split_capacity() { #[test] fn try_push() { - let mut rb = Rb::<Array<i32, 2>>::default(); + let rb = Rb::<Array<i32, 2>>::default(); let (mut prod, _) = rb.split_ref(); assert_eq!(indices(prod.observe()), (0, 0)); @@ -40,7 +40,7 @@ fn try_push() { #[test] fn pop_empty() { - let mut rb = Rb::<Array<i32, 2>>::default(); + let rb = Rb::<Array<i32, 2>>::default(); let (_, mut cons) = rb.split_ref(); assert_eq!(indices(cons.observe()), (0, 0)); @@ -52,7 +52,7 @@ fn pop_empty() { #[test] fn push_pop_one() { const CAP: usize = 2; - let mut rb = Rb::<Array<i32, CAP>>::default(); + let rb = Rb::<Array<i32, CAP>>::default(); let (mut prod, mut cons) = rb.split_ref(); const MOD: usize = 2 * CAP; @@ -74,7 +74,7 @@ fn push_pop_one() { #[test] fn push_pop_all() { const CAP: usize = 2; - let mut rb = Rb::<Array<i32, CAP>>::default(); + let rb = Rb::<Array<i32, CAP>>::default(); let (mut prod, mut cons) = rb.split_ref(); const MOD: usize = 2 * CAP; @@ -104,7 +104,7 @@ fn push_pop_all() { #[test] fn empty_full() { - let mut rb = Rb::<Array<i32, 1>>::default(); + let rb = Rb::<Array<i32, 1>>::default(); let (mut prod, cons) = rb.split_ref(); assert!(prod.is_empty()); @@ -122,7 +122,7 @@ fn empty_full() { #[test] fn len_remaining() { - let mut rb = Rb::<Array<i32, 2>>::default(); + let rb = Rb::<Array<i32, 2>>::default(); let (mut prod, mut cons) = rb.split_ref(); assert_eq!(prod.occupied_len(), 0); diff --git a/src/tests/drop.rs b/src/tests/drop.rs index 3ea9678..b30ebc3 100644 --- a/src/tests/drop.rs +++ b/src/tests/drop.rs @@ -18,7 +18,7 @@ impl<'a> Dropper<'a> { } } -impl<'a> Drop for Dropper<'a> { +impl Drop for Dropper<'_> { fn drop(&mut self) { if !self.set.borrow_mut().remove(&self.id) { panic!("value {} already removed", self.id); @@ -30,7 +30,7 @@ impl<'a> Drop for Dropper<'a> { fn single() { let set = RefCell::new(BTreeSet::new()); - let mut rb = Rb::<Array<Dropper, 3>>::default(); + let rb = Rb::<Array<Dropper, 3>>::default(); assert_eq!(set.borrow().len(), 0); @@ -62,7 +62,7 @@ fn single() { fn transaction() { let set = RefCell::new(BTreeSet::new()); - let mut rb = Rb::<Array<Dropper, 5>>::default(); + let rb = Rb::<Array<Dropper, 5>>::default(); assert_eq!(set.borrow().len(), 0); { diff --git a/src/tests/fmt_write.rs b/src/tests/fmt_write.rs index b2f939b..eef3c93 100644 --- a/src/tests/fmt_write.rs +++ b/src/tests/fmt_write.rs @@ -4,7 +4,7 @@ use core::fmt::Write; #[test] fn write() { - let mut rb = Rb::<Array<u8, 40>>::default(); + let rb = Rb::<Array<u8, 40>>::default(); let (mut prod, cons) = rb.split_ref(); @@ -17,7 +17,7 @@ fn write() { #[test] fn write_overflow() { - let mut rb = Rb::<Array<u8, 10>>::default(); + let rb = Rb::<Array<u8, 10>>::default(); let (mut prod, mut cons) = rb.split_ref(); diff --git a/src/tests/frozen.rs b/src/tests/frozen.rs index 4255d3f..806a907 100644 --- a/src/tests/frozen.rs +++ b/src/tests/frozen.rs @@ -3,7 +3,7 @@ use crate::{storage::Array, traits::*}; #[test] fn producer() { - let mut rb = Rb::<Array<i32, 2>>::default(); + let rb = Rb::<Array<i32, 2>>::default(); let (prod, mut cons) = rb.split_ref(); let mut frozen_prod = prod.freeze(); frozen_prod.try_push(0).unwrap(); @@ -40,7 +40,7 @@ fn producer() { #[test] fn discard() { - let mut rb = Rb::<Array<i32, 10>>::default(); + let rb = Rb::<Array<i32, 10>>::default(); let (prod, cons) = rb.split_ref(); let mut frozen_prod = prod.freeze(); frozen_prod.try_push(0).unwrap(); @@ -78,7 +78,7 @@ fn discard() { #[test] fn consumer() { - let mut rb = Rb::<Array<i32, 10>>::default(); + let rb = Rb::<Array<i32, 10>>::default(); let (mut prod, cons) = rb.split_ref(); let mut frozen_cons = cons.freeze(); prod.try_push(0).unwrap(); diff --git a/src/tests/hold.rs b/src/tests/hold.rs index 572b504..d77a861 100644 --- a/src/tests/hold.rs +++ b/src/tests/hold.rs @@ -3,7 +3,7 @@ use crate::{storage::Array, traits::*, CachingCons, CachingProd, Obs}; #[test] fn split_and_drop() { - let mut rb = Rb::<Array<i32, 2>>::default(); + let rb = Rb::<Array<i32, 2>>::default(); let (prod, cons) = rb.split_ref(); let obs = prod.observe(); diff --git a/src/tests/init.rs b/src/tests/init.rs index 89a1fdd..7182d38 100644 --- a/src/tests/init.rs +++ b/src/tests/init.rs @@ -7,7 +7,7 @@ use alloc::{boxed::Box, vec::Vec}; #[test] fn from_array() { - let mut rb = Rb::from([123, 321]); + let rb = Rb::from([123, 321]); let (mut prod, mut cons) = rb.split_ref(); assert_eq!(prod.capacity().get(), 2); diff --git a/src/tests/iter.rs b/src/tests/iter.rs index 7977250..f64152a 100644 --- a/src/tests/iter.rs +++ b/src/tests/iter.rs @@ -3,7 +3,7 @@ use crate::{storage::Array, traits::*}; #[test] fn iter() { - let mut rb = Rb::<Array<i32, 2>>::default(); + let rb = Rb::<Array<i32, 2>>::default(); let (mut prod, mut cons) = rb.split_ref(); prod.try_push(10).unwrap(); @@ -19,7 +19,7 @@ fn iter() { #[test] fn iter_mut() { - let mut rb = Rb::<Array<i32, 2>>::default(); + let rb = Rb::<Array<i32, 2>>::default(); let (mut prod, mut cons) = rb.split_ref(); prod.try_push(10).unwrap(); @@ -39,7 +39,7 @@ fn iter_mut() { #[test] fn pop_iter() { - let mut rb = Rb::<Array<i32, 3>>::default(); + let rb = Rb::<Array<i32, 3>>::default(); let (mut prod, mut cons) = rb.split_ref(); prod.try_push(0).unwrap(); @@ -58,7 +58,7 @@ fn pop_iter() { #[test] fn push_pop_iter_partial() { - let mut rb = Rb::<Array<i32, 4>>::default(); + let rb = Rb::<Array<i32, 4>>::default(); let (mut prod, mut cons) = rb.split_ref(); prod.try_push(0).unwrap(); diff --git a/src/tests/read_write.rs b/src/tests/read_write.rs index f919f4f..7a8fcb5 100644 --- a/src/tests/read_write.rs +++ b/src/tests/read_write.rs @@ -10,8 +10,8 @@ macro_rules! assert_eq_kind { #[test] fn from() { - let mut rb0 = Rb::<Array<u8, 4>>::default(); - let mut rb1 = Rb::<Array<u8, 4>>::default(); + let rb0 = Rb::<Array<u8, 4>>::default(); + let rb1 = Rb::<Array<u8, 4>>::default(); let (mut prod0, mut cons0) = rb0.split_ref(); let (mut prod1, mut cons1) = rb1.split_ref(); @@ -47,8 +47,8 @@ fn from() { #[test] fn into() { - let mut rb0 = Rb::<Array<u8, 4>>::default(); - let mut rb1 = Rb::<Array<u8, 4>>::default(); + let rb0 = Rb::<Array<u8, 4>>::default(); + let rb1 = Rb::<Array<u8, 4>>::default(); let (mut prod0, mut cons0) = rb0.split_ref(); let (mut prod1, mut cons1) = rb1.split_ref(); @@ -84,8 +84,8 @@ fn into() { #[test] fn count() { - let mut rb0 = Rb::<Array<u8, 4>>::default(); - let mut rb1 = Rb::<Array<u8, 4>>::default(); + let rb0 = Rb::<Array<u8, 4>>::default(); + let rb1 = Rb::<Array<u8, 4>>::default(); let (mut prod0, mut cons0) = rb0.split_ref(); let (mut prod1, mut cons1) = rb1.split_ref(); @@ -123,7 +123,7 @@ fn read_from() { } } - let mut rb = Rb::<Array<u8, 4>>::default(); + let rb = Rb::<Array<u8, 4>>::default(); let (mut prod, mut cons) = rb.split_ref(); prod.try_push(1).unwrap(); assert_eq!(cons.try_pop().unwrap(), 1); diff --git a/src/tests/skip.rs b/src/tests/skip.rs index 2ed22be..527410b 100644 --- a/src/tests/skip.rs +++ b/src/tests/skip.rs @@ -5,7 +5,7 @@ use alloc::rc::Rc; #[test] fn skip() { // Initialize ringbuffer, prod and cons - let mut rb = Rb::<Array<i8, 10>>::default(); + let rb = Rb::<Array<i8, 10>>::default(); let (mut prod, mut cons) = rb.split_ref(); let mut i = 0; @@ -53,7 +53,7 @@ fn skip_drop() { let rc = Rc::<()>::new(()); const CAP: usize = 10; - let mut rb = Rb::<Array<Rc<()>, CAP>>::default(); + let rb = Rb::<Array<Rc<()>, CAP>>::default(); let (mut prod, mut cons) = rb.split_ref(); for _ in 0..CAP { diff --git a/src/tests/slice.rs b/src/tests/slice.rs index d05e939..90b2e20 100644 --- a/src/tests/slice.rs +++ b/src/tests/slice.rs @@ -3,7 +3,7 @@ use crate::{storage::Array, traits::*, transfer}; #[test] fn push_pop_slice() { - let mut rb = Rb::<Array<i32, 4>>::default(); + let rb = Rb::<Array<i32, 4>>::default(); let (mut prod, mut cons) = rb.split_ref(); let mut tmp = [0; 5]; @@ -28,8 +28,8 @@ fn push_pop_slice() { #[test] fn move_slice() { - let mut rb0 = Rb::<Array<i32, 4>>::default(); - let mut rb1 = Rb::<Array<i32, 4>>::default(); + let rb0 = Rb::<Array<i32, 4>>::default(); + let rb1 = Rb::<Array<i32, 4>>::default(); let (mut prod0, mut cons0) = rb0.split_ref(); let (mut prod1, mut cons1) = rb1.split_ref(); @@ -62,8 +62,8 @@ fn move_slice() { #[test] fn move_slice_count() { - let mut rb0 = Rb::<Array<i32, 4>>::default(); - let mut rb1 = Rb::<Array<i32, 4>>::default(); + let rb0 = Rb::<Array<i32, 4>>::default(); + let rb1 = Rb::<Array<i32, 4>>::default(); let (mut prod0, mut cons0) = rb0.split_ref(); let (mut prod1, mut cons1) = rb1.split_ref(); diff --git a/src/traits/split.rs b/src/traits/split.rs index f466087..1204dd4 100644 --- a/src/traits/split.rs +++ b/src/traits/split.rs @@ -23,5 +23,5 @@ pub trait SplitRef { Self: 'a; /// Perform splitting by reference. - fn split_ref(&mut self) -> (Self::RefProd<'_>, Self::RefCons<'_>); + fn split_ref(&self) -> (Self::RefProd<'_>, Self::RefCons<'_>); }