Correctly halts

orchid-host/src/tree.rs

@@ -6,6 +6,7 @@ use std::slice;
 
 use async_lock::RwLock;
 use async_once_cell::OnceCell;
+use derive_destructure::destructure;
 use futures::{FutureExt, StreamExt, stream};
 use hashbrown::HashMap;
 use hashbrown::hash_map::Entry;
@@ -88,7 +89,7 @@ impl Root {
 		*this.ctx.root.write().await = new.downgrade();
 		for (path, (sys_id, pc_id)) in deferred_consts {
 			let sys = this.ctx.system_inst(sys_id).await.expect("System dropped since parsing");
-			let api_expr = sys.reqnot().request(api::FetchParsedConst { id: pc_id, sys: sys.id() }).await;
+			let api_expr = sys.reqnot().request(api::FetchParsedConst(sys.id(), pc_id)).await;
 			let mut xp_ctx = ExprParseCtx { ctx: &this.ctx, exprs: sys.ext().exprs() };
 			let expr = Expr::from_api(&api_expr, PathSetBuilder::new(), &mut xp_ctx).await;
 			new.0.write().await.consts.insert(path, expr);
@@ -450,6 +451,7 @@ impl MemberKind {
 	}
 }
 
+#[derive(destructure)]
 pub struct LazyMemberHandle {
 	id: api::TreeId,
 	sys: api::SysId,
@@ -457,19 +459,26 @@ pub struct LazyMemberHandle {
 }
 impl LazyMemberHandle {
 	#[must_use]
-	pub async fn run(self, ctx: Ctx, consts: &MemoMap<Sym, Expr>) -> MemberKind {
+	pub async fn run(mut self, ctx: Ctx, consts: &MemoMap<Sym, Expr>) -> MemberKind {
 		let sys = ctx.system_inst(self.sys).await.expect("Missing system for lazy member");
 		match sys.get_tree(self.id).await {
 			api::MemberKind::Const(c) => {
 				let mut pctx = ExprParseCtx { ctx: &ctx, exprs: sys.ext().exprs() };
 				let expr = Expr::from_api(&c, PathSetBuilder::new(), &mut pctx).await;
-				consts.insert(self.path, expr);
+				let (.., path) = self.destructure();
+				consts.insert(path, expr);
 				MemberKind::Const
 			},
-			api::MemberKind::Module(m) => MemberKind::Module(
-				Module::from_api(m, &mut TreeFromApiCtx { sys: &sys, consts, path: self.path.tok() }).await,
-			),
-			api::MemberKind::Lazy(id) => Self { id, ..self }.run(ctx, consts).boxed_local().await,
+			api::MemberKind::Module(m) => {
+				let (.., path) = self.destructure();
+				MemberKind::Module(
+					Module::from_api(m, &mut TreeFromApiCtx { sys: &sys, consts, path: path.tok() }).await,
+				)
+			},
+			api::MemberKind::Lazy(id) => {
+				self.id = id;
+				self.run(ctx, consts).boxed_local().await
+			},
 		}
 	}
 	#[must_use]