[WIP] Removed more unused code

Author: Tamschi

flourish-bound/src/signal.rs

@@ -1378,26 +1378,6 @@ impl<T: ?Sized, S: ?Sized + UnmanagedSignal<T, SR>, SR: ?Sized + SignalsRuntimeR
 		self._managed().get_clone()
 	}
 
-	/// Records `self` as dependency and retrieves a copy of the value.
-	///
-	/// Prefer [`Signal::get`] where available.
-	pub fn get_exclusive(&self) -> T
-	where
-		T: Copy,
-	{
-		self._managed().get_clone_exclusive()
-	}
-
-	/// Records `self` as dependency and retrieves a clone of the value.
-	///
-	/// Prefer [`Signal::get_clone`] where available.
-	pub fn get_clone_exclusive(&self) -> T
-	where
-		T: Clone,
-	{
-		self._managed().get_clone_exclusive()
-	}
-
 	/// Records `self` as dependency and allows borrowing the value.
 	pub fn read<'r>(&'r self) -> S::Read<'r>
 	where
@@ -1407,17 +1387,6 @@ impl<T: ?Sized, S: ?Sized + UnmanagedSignal<T, SR>, SR: ?Sized + SignalsRuntimeR
 		self._managed().read()
 	}
 
-	/// Records `self` as dependency and allows borrowing the value.
-	///
-	/// Prefer [`Signal::read`] where available.
-	pub fn read_exclusive<'r>(&'r self) -> S::ReadExclusive<'r>
-	where
-		S: Sized,
-		T: 'r,
-	{
-		self._managed().read_exclusive()
-	}
-
 	/// The same as [`Signal::read`], but dyn-compatible.
 	///
 	/// Prefer [`Signal::read`] where available.
@@ -1428,16 +1397,6 @@ impl<T: ?Sized, S: ?Sized + UnmanagedSignal<T, SR>, SR: ?Sized + SignalsRuntimeR
 		self._managed().read_dyn()
 	}
 
-	/// The same as [`Signal::read_exclusive`], but dyn-compatible.
-	///
-	/// Prefer [`Signal::read_dyn`] where available.
-	pub fn read_exclusive_dyn<'r>(&'r self) -> Box<dyn 'r + Guard<T>>
-	where
-		T: 'r,
-	{
-		self._managed().read_exclusive_dyn()
-	}
-
 	/// Clones this [`Signal`]'s [`SignalsRuntimeRef`].
 	pub fn clone_runtime_ref(&self) -> SR
 	where

flourish-bound/src/signal_arc.rs

@@ -109,7 +109,7 @@ where
 	fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
 		self.strong.clone_runtime_ref().run_detached(|| {
 			f.debug_struct("SignalSR")
-				.field("(value)", &&**self.strong.read_exclusive_dyn())
+				.field("(value)", &&**self.strong.read_dyn())
 				.finish_non_exhaustive()
 		})
 	}

flourish-bound/src/subscription.rs

@@ -63,7 +63,7 @@ where
 	fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
 		self.subscribed.clone_runtime_ref().run_detached(|| {
 			f.debug_struct("SubscriptionSR")
-				.field("(value)", &&**self.subscribed.read_exclusive_dyn())
+				.field("(value)", &&**self.subscribed.read_dyn())
 				.finish_non_exhaustive()
 		})
 	}
@@ -516,7 +516,7 @@ impl<T: ?Sized, SR: ?Sized + SignalsRuntimeRef> Subscription<T, Opaque, SR> {
 					let effect = effect_with_runtime!({
 						let sub = &sub;
 						move || {
-							if !predicate_fn_pin(&**sub.read_exclusive_dyn()) {
+							if !predicate_fn_pin(&**sub.read_dyn()) {
 								drop(lock.take());
 							}
 						}
@@ -776,7 +776,7 @@ unsafe fn assume_init_subscription<
 			unsafe {
 				//SAFETY: `MaybeUninit` is ABI-compatible with what it wraps.
 				Box::from_raw(
-					*(&Box::into_raw(self.project_ref().0.read_exclusive_dyn())
+					*(&Box::into_raw(self.project_ref().0.read_dyn())
 						as *const *mut dyn Guard<MaybeUninit<T>> as *const *mut dyn Guard<T>),
 				)
 			}

flourish-bound/src/unmanaged/cached.rs

@@ -21,10 +21,8 @@ pub(crate) struct Cached<T: Clone, S: UnmanagedSignal<T, SR>, SR: SignalsRuntime
 );
 
 pub(crate) struct CachedGuard<'a, T: ?Sized>(RwLockReadGuard<'a, T>);
-pub(crate) struct CachedGuardExclusive<'a, T: ?Sized>(RwLockWriteGuard<'a, T>);
 
 impl<'a, T: ?Sized> Guard<T> for CachedGuard<'a, T> {}
-impl<'a, T: ?Sized> Guard<T> for CachedGuardExclusive<'a, T> {}
 
 impl<'a, T: ?Sized> Deref for CachedGuard<'a, T> {
 	type Target = T;
@@ -34,26 +32,12 @@ impl<'a, T: ?Sized> Deref for CachedGuard<'a, T> {
 	}
 }
 
-impl<'a, T: ?Sized> Deref for CachedGuardExclusive<'a, T> {
-	type Target = T;
-
-	fn deref(&self) -> &Self::Target {
-		self.0.deref()
-	}
-}
-
 impl<'a, T: ?Sized> Borrow<T> for CachedGuard<'a, T> {
 	fn borrow(&self) -> &T {
 		self.0.borrow()
 	}
 }
 
-impl<'a, T: ?Sized> Borrow<T> for CachedGuardExclusive<'a, T> {
-	fn borrow(&self) -> &T {
-		self.0.borrow()
-	}
-}
-
 impl<T: Clone, S: UnmanagedSignal<T, SR>, SR: SignalsRuntimeRef> Cached<T, S, SR> {
 	pub(crate) fn new(source: S) -> Self {
 		let runtime = source.clone_runtime_ref();
@@ -87,7 +71,7 @@ impl<T: Clone, S: UnmanagedSignal<T, SR>, SR: SignalsRuntimeRef>
 			cache: Pin<&ForceSyncUnpin<RwLock<T>>>,
 		) -> Propagation {
 			//FIXME: This can be split up to avoid congestion where not necessary.
-			let new_value = source.project_ref().0.get_clone_exclusive();
+			let new_value = source.project_ref().0.get_clone();
 			*cache.project_ref().0.write().unwrap() = new_value;
 			Propagation::Propagate
 		}
@@ -115,7 +99,7 @@ impl<T: Clone, S: UnmanagedSignal<T, SR>, SR: SignalsRuntimeRef> Cached<T, S, SR
 	) -> Token<'a> {
 		cache.write(ForceSyncUnpin(
 			//FIXME: This can be split up to avoid congestion where not necessary.
-			source.project_ref().0.get_clone_exclusive().into(),
+			source.project_ref().0.get_clone().into(),
 		))
 	}
 }

flourish-bound/src/unmanaged/computed.rs

@@ -24,10 +24,8 @@ pub(crate) struct Computed<T, F: FnMut() -> T, SR: SignalsRuntimeRef>(
 struct ForceSyncUnpin<T: ?Sized>(#[pin] T);
 
 pub(crate) struct ComputedGuard<'a, T: ?Sized>(RwLockReadGuard<'a, T>);
-pub(crate) struct ComputedGuardExclusive<'a, T: ?Sized>(RwLockWriteGuard<'a, T>);
 
 impl<'a, T: ?Sized> Guard<T> for ComputedGuard<'a, T> {}
-impl<'a, T: ?Sized> Guard<T> for ComputedGuardExclusive<'a, T> {}
 
 impl<'a, T: ?Sized> Deref for ComputedGuard<'a, T> {
 	type Target = T;
@@ -37,26 +35,12 @@ impl<'a, T: ?Sized> Deref for ComputedGuard<'a, T> {
 	}
 }
 
-impl<'a, T: ?Sized> Deref for ComputedGuardExclusive<'a, T> {
-	type Target = T;
-
-	fn deref(&self) -> &Self::Target {
-		self.0.deref()
-	}
-}
-
 impl<'a, T: ?Sized> Borrow<T> for ComputedGuard<'a, T> {
 	fn borrow(&self) -> &T {
 		self.0.borrow()
 	}
 }
 
-impl<'a, T: ?Sized> Borrow<T> for ComputedGuardExclusive<'a, T> {
-	fn borrow(&self) -> &T {
-		self.0.borrow()
-	}
-}
-
 impl<T, F: FnMut() -> T, SR: SignalsRuntimeRef> Computed<T, F, SR> {
 	pub(crate) fn new(fn_pin: F, runtime: SR) -> Self {
 		Self(RawSignal::with_runtime(

flourish-bound/src/unmanaged/computed_uncached.rs

@@ -16,10 +16,8 @@ pub(crate) struct ComputedUncached<T, F: Fn() -> T, SR: SignalsRuntimeRef>(
 );
 
 pub(crate) struct ComputedUncachedGuard<T: ?Sized>(T);
-pub(crate) struct ComputedUncachedGuardExclusive<T: ?Sized>(T);
 
 impl<T: ?Sized> Guard<T> for ComputedUncachedGuard<T> {}
-impl<T: ?Sized> Guard<T> for ComputedUncachedGuardExclusive<T> {}
 
 impl<T: ?Sized> Deref for ComputedUncachedGuard<T> {
 	type Target = T;
@@ -29,26 +27,12 @@ impl<T: ?Sized> Deref for ComputedUncachedGuard<T> {
 	}
 }
 
-impl<T: ?Sized> Deref for ComputedUncachedGuardExclusive<T> {
-	type Target = T;
-
-	fn deref(&self) -> &Self::Target {
-		&self.0
-	}
-}
-
 impl<T: ?Sized> Borrow<T> for ComputedUncachedGuard<T> {
 	fn borrow(&self) -> &T {
 		self.0.borrow()
 	}
 }
 
-impl<T: ?Sized> Borrow<T> for ComputedUncachedGuardExclusive<T> {
-	fn borrow(&self) -> &T {
-		self.0.borrow()
-	}
-}
-
 impl<T, F: Fn() -> T, SR: SignalsRuntimeRef> ComputedUncached<T, F, SR> {
 	pub(crate) fn new(fn_pin: F, runtime: SR) -> Self {
 		Self(RawSignal::with_runtime(

flourish-bound/src/unmanaged/computed_uncached_mut.rs

@@ -19,10 +19,8 @@ pub(crate) struct ComputedUncachedMut<T, F: FnMut() -> T, SR: SignalsRuntimeRef>
 struct ForceSyncUnpin<T: ?Sized>(#[pin] T);
 
 pub(crate) struct ComputedUncachedMutGuard<T: ?Sized>(T);
-pub(crate) struct ComputedUncachedMutGuardExclusive<T: ?Sized>(T);
 
 impl<T: ?Sized> Guard<T> for ComputedUncachedMutGuard<T> {}
-impl<T: ?Sized> Guard<T> for ComputedUncachedMutGuardExclusive<T> {}
 
 impl<T: ?Sized> Deref for ComputedUncachedMutGuard<T> {
 	type Target = T;
@@ -32,26 +30,12 @@ impl<T: ?Sized> Deref for ComputedUncachedMutGuard<T> {
 	}
 }
 
-impl<T: ?Sized> Deref for ComputedUncachedMutGuardExclusive<T> {
-	type Target = T;
-
-	fn deref(&self) -> &Self::Target {
-		&self.0
-	}
-}
-
 impl<T: ?Sized> Borrow<T> for ComputedUncachedMutGuard<T> {
 	fn borrow(&self) -> &T {
 		self.0.borrow()
 	}
 }
 
-impl<T: ?Sized> Borrow<T> for ComputedUncachedMutGuardExclusive<T> {
-	fn borrow(&self) -> &T {
-		self.0.borrow()
-	}
-}
-
 impl<T, F: FnMut() -> T, SR: SignalsRuntimeRef> ComputedUncachedMut<T, F, SR> {
 	pub(crate) fn new(fn_pin: F, runtime: SR) -> Self {
 		Self(RawSignal::with_runtime(
@@ -92,7 +76,7 @@ impl<T, F: FnMut() -> T, SR: SignalsRuntimeRef> UnmanagedSignal<T, SR>
 	where
 		T: Clone,
 	{
-		self.get_clone_exclusive()
+		self.0.clone()
 	}
 
 	fn read<'r>(self: Pin<&'r Self>) -> ComputedUncachedMutGuard<T>

flourish-bound/src/unmanaged/folded.rs

@@ -25,10 +25,8 @@ pub(crate) struct Folded<T, F: FnMut(&mut T) -> Propagation, SR: SignalsRuntimeR
 struct ForceSyncUnpin<T: ?Sized>(T);
 
 pub(crate) struct FoldedGuard<'a, T: ?Sized>(RwLockReadGuard<'a, T>);
-pub(crate) struct FoldedGuardExclusive<'a, T: ?Sized>(RwLockWriteGuard<'a, T>);
 
 impl<'a, T: ?Sized> Guard<T> for FoldedGuard<'a, T> {}
-impl<'a, T: ?Sized> Guard<T> for FoldedGuardExclusive<'a, T> {}
 
 impl<'a, T: ?Sized> Deref for FoldedGuard<'a, T> {
 	type Target = T;
@@ -38,26 +36,12 @@ impl<'a, T: ?Sized> Deref for FoldedGuard<'a, T> {
 	}
 }
 
-impl<'a, T: ?Sized> Deref for FoldedGuardExclusive<'a, T> {
-	type Target = T;
-
-	fn deref(&self) -> &Self::Target {
-		self.0.deref()
-	}
-}
-
 impl<'a, T: ?Sized> Borrow<T> for FoldedGuard<'a, T> {
 	fn borrow(&self) -> &T {
 		self.0.borrow()
 	}
 }
 
-impl<'a, T: ?Sized> Borrow<T> for FoldedGuardExclusive<'a, T> {
-	fn borrow(&self) -> &T {
-		self.0.borrow()
-	}
-}
-
 impl<T, F: FnMut(&mut T) -> Propagation, SR: SignalsRuntimeRef> Folded<T, F, SR> {
 	pub(crate) fn new(init: T, fn_pin: F, runtime: SR) -> Self {
 		Self(RawSignal::with_runtime(

flourish-bound/src/unmanaged/inert_cell.rs

@@ -49,10 +49,8 @@ impl<T: Debug + ?Sized> Debug for AssertSync<RwLock<T>> {
 }
 
 pub(crate) struct InertCellGuard<'a, T: ?Sized>(RwLockReadGuard<'a, T>);
-pub(crate) struct InertCellGuardExclusive<'a, T: ?Sized>(RwLockWriteGuard<'a, T>);
 
 impl<'a, T: ?Sized> Guard<T> for InertCellGuard<'a, T> {}
-impl<'a, T: ?Sized> Guard<T> for InertCellGuardExclusive<'a, T> {}
 
 impl<'a, T: ?Sized> Deref for InertCellGuard<'a, T> {
 	type Target = T;
@@ -62,26 +60,12 @@ impl<'a, T: ?Sized> Deref for InertCellGuard<'a, T> {
 	}
 }
 
-impl<'a, T: ?Sized> Deref for InertCellGuardExclusive<'a, T> {
-	type Target = T;
-
-	fn deref(&self) -> &Self::Target {
-		self.0.deref()
-	}
-}
-
 impl<'a, T: ?Sized> Borrow<T> for InertCellGuard<'a, T> {
 	fn borrow(&self) -> &T {
 		self.0.borrow()
 	}
 }
 
-impl<'a, T: ?Sized> Borrow<T> for InertCellGuardExclusive<'a, T> {
-	fn borrow(&self) -> &T {
-		self.0.borrow()
-	}
-}
-
 impl<T: ?Sized, SR: SignalsRuntimeRef> InertCell<T, SR> {
 	pub(crate) fn with_runtime(initial_value: T, runtime: SR) -> Self
 	where
@@ -96,10 +80,6 @@ impl<T: ?Sized, SR: SignalsRuntimeRef> InertCell<T, SR> {
 		InertCellGuard(self.touch().read().unwrap())
 	}
 
-	pub(crate) fn read_exclusive<'a>(self: Pin<&'a Self>) -> impl 'a + Guard<T> {
-		InertCellGuardExclusive(self.touch().write().unwrap())
-	}
-
 	fn touch(self: Pin<&Self>) -> &RwLock<T> {
 		unsafe {
 			// SAFETY: Doesn't defer memory access.

flourish-bound/src/unmanaged/raw_effect.rs

@@ -13,7 +13,7 @@ pub struct RawEffect<T, S: FnMut() -> T, D: FnMut(T), SR: SignalsRuntimeRef>(
 	RawSignal<ForceSyncUnpin<Mutex<(S, D)>>, ForceSyncUnpin<Mutex<Option<T>>>, SR>,
 );
 
-//TODO: Add some associated methods, like not-boxing `read`/`read_exclusive`.
+//TODO: Add some associated methods, like not-boxing `read`.
 //TODO: Turn some of these functions into methods.
 
 #[doc(hidden)]