temp commit

orchid-base/src/parse.rs

@@ -15,7 +15,9 @@ use crate::name::{Sym, VName, VPath};
 use crate::tree::{ExprRepr, ExtraTok, Paren, TokTree, Token, ttv_range};
 
 pub trait ParseCtx {
+	#[must_use]
 	fn i(&self) -> &Interner;
+	#[must_use]
 	fn reporter(&self) -> &Reporter;
 }
 pub struct ParseCtxImpl<'a> {
@@ -171,7 +173,7 @@ pub async fn try_pop_no_fluff<'a, A: ExprRepr, X: ExtraTok>(
 		None => Err(mk_errv(
 			ctx.i().i("Unexpected end").await,
 			"Line ends abruptly; more tokens were expected",
-			[snip.sr().pos().into()],
+			[snip.sr()],
 		)),
 	}
 }
@@ -184,7 +186,7 @@ pub async fn expect_end(
 		Some(surplus) => Err(mk_errv(
 			ctx.i().i("Extra code after end of line").await,
 			"Code found after the end of the line",
-			[surplus.sr.pos().into()],
+			[surplus.sr.pos()],
 		)),
 		None => Ok(()),
 	}
@@ -201,7 +203,7 @@ pub async fn expect_tok<'a, A: ExprRepr, X: ExtraTok>(
 		t => Err(mk_errv(
 			ctx.i().i("Expected specific keyword").await,
 			format!("Expected {tok} but found {:?}", fmt(t, ctx.i()).await),
-			[head.sr.pos().into()],
+			[head.sr()],
 		)),
 	}
 }
@@ -221,7 +223,7 @@ pub async fn parse_multiname<'a, A: ExprRepr, X: ExtraTok>(
 		return Err(mk_errv(
 			ctx.i().i("Expected token").await,
 			"Expected a name, a parenthesized list of names, or a globstar.",
-			[tail.sr().pos().into()],
+			[tail.sr().pos()],
 		));
 	};
 	let ret = rec(tt, ctx).await;
@@ -264,7 +266,7 @@ pub async fn parse_multiname<'a, A: ExprRepr, X: ExtraTok>(
 				return Err(mk_errv(
 					ctx.i().i("Unrecognized name end").await,
 					format!("Names cannot end with {:?} tokens", fmt(t, ctx.i()).await),
-					[ttpos.into()],
+					[ttpos],
 				));
 			},
 		}