From 404fc8c802d9e8f59afeb59081084408420bca6b Mon Sep 17 00:00:00 2001
From: timofey <tim@ongoteam.yaconnect.com>
Date: Fri, 30 Jun 2023 20:50:03 +0000
Subject: [PATCH] `CountedInject`

---
 src/testing/counted.rs | 35 ++++++++++-------------------------
 1 file changed, 10 insertions(+), 25 deletions(-)

diff --git a/src/testing/counted.rs b/src/testing/counted.rs
index cb5f57c..ae0d93c 100644
--- a/src/testing/counted.rs
+++ b/src/testing/counted.rs
@@ -3,6 +3,7 @@ use std::cmp::max;
 use crate::func::{context::*, *};
 use crate::rcore::*;
 
+use super::inject::*;
 use super::*;
 
 pub struct TestContextCounted;
@@ -56,36 +57,20 @@ impl<A> Counted<A> {
     }
 }
 
-struct CountedResolver<'a> {
-    resolver: Rc<dyn Resolver<'a, TestContextCounted>>,
-}
+struct CountedInject;
 
-impl<'a> CountedResolver<'a> {
-    fn new(
-        resolver: Rc<dyn Resolver<'a, TestContextCounted>>,
-    ) -> Rc<dyn Resolver<'a, TestContextCounted>> {
-        Rc::new(Self { resolver })
-    }
-}
-
-impl<'a> Resolver<'a, TestContextCounted> for CountedResolver<'a> {
-    fn resolve(self: Rc<Self>, address: Address) -> HashResolution<'a, TestContextCounted> {
-        self.resolver
-            .clone()
-            .resolve_map(address, |resolved| {
-                let (src, resolver) = resolved?;
-                let delayed: Rc<dyn Resolver<'a, TestContextCounted>> =
-                    Rc::new(CountedResolver { resolver });
-                Ok((src, delayed))
-            })
-            .add(1)
+impl<'a> Inject<'a, TestContextCounted> for CountedInject {
+    fn inject<A: 'a>(
+        &self,
+        fa: Wrapped<'a, TestContextCounted, A>,
+    ) -> Wrapped<'a, TestContextCounted, A> {
+        fa.add(1)
     }
 }
 
 pub trait Delayable<'a>: Mentionable<'a, TestContextCounted> + Sized {
-    fn delay(self: Rc<Self>) -> ParseResultA<'a, TestContextCounted, Self> {
-        let factory = self.factory();
-        TypelessMentionable::from_typed(self).cast_full(factory, CountedResolver::new)
+    fn delay(&self) -> ParseResultA<'a, TestContextCounted, Self> {
+        Rc::new(CountedInject).inject_mentionable(self)
     }
 }