Temporary commit to try fix halting

orchid-std/src/macros/mactree.rs

@@ -6,7 +6,7 @@ use futures::FutureExt;
 use futures::future::join_all;
 use hashbrown::HashSet;
 use itertools::Itertools;
-use orchid_base::error::{OrcErrv, Reporter, mk_errv};
+use orchid_base::error::{OrcErrv, Reporter, mk_err};
 use orchid_base::format::{FmtCtx, FmtUnit, Format, Variants, fmt};
 use orchid_base::interner::Tok;
 use orchid_base::location::Pos;
@@ -42,7 +42,7 @@ impl MacTree {
 			MacTok::Bottom(e) => bot(e.clone()),
 			MacTok::Lambda(arg, body) => {
 				let MacTok::Name(name) = &*arg.tok else {
-					let err = mk_errv(
+					let err = mk_err(
 						ctx.sys.i().i("Syntax error after macros").await,
 						"This token ends up as a binding, consider replacing it with a name",
 						[arg.pos()],
@@ -57,7 +57,7 @@ impl MacTree {
 				Some((i, _)) => arg((args.len() - i) as u64),
 			},
 			MacTok::Ph(ph) => {
-				let err = mk_errv(
+				let err = mk_err(
 					ctx.sys.i().i("Placeholder in value").await,
 					format!("Placeholder {ph} is only supported in macro patterns"),
 					[self.pos()],
@@ -67,7 +67,7 @@ impl MacTree {
 			},
 			MacTok::S(Paren::Round, body) => call(lower_v(body, ctx, args).await),
 			MacTok::S(..) => {
-				let err = mk_errv(
+				let err = mk_err(
 					ctx.sys.i().i("[] or {} after macros").await,
 					format!("{} didn't match any macro", fmt(self, ctx.sys.i()).await),
 					[self.pos()],
@@ -166,7 +166,7 @@ pub async fn mtreev_fmt<'b>(
 
 #[derive(Clone, Debug, Hash, PartialEq, Eq)]
 pub struct Ph {
-	pub name: Tok<String>,
+	pub name: IStr,
 	pub kind: PhKind,
 }
 impl Display for Ph {