feat: Get rid of Resolver struct

axum/Cargo.toml

@@ -5,6 +5,7 @@ version = "0.1.0"
 edition = "2021"
 rust-version = "1.67.1"
 license = "MIT"
+readme = "../README.md"
 repository = "https://github.com/yumemi-inc/ruice.git"
 authors = [
     "Naoki Ikeguchi <n_ikeguchi@yumemi.co.jp>",

core/Cargo.toml

@@ -5,6 +5,7 @@ version = "0.1.0"
 edition = "2021"
 rust-version = "1.67.1"
 license = "MIT"
+readme = "../README.md"
 repository = "https://github.com/yumemi-inc/ruice.git"
 authors = [
     "Naoki Ikeguchi <n_ikeguchi@yumemi.co.jp>",

core/src/bind.rs

@@ -4,9 +4,7 @@ use std::sync::Arc;
 
 use async_trait::async_trait;
 
-use crate::{
-    AsyncResolve, AsyncResolver, AsyncServices, Resolve, Resolver, ServiceContainer, Services,
-};
+use crate::{AsyncResolve, AsyncResolver, AsyncServices, Resolve, ServiceContainer, Services};
 
 pub struct Bound<Interface>
 where
@@ -100,7 +98,7 @@ pub trait BindServices: Services {
     where
         Interface: ?Sized + Send + Sync + 'static,
     {
-        self.put(Resolver::new(Bound::from(service)));
+        self.put(Bound::from(service));
     }
 
     fn bind_by<Interface, F>(&mut self, f: F)
@@ -109,7 +107,7 @@ pub trait BindServices: Services {
         F: (Fn(&Self) -> Option<Arc<Interface>>) + Send + Sync + 'static,
         Self: 'static,
     {
-        self.put(Resolver::new(BindBy::from(f)))
+        self.put(BindBy::from(f))
     }
 }
 

core/src/construct.rs

@@ -1,7 +1,7 @@
 use std::marker::PhantomData;
 use std::sync::Arc;
 
-use crate::{Resolve, Resolver, ServiceContainer, Services};
+use crate::{Resolve, ServiceContainer, Services};
 
 pub trait Construct<S = Self, C = ServiceContainer>: Send + Sync {
     fn construct(container: &C) -> Option<S>;
@@ -39,7 +39,7 @@ pub trait ConstructServices: Services {
     where
         S: Construct<S, Self> + 'static,
     {
-        self.put(Resolver::<S, Self>::new(Constructor::<S>::new()));
+        self.put(Constructor::<S>::new());
     }
 }
 

core/src/lib.rs

@@ -41,7 +41,7 @@ where
     fn resolve(&self, container: &C) -> Option<Arc<S>>;
 }
 
-pub struct Resolver<S, C = ServiceContainer>
+struct Resolver<S, C = ServiceContainer>
 where
     S: ?Sized,
 {
@@ -52,7 +52,7 @@ impl<S, C> Resolver<S, C>
 where
     S: ?Sized,
 {
-    pub fn new<R>(resolve: R) -> Self
+    fn new<R>(resolve: R) -> Self
     where
         R: Resolve<S, C> + 'static,
     {
@@ -61,7 +61,7 @@ where
         }
     }
 
-    pub fn as_inner(&self) -> &dyn Resolve<S, C> {
+    fn as_inner(&self) -> &dyn Resolve<S, C> {
         self.resolve.as_ref()
     }
 }
@@ -104,16 +104,17 @@ pub trait Services: Sized + Send + Sync {
     where
         S: ?Sized + Send + Sync + 'static;
 
-    fn put<S>(&mut self, resolver: Resolver<S, Self>)
+    fn put<S, R>(&mut self, resolver: R)
     where
-        S: ?Sized + Send + Sync + 'static;
+        S: ?Sized + Send + Sync + 'static,
+        R: Resolve<S, Self> + 'static;
 
     fn replace<S, F>(&mut self, f: F)
     where
         S: Send + Sync + 'static,
         F: FnOnce(Option<&S>) -> S,
     {
-        self.put(Resolver::new(Singleton::new(f(self.get::<S>().as_deref()))));
+        self.put(Singleton::new(f(self.get::<S>().as_deref())));
     }
 }
 
@@ -146,11 +147,13 @@ impl Services for ServiceContainer {
             .and_then(|r| r.as_inner().resolve(self))
     }
 
-    fn put<S>(&mut self, resolver: Resolver<S>)
+    fn put<S, R>(&mut self, resolver: R)
     where
         S: ?Sized + Send + Sync + 'static,
+        R: Resolve<S, Self> + 'static,
     {
-        self.services.insert(TypeId::of::<S>(), Arc::new(resolver));
+        self.services
+            .insert(TypeId::of::<S>(), Arc::new(Resolver::new(resolver)));
     }
 }
 

core/src/singleton.rs

@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use crate::{Resolve, Resolver, Services};
+use crate::{Resolve, Services};
 
 pub struct Singleton<S> {
     service: Arc<S>,
@@ -28,7 +28,7 @@ pub trait SingletonServices: Services {
     where
         S: Send + Sync + 'static,
     {
-        self.put(Resolver::new(Singleton::new(service)));
+        self.put(Singleton::new(service));
     }
 }