fix infinite recursion

Author: jdonszelmann

scopegraphs-lib/src/containers/env.rs

@@ -95,7 +95,7 @@ where
         let fut = Shared::clone(&self.0);
         FutureWrapper::new(async move {
             let env = fut.await;
-            map(&env).await
+            map(&env).0.await
         })
     }
 }

scopegraphs-lib/src/containers/path.rs

@@ -68,7 +68,7 @@ where
     ) -> Self::EnvContainer {
         let future = async move {
             let paths = self.0.await;
-            let env_futures = paths.into_iter().map(f);
+            let env_futures = paths.into_iter().map(f).map(|i| i.0);
             let envs = join_all(env_futures).await;
             envs.into_iter().collect::<Env<_, _>>()
         };

scopegraphs-lib/src/containers/scope.rs

@@ -42,6 +42,6 @@ where
     type PathContainer = FutureWrapper<'rslv, SC::PathContainer>;
 
     fn lift_step(self, lbl: LABEL, prefix: Path<LABEL>) -> Self::PathContainer {
-        FutureWrapper::new(async move { self.await.lift_step(lbl, prefix.clone()) })
+        FutureWrapper::new(async move { self.0.await.lift_step(lbl, prefix.clone()) })
     }
 }

scopegraphs-lib/src/future_wrapper.rs

@@ -30,11 +30,10 @@ impl<T> Debug for FutureWrapper<'_, T> {
     }
 }
 
-impl<'fut, T> Future for FutureWrapper<'fut, T> {
+impl<'fut, T: Clone> Future for FutureWrapper<'fut, T> {
     type Output = T;
 
     fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        let p: Pin<&mut dyn Future<Output = T>> = self.as_mut();
-        p.poll(cx)
+        Pin::new(&mut self.0).poll(cx)
     }
 }