Phased out async-stream in pursuit of compile performance

orchid-host/src/extension.rs

@@ -5,7 +5,7 @@ use std::num::NonZeroU64;
 use std::pin::pin;
 use std::rc::{Rc, Weak};
 
-use async_stream::stream;
+use async_fn_stream::stream;
 use derive_destructure::destructure;
 use futures::channel::mpsc::{Sender, channel};
 use futures::future::{join, join_all};
@@ -66,7 +66,7 @@ impl Extension {
 			let init = Rc::new(init);
 			let (exiting_snd, exiting_rcv) = channel::<()>(0);
 			(ctx.spawn)(clone!(init, weak, ctx; Box::pin(async move {
-				let rcv_stream = stream! { loop { yield init.recv().await } };
+				let rcv_stream = stream(async |mut cx| loop { cx.emit( init.recv().await).await });
 				let mut event_stream = pin!(stream::select(exiting_rcv.map(|()| None), rcv_stream));
 				while let Some(Some(msg)) = event_stream.next().await {
 					if let Some(reqnot) = weak.upgrade().map(|rc| rc.reqnot.clone()) {
@@ -207,14 +207,15 @@ impl Extension {
 											let sys = weak_sys.upgrade().expect("ResolveNames after sys drop");
 											sys.name_resolver(*constid).await
 										};
-										let responses = stream! {
+										let responses = stream(async |mut cx| {
 											for name in names {
-												yield match resolver(&ctx.i.ex(*name).await[..]).await {
+												cx.emit(match resolver(&ctx.i.ex(*name).await[..]).await {
 													Ok(abs) => Ok(abs.to_sym(&ctx.i).await.to_api()),
 													Err(e) => Err(e.to_api()),
-												}
+												})
+												.await
 											}
-										}
+										})
 										.collect()
 										.await;
 										hand.handle(rn, &responses).await