From 2db017af37dfedd49b854fb431ef629b8157eefc Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Fri, 30 Aug 2024 00:26:23 +0000
Subject: [PATCH] simplify service trait bounds and lifetimes

Signed-off-by: Jason Volk <jason@zemos.net>
---
 src/service/service.rs  | 23 +++++++++--------------
 src/service/services.rs |  8 ++++----
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/src/service/service.rs b/src/service/service.rs
index 635f782e..065f78a0 100644
--- a/src/service/service.rs
+++ b/src/service/service.rs
@@ -51,7 +51,7 @@ pub(crate) struct Args<'a> {
 
 /// Dep is a reference to a service used within another service.
 /// Circular-dependencies between services require this indirection.
-pub(crate) struct Dep<T> {
+pub(crate) struct Dep<T: Service> {
 	dep: OnceLock<Arc<T>>,
 	service: Weak<Map>,
 	name: &'static str,
@@ -62,7 +62,7 @@ pub(crate) type MapType = BTreeMap<MapKey, MapVal>;
 pub(crate) type MapVal = (Weak<dyn Service>, Weak<dyn Any + Send + Sync>);
 pub(crate) type MapKey = String;
 
-impl<T: Send + Sync + 'static> Deref for Dep<T> {
+impl<T: Service> Deref for Dep<T> {
 	type Target = Arc<T>;
 
 	/// Dereference a dependency. The dependency must be ready or panics.
@@ -80,7 +80,7 @@ impl<T: Send + Sync + 'static> Deref for Dep<T> {
 
 impl<'a> Args<'a> {
 	/// Create a lazy-reference to a service when constructing another Service.
-	pub(crate) fn depend<T: Send + Sync + 'a + 'static>(&'a self, name: &'static str) -> Dep<T> {
+	pub(crate) fn depend<T: Service>(&'a self, name: &'static str) -> Dep<T> {
 		Dep::<T> {
 			dep: OnceLock::new(),
 			service: Arc::downgrade(self.service),
@@ -90,17 +90,12 @@ impl<'a> Args<'a> {
 
 	/// Create a reference immediately to a service when constructing another
 	/// Service. The other service must be constructed.
-	pub(crate) fn require<T: Send + Sync + 'a + 'static>(&'a self, name: &'static str) -> Arc<T> {
-		require::<T>(self.service, name)
-	}
+	pub(crate) fn require<T: Service>(&'a self, name: &str) -> Arc<T> { require::<T>(self.service, name) }
 }
 
 /// Reference a Service by name. Panics if the Service does not exist or was
 /// incorrectly cast.
-pub(crate) fn require<'a, 'b, T>(map: &'b Map, name: &'a str) -> Arc<T>
-where
-	T: Send + Sync + 'a + 'b + 'static,
-{
+pub(crate) fn require<T: Service>(map: &Map, name: &str) -> Arc<T> {
 	try_get::<T>(map, name)
 		.inspect_err(inspect_log)
 		.expect("Failure to reference service required by another service.")
@@ -112,9 +107,9 @@ where
 /// # Panics
 /// Incorrect type is not a silent failure (None) as the type never has a reason
 /// to be incorrect.
-pub(crate) fn get<'a, 'b, T>(map: &'b Map, name: &'a str) -> Option<Arc<T>>
+pub(crate) fn get<T>(map: &Map, name: &str) -> Option<Arc<T>>
 where
-	T: Send + Sync + 'a + 'b + 'static,
+	T: Any + Send + Sync + Sized,
 {
 	map.read()
 		.expect("locked for reading")
@@ -129,9 +124,9 @@ where
 
 /// Reference a Service by name. Returns Err if the Service does not exist or
 /// was incorrectly cast.
-pub(crate) fn try_get<'a, 'b, T>(map: &'b Map, name: &'a str) -> Result<Arc<T>>
+pub(crate) fn try_get<T>(map: &Map, name: &str) -> Result<Arc<T>>
 where
-	T: Send + Sync + 'a + 'b + 'static,
+	T: Any + Send + Sync + Sized,
 {
 	map.read()
 		.expect("locked for reading")
diff --git a/src/service/services.rs b/src/service/services.rs
index 8e69cdbb..3aa095b8 100644
--- a/src/service/services.rs
+++ b/src/service/services.rs
@@ -193,16 +193,16 @@ impl Services {
 		}
 	}
 
-	pub fn try_get<'a, 'b, T>(&'b self, name: &'a str) -> Result<Arc<T>>
+	pub fn try_get<T>(&self, name: &str) -> Result<Arc<T>>
 	where
-		T: Send + Sync + 'a + 'b + 'static,
+		T: Any + Send + Sync + Sized,
 	{
 		service::try_get::<T>(&self.service, name)
 	}
 
-	pub fn get<'a, 'b, T>(&'b self, name: &'a str) -> Option<Arc<T>>
+	pub fn get<T>(&self, name: &str) -> Option<Arc<T>>
 	where
-		T: Send + Sync + 'a + 'b + 'static,
+		T: Any + Send + Sync + Sized,
 	{
 		service::get::<T>(&self.service, name)
 	}