From 8be852662a432d96553fcf7a9fc57c4f3c92baae Mon Sep 17 00:00:00 2001 From: Mica White Date: Mon, 8 Dec 2025 20:03:40 -0500 Subject: Stuff --- src/collection/boxed.rs | 16 ++++++++++++---- src/collection/guard.rs | 0 src/collection/owned.rs | 16 ++++++++++++---- src/collection/ref.rs | 16 ++++++++++++---- src/collection/retry.rs | 16 ++++++++++++---- src/collection/utils.rs | 0 6 files changed, 48 insertions(+), 16 deletions(-) mode change 100644 => 100755 src/collection/boxed.rs mode change 100644 => 100755 src/collection/guard.rs mode change 100644 => 100755 src/collection/owned.rs mode change 100644 => 100755 src/collection/ref.rs mode change 100644 => 100755 src/collection/retry.rs mode change 100644 => 100755 src/collection/utils.rs (limited to 'src/collection') diff --git a/src/collection/boxed.rs b/src/collection/boxed.rs old mode 100644 new mode 100755 index 7767b31..3708c8b --- a/src/collection/boxed.rs +++ b/src/collection/boxed.rs @@ -361,14 +361,18 @@ impl BoxedLockCollection { } } - pub fn scoped_lock<'a, R>(&'a self, key: impl Keyable, f: impl Fn(L::DataMut<'a>) -> R) -> R { + pub fn scoped_lock<'a, R>( + &'a self, + key: impl Keyable, + f: impl FnOnce(L::DataMut<'a>) -> R, + ) -> R { scoped_write(self, key, f) } pub fn scoped_try_lock<'a, Key: Keyable, R>( &'a self, key: Key, - f: impl Fn(L::DataMut<'a>) -> R, + f: impl FnOnce(L::DataMut<'a>) -> R, ) -> Result { scoped_try_write(self, key, f) } @@ -473,14 +477,18 @@ impl BoxedLockCollection { } impl BoxedLockCollection { - pub fn scoped_read<'a, R>(&'a self, key: impl Keyable, f: impl Fn(L::DataRef<'a>) -> R) -> R { + pub fn scoped_read<'a, R>( + &'a self, + key: impl Keyable, + f: impl FnOnce(L::DataRef<'a>) -> R, + ) -> R { scoped_read(self, key, f) } pub fn scoped_try_read<'a, Key: Keyable, R>( &'a self, key: Key, - f: impl Fn(L::DataRef<'a>) -> R, + f: impl FnOnce(L::DataRef<'a>) -> R, ) -> Result { scoped_try_read(self, key, f) } diff --git a/src/collection/guard.rs b/src/collection/guard.rs old mode 100644 new mode 100755 diff --git a/src/collection/owned.rs b/src/collection/owned.rs old mode 100644 new mode 100755 index 38e6a16..d6889d1 --- a/src/collection/owned.rs +++ b/src/collection/owned.rs @@ -189,14 +189,18 @@ impl OwnedLockCollection { Self { data } } - pub fn scoped_lock<'a, R>(&'a self, key: impl Keyable, f: impl Fn(L::DataMut<'a>) -> R) -> R { + pub fn scoped_lock<'a, R>( + &'a self, + key: impl Keyable, + f: impl FnOnce(L::DataMut<'a>) -> R, + ) -> R { scoped_write(self, key, f) } pub fn scoped_try_lock<'a, Key: Keyable, R>( &'a self, key: Key, - f: impl Fn(L::DataMut<'a>) -> R, + f: impl FnOnce(L::DataMut<'a>) -> R, ) -> Result { scoped_try_write(self, key, f) } @@ -304,14 +308,18 @@ impl OwnedLockCollection { } impl OwnedLockCollection { - pub fn scoped_read<'a, R>(&'a self, key: impl Keyable, f: impl Fn(L::DataRef<'a>) -> R) -> R { + pub fn scoped_read<'a, R>( + &'a self, + key: impl Keyable, + f: impl FnOnce(L::DataRef<'a>) -> R, + ) -> R { scoped_read(self, key, f) } pub fn scoped_try_read<'a, Key: Keyable, R>( &'a self, key: Key, - f: impl Fn(L::DataRef<'a>) -> R, + f: impl FnOnce(L::DataRef<'a>) -> R, ) -> Result { scoped_try_read(self, key, f) } diff --git a/src/collection/ref.rs b/src/collection/ref.rs old mode 100644 new mode 100755 index e71624d..d180ab0 --- a/src/collection/ref.rs +++ b/src/collection/ref.rs @@ -240,14 +240,18 @@ impl<'a, L: Lockable> RefLockCollection<'a, L> { Some(Self { data, locks }) } - pub fn scoped_lock<'s, R>(&'s self, key: impl Keyable, f: impl Fn(L::DataMut<'s>) -> R) -> R { + pub fn scoped_lock<'s, R>( + &'s self, + key: impl Keyable, + f: impl FnOnce(L::DataMut<'s>) -> R, + ) -> R { scoped_write(self, key, f) } pub fn scoped_try_lock<'s, Key: Keyable, R>( &'s self, key: Key, - f: impl Fn(L::DataMut<'s>) -> R, + f: impl FnOnce(L::DataMut<'s>) -> R, ) -> Result { scoped_try_write(self, key, f) } @@ -355,14 +359,18 @@ impl<'a, L: Lockable> RefLockCollection<'a, L> { } impl RefLockCollection<'_, L> { - pub fn scoped_read<'a, R>(&'a self, key: impl Keyable, f: impl Fn(L::DataRef<'a>) -> R) -> R { + pub fn scoped_read<'a, R>( + &'a self, + key: impl Keyable, + f: impl FnOnce(L::DataRef<'a>) -> R, + ) -> R { scoped_read(self, key, f) } pub fn scoped_try_read<'a, Key: Keyable, R>( &'a self, key: Key, - f: impl Fn(L::DataRef<'a>) -> R, + f: impl FnOnce(L::DataRef<'a>) -> R, ) -> Result { scoped_try_read(self, key, f) } diff --git a/src/collection/retry.rs b/src/collection/retry.rs old mode 100644 new mode 100755 index 15f626d..e127c20 --- a/src/collection/retry.rs +++ b/src/collection/retry.rs @@ -534,14 +534,18 @@ impl RetryingLockCollection { (!contains_duplicates(&data)).then_some(unsafe { Self::new_unchecked(data) }) } - pub fn scoped_lock<'a, R>(&'a self, key: impl Keyable, f: impl Fn(L::DataMut<'a>) -> R) -> R { + pub fn scoped_lock<'a, R>( + &'a self, + key: impl Keyable, + f: impl FnOnce(L::DataMut<'a>) -> R, + ) -> R { scoped_write(self, key, f) } pub fn scoped_try_lock<'a, Key: Keyable, R>( &'a self, key: Key, - f: impl Fn(L::DataMut<'a>) -> R, + f: impl FnOnce(L::DataMut<'a>) -> R, ) -> Result { scoped_try_write(self, key, f) } @@ -649,14 +653,18 @@ impl RetryingLockCollection { } impl RetryingLockCollection { - pub fn scoped_read<'a, R>(&'a self, key: impl Keyable, f: impl Fn(L::DataRef<'a>) -> R) -> R { + pub fn scoped_read<'a, R>( + &'a self, + key: impl Keyable, + f: impl FnOnce(L::DataRef<'a>) -> R, + ) -> R { scoped_read(self, key, f) } pub fn scoped_try_read<'a, Key: Keyable, R>( &'a self, key: Key, - f: impl Fn(L::DataRef<'a>) -> R, + f: impl FnOnce(L::DataRef<'a>) -> R, ) -> Result { scoped_try_read(self, key, f) } diff --git a/src/collection/utils.rs b/src/collection/utils.rs old mode 100644 new mode 100755 -- cgit v1.2.3