Simplify signature

kamu-data · Jul 29, 2024 · 17adbf8 · 17adbf8
1 parent 9f31147
commit 17adbf8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/dill/src/catalog.rs b/dill/src/catalog.rs
@@ -65,15 +65,13 @@ impl Catalog {
         }
     }
 
-    pub fn builders_for_with_meta<'a, Iface, Meta, P>(
+    pub fn builders_for_with_meta<'a, Iface, Meta>(
         &'a self,
-        pred: P,
+        pred: impl Fn(&Meta) -> bool + 'a,
     ) -> Box<dyn Iterator<Item = TypecastBuilder<'a, Iface>> + 'a>
     where
         Iface: 'static + ?Sized,
         Meta: 'static,
-        P: Fn(&Meta) -> bool,
-        P: 'a,
     {
         let iface_type = IfaceTypeId(TypeId::of::<Iface>());
         let bindings = self.0.bindings.get_vec(&iface_type);

diff --git a/dill/tests/tests/test_metadata.rs b/dill/tests/tests/test_metadata.rs
@@ -93,7 +93,7 @@ fn test_metadata() {
 
     // Check helper methods
     let mut res = cat
-        .builders_for_with_meta::<dyn EventHandler, _, _>(|desc: &EventHandlerDesc| {
+        .builders_for_with_meta::<dyn EventHandler, _>(|desc: &EventHandlerDesc| {
             desc.event_type == "B"
         })
         .map(|b| b.instance_type_name())
@@ -116,7 +116,7 @@ fn test_metadata() {
         type ReturnType = Vec<std::sync::Arc<dyn EventHandler>>;
 
         fn get(cat: &dill::Catalog) -> Result<Self::ReturnType, dill::InjectionError> {
-            cat.builders_for_with_meta::<dyn EventHandler, _, _>(|desc: &EventHandlerDesc| {
+            cat.builders_for_with_meta::<dyn EventHandler, _>(|desc: &EventHandlerDesc| {
                 desc.event_type == "A"
             })
             .map(|b| b.get(cat))