From 2096d0c6819ce0e8f6c6e77e36ebc495924dad63 Mon Sep 17 00:00:00 2001 From: Mica White Date: Sat, 7 Feb 2026 10:45:11 -0500 Subject: Rename data to child --- src/collection/owned.rs | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'src/collection/owned.rs') diff --git a/src/collection/owned.rs b/src/collection/owned.rs index d6889d1..02d434c 100755 --- a/src/collection/owned.rs +++ b/src/collection/owned.rs @@ -10,39 +10,39 @@ unsafe impl RawLock for OwnedLockCollection { #[mutants::skip] // this should never run #[cfg(not(tarpaulin_include))] fn poison(&self) { - let locks = utils::get_locks_unsorted(&self.data); + let locks = utils::get_locks_unsorted(&self.child); for lock in locks { lock.poison(); } } unsafe fn raw_write(&self) { - utils::ordered_write(&utils::get_locks_unsorted(&self.data)) + utils::ordered_write(&utils::get_locks_unsorted(&self.child)) } unsafe fn raw_try_write(&self) -> bool { - let locks = utils::get_locks_unsorted(&self.data); + let locks = utils::get_locks_unsorted(&self.child); utils::ordered_try_write(&locks) } unsafe fn raw_unlock_write(&self) { - let locks = utils::get_locks_unsorted(&self.data); + let locks = utils::get_locks_unsorted(&self.child); for lock in locks { lock.raw_unlock_write(); } } unsafe fn raw_read(&self) { - utils::ordered_read(&utils::get_locks_unsorted(&self.data)) + utils::ordered_read(&utils::get_locks_unsorted(&self.child)) } unsafe fn raw_try_read(&self) -> bool { - let locks = utils::get_locks_unsorted(&self.data); + let locks = utils::get_locks_unsorted(&self.child); utils::ordered_try_read(&locks) } unsafe fn raw_unlock_read(&self) { - let locks = utils::get_locks_unsorted(&self.data); + let locks = utils::get_locks_unsorted(&self.child); for lock in locks { lock.raw_unlock_read(); } @@ -70,11 +70,11 @@ unsafe impl Lockable for OwnedLockCollection { } unsafe fn guard(&self) -> Self::Guard<'_> { - self.data.guard() + self.child.guard() } unsafe fn data_mut(&self) -> Self::DataMut<'_> { - self.data.data_mut() + self.child.data_mut() } } @@ -85,7 +85,7 @@ impl LockableGetMut for OwnedLockCollection { Self: 'a; fn get_mut(&mut self) -> Self::Inner<'_> { - self.data.get_mut() + self.child.get_mut() } } @@ -93,7 +93,7 @@ impl LockableIntoInner for OwnedLockCollection { type Inner = L::Inner; fn into_inner(self) -> Self::Inner { - self.data.into_inner() + self.child.into_inner() } } @@ -109,11 +109,11 @@ unsafe impl Sharable for OwnedLockCollection { Self: 'a; unsafe fn read_guard(&self) -> Self::ReadGuard<'_> { - self.data.read_guard() + self.child.read_guard() } unsafe fn data_ref(&self) -> Self::DataRef<'_> { - self.data.data_ref() + self.child.data_ref() } } @@ -127,7 +127,7 @@ where type IntoIter = ::IntoIter; fn into_iter(self) -> Self::IntoIter { - self.data.into_iter() + self.child.into_iter() } } @@ -142,7 +142,7 @@ impl + OwnedLockable> FromIterator impl, L: OwnedLockable> Extend for OwnedLockCollection { fn extend>(&mut self, iter: T) { - self.data.extend(iter) + self.child.extend(iter) } } @@ -152,7 +152,7 @@ impl, L: OwnedLockable> Extend for OwnedLockColl impl> AsMut for OwnedLockCollection { fn as_mut(&mut self) -> &mut T { - self.data.as_mut() + self.child.as_mut() } } @@ -186,7 +186,7 @@ impl OwnedLockCollection { /// ``` #[must_use] pub const fn new(data: L) -> Self { - Self { data } + Self { child: data } } pub fn scoped_lock<'a, R>( @@ -232,7 +232,7 @@ impl OwnedLockCollection { self.raw_write(); // safety: we've locked all of this already - self.data.guard() + self.child.guard() }; LockGuard { guard, key } @@ -276,7 +276,7 @@ impl OwnedLockCollection { } // safety: we've acquired the locks - self.data.guard() + self.child.guard() }; Ok(LockGuard { guard, key }) @@ -351,7 +351,7 @@ impl OwnedLockCollection { LockGuard { // safety: we've already acquired the lock - guard: self.data.read_guard(), + guard: self.child.read_guard(), key, } } @@ -396,7 +396,7 @@ impl OwnedLockCollection { } // safety: we've acquired the locks - self.data.read_guard() + self.child.read_guard() }; Ok(LockGuard { guard, key }) @@ -444,7 +444,7 @@ impl OwnedLockCollection { /// ``` #[must_use] pub fn into_child(self) -> L { - self.data + self.child } /// Gets a mutable reference to the underlying collection. @@ -465,7 +465,7 @@ impl OwnedLockCollection { /// ``` #[must_use] pub fn child_mut(&mut self) -> &mut L { - &mut self.data + &mut self.child } } @@ -729,7 +729,7 @@ mod tests { collection.extend([Mutex::new(2)]); - assert_eq!(collection.data.len(), 3); + assert_eq!(collection.child.len(), 3); } #[test] -- cgit v1.2.3