partway through extension

orchid-base/src/builtin.rs

@@ -11,8 +11,11 @@ use crate::api;
 ///
 /// There are no ordering guarantees about these
 pub trait ExtPort {
-	fn send(&self, msg: &[u8]) -> LocalBoxFuture<'_, ()>;
-	fn recv<'s, 'a: 's>(&'s self, cb: Box<dyn FnOnce(&[u8]) + 'a>) -> LocalBoxFuture<'a, ()>;
+	fn send<'a>(&'a self, msg: &'a [u8]) -> LocalBoxFuture<'a, ()>;
+	fn recv<'a, 's: 'a>(
+		&'s self,
+		cb: Box<dyn FnOnce(&[u8]) -> LocalBoxFuture<'a, ()> + 'a>,
+	) -> LocalBoxFuture<'a, ()>;
 }
 
 pub struct ExtInit {
@@ -21,7 +24,12 @@ pub struct ExtInit {
 }
 impl ExtInit {
 	pub async fn send(&self, msg: &[u8]) { self.port.send(msg).await }
-	pub async fn recv(&self, cb: impl FnOnce(&[u8]) + Send) { self.port.recv(Box::new(cb)).await }
+	pub async fn recv<'a, 's: 'a>(
+		&'s self,
+		cb: Box<dyn FnOnce(&[u8]) -> LocalBoxFuture<'a, ()> + 'a>,
+	) {
+		self.port.recv(Box::new(cb)).await
+	}
 }
 impl Deref for ExtInit {
 	type Target = api::ExtensionHeader;

orchid-base/src/reqnot.rs

@@ -24,8 +24,8 @@ trait_set! {
 	pub trait SendFn<T: MsgSet> =
 		for<'a> FnMut(&'a [u8], ReqNot<T>) -> LocalBoxFuture<'a, ()>
 		+ DynClone + Send + 'static;
-	pub trait ReqFn<T: MsgSet> =
-		for<'a> FnMut(RequestHandle<'a, T>, <T::In as Channel>::Req) -> LocalBoxFuture<'a, Receipt<'a>>
+	pub trait ReqFn<T: MsgSet> = for<'a> FnMut(RequestHandle<'a, T>, <T::In as Channel>::Req)
+		-> LocalBoxFuture<'a, Receipt<'a>>
 		+ DynClone + Send + Sync + 'static;
 	pub trait NotifFn<T: MsgSet> =
 		FnMut(<T::In as Channel>::Notif, ReqNot<T>) -> LocalBoxFuture<'static, ()>