partway through fixes, macro system needs resdesign

orchid-extension/src/cmd_atom.rs

@@ -1,23 +1,23 @@
 use std::borrow::Cow;
+use std::rc::Rc;
 
-use dyn_clone::DynClone;
 use futures::future::LocalBoxFuture;
 use never::Never;
 use orchid_base::{Receipt, ReqHandle, ReqHandleExt};
-use trait_set::trait_set;
 
-use crate::gen_expr::{GExpr, new_atom};
+use crate::gen_expr::{GExpr, new_atom, serialize};
 use crate::std_reqs::RunCommand;
 use crate::{Atomic, MethodSetBuilder, OwnedAtom, OwnedVariant, Supports, ToExpr};
 
-trait_set! {
-	pub trait ClonableAsyncFnOnceDyn = FnOnce() -> LocalBoxFuture<'static, Option<GExpr>> + DynClone;
+pub trait AsyncFnDyn {
+	fn call<'a>(&'a self) -> LocalBoxFuture<'a, Option<GExpr>>;
+}
+impl<T: AsyncFn() -> Option<GExpr>> AsyncFnDyn for T {
+	fn call<'a>(&'a self) -> LocalBoxFuture<'a, Option<GExpr>> { Box::pin(async { (self)().await }) }
 }
 
-pub struct CmdAtom(Box<dyn ClonableAsyncFnOnceDyn>);
-impl Clone for CmdAtom {
-	fn clone(&self) -> Self { Self(dyn_clone::clone_box(&*self.0)) }
-}
+#[derive(Clone)]
+pub struct CmdAtom(Rc<dyn AsyncFnDyn>);
 impl Atomic for CmdAtom {
 	type Data = ();
 	type Variant = OwnedVariant;
@@ -29,17 +29,10 @@ impl Supports<RunCommand> for CmdAtom {
 		hand: Box<dyn ReqHandle<'a> + '_>,
 		req: RunCommand,
 	) -> std::io::Result<Receipt<'a>> {
-		Self(dyn_clone::clone_box(&*self.0)).handle_final(hand, req).await
-	}
-	async fn handle_final<'a>(
-		self,
-		hand: Box<dyn ReqHandle<'a> + '_>,
-		req: RunCommand,
-	) -> std::io::Result<Receipt<'a>> {
-		let reply = (self.0)().await;
+		let reply = self.0.call().await;
 		match reply {
 			None => hand.reply(&req, &None).await,
-			Some(next) => hand.reply(&req, &Some(next.serialize().await)).await,
+			Some(next) => hand.reply(&req, &Some(serialize(next).await)).await,
 		}
 	}
 }
@@ -48,13 +41,9 @@ impl OwnedAtom for CmdAtom {
 	async fn val(&self) -> Cow<'_, Self::Data> { Cow::Owned(()) }
 }
 
-pub fn cmd<R: ToExpr>(f: impl AsyncFnOnce() -> Option<R> + Clone + 'static) -> GExpr {
-	new_atom(CmdAtom(Box::new(|| {
-		Box::pin(async {
-			match f().await {
-				None => None,
-				Some(r) => Some(r.to_gen().await),
-			}
-		})
+pub fn cmd<R: ToExpr>(f: impl AsyncFn() -> Option<R> + Clone + 'static) -> GExpr {
+	new_atom(CmdAtom(Rc::new(async move || match f().await {
+		None => None,
+		Some(r) => Some(r.to_gen().await),
 	})))
 }