git.delta.rocks / jrsonnet / refs/commits / d859bb9d0adb

--- a/crates/jrsonnet-evaluator/src/error.rs
+++ b/crates/jrsonnet-evaluator/src/error.rs
@@ -76,7 +76,7 @@
 }
 impl From<Error> for LocError {
 	fn from(e: Error) -> Self {
-		Self(e, StackTrace(vec![]))
+		Self::new(e)
 	}
 }
 
@@ -89,10 +89,20 @@
 pub struct StackTrace(pub Vec<StackTraceElement>);
 
 #[derive(Debug, Clone)]
-pub struct LocError(pub Error, pub StackTrace);
+pub struct LocError(Box<(Error, StackTrace)>);
 impl LocError {
 	pub fn new(e: Error) -> Self {
-		Self(e, StackTrace(vec![]))
+		Self(Box::new((e, StackTrace(vec![]))))
+	}
+
+	pub fn error(&self) -> &Error {
+		&(self.0).0
+	}
+	pub fn trace(&self) -> &StackTrace {
+		&(self.0).1
+	}
+	pub fn trace_mut(&mut self) -> &mut StackTrace {
+		&mut (self.0).1
 	}
 }
 

285		let result = f();285		let result = f();
286		self.data_mut().stack_depth -= 1;286		self.data_mut().stack_depth -= 1;
287		if let Err(mut err) = result {287		if let Err(mut err) = result {
288			(err.1).0.push(StackTraceElement {288			err.trace_mut().0.push(StackTraceElement {
289				location: e.clone(),289				location: e.clone(),
290				desc: frame_desc(),290				desc: frame_desc(),
291			});291			});

--- a/crates/jrsonnet-evaluator/src/trace/mod.rs
+++ b/crates/jrsonnet-evaluator/src/trace/mod.rs
@@ -86,8 +86,9 @@
 		evaluation_state: &EvaluationState,
 		error: &LocError,
 	) -> Result<(), std::fmt::Error> {
-		writeln!(out, "{:?}", error.0)?;
-		let file_names = (error.1)
+		writeln!(out, "{:?}", error.error())?;
+		let file_names = error
+			.trace()
 			.0
 			.iter()
 			.map(|el| {
@@ -105,7 +106,7 @@
 			})
 			.collect::<Vec<_>>();
 		let align = file_names.iter().map(|e| e.len()).max().unwrap_or(0);
-		for (i, (el, file)) in (error.1).0.iter().zip(file_names).enumerate() {
+		for (i, (el, file)) in error.trace().0.iter().zip(file_names).enumerate() {
 			if i != 0 {
 				writeln!(out)?;
 			}
@@ -131,8 +132,8 @@
 		evaluation_state: &EvaluationState,
 		error: &LocError,
 	) -> Result<(), std::fmt::Error> {
-		writeln!(out, "{:?}", error.0)?;
-		for (i, item) in (error.1).0.iter().enumerate() {
+		writeln!(out, "{:?}", error.error())?;
+		for (i, item) in error.trace().0.iter().enumerate() {
 			if i != 0 {
 				writeln!(out)?;
 			}
@@ -170,8 +171,8 @@
 			display_list::{DisplayList, FormatOptions},
 			snippet::{AnnotationType, Slice, Snippet, SourceAnnotation},
 		};
-		writeln!(out, "{:?}", error.0)?;
-		let trace = &error.1;
+		writeln!(out, "{:?}", error.error())?;
+		let trace = &error.trace();
 		for item in trace.0.iter() {
 			let desc = &item.desc;
 			let source = item.location.clone();