Phased out async-stream in pursuit of compile performance

orchid-host/Cargo.toml

@@ -6,13 +6,13 @@ edition = "2024"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+async-fn-stream = { version = "0.1.0", path = "../async-fn-stream" }
 async-lock = "3.4.1"
 async-once-cell = "0.5.4"
 async-process = "2.4.0"
-async-stream = "0.3.6"
 bound = "0.6.0"
 derive_destructure = "1.0.0"
-futures = { version = "0.3.31", features = ["std"] }
+futures = { version = "0.3.31", features = ["std"], default-features = false }
 hashbrown = "0.16.0"
 itertools = "0.14.0"
 lazy_static = "1.5.0"

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

orchid-host/src/parse.rs

@@ -120,7 +120,7 @@ pub async fn parse_exportable_item<'a>(
 		let ext_lines = ctx.systems().flat_map(System::line_types).join(", ");
 		return Err(mk_errv(
 			ctx.i().i("Unrecognized line type").await,
-			format!("Line types are: const, mod, macro, grammar, {ext_lines}"),
+			format!("Line types are: mod, {ext_lines}"),
 			[tail.prev().sr()],
 		));
 	};

orchid-host/src/system.rs

@@ -18,7 +18,7 @@ use orchid_base::location::SrcRange;
 use orchid_base::name::{NameLike, Sym, VName, VPath};
 use orchid_base::parse::Comment;
 use orchid_base::reqnot::{ReqNot, Requester};
-use orchid_base::tree::ttv_from_api;
+use orchid_base::tree::{recur, ttv_from_api};
 use ordered_float::NotNan;
 use substack::{Stackframe, Substack};
 
@@ -28,7 +28,9 @@ use crate::dealias::walk;
 use crate::expr::{ExprParseCtx, ExprWillPanic};
 use crate::expr_store::ExprStore;
 use crate::extension::{Extension, WeakExtension};
-use crate::parsed::{Item, ItemKind, ParsTokTree, ParsedMember, ParsedMemberKind, ParsedModule};
+use crate::parsed::{
+	Item, ItemKind, ParsTok, ParsTokTree, ParsedMember, ParsedMemberKind, ParsedModule,
+};
 use crate::tree::Root;
 
 #[derive(destructure)]
@@ -112,7 +114,13 @@ impl System {
 		let src_path = line.first().expect("cannot be empty").sr.path();
 		let line = join_all(line.into_iter().map(|t| async {
 			let mut expr_store = self.0.ext.exprs().clone();
-			t.into_api(&mut expr_store, &mut ExprWillPanic).await
+			let without_new_expr = recur(t, &|t, r| {
+				if let ParsTok::NewExpr(expr) = t.tok {
+					return ParsTok::Handle(expr).at(t.sr);
+				}
+				r(t)
+			});
+			without_new_expr.into_api(&mut expr_store, &mut ExprWillPanic).await
 		}))
 		.await;
 		let comments = comments.iter().map(Comment::to_api).collect_vec();