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

76}76}
77impl From<Error> for LocError {77impl From<Error> for LocError {
78	fn from(e: Error) -> Self {78	fn from(e: Error) -> Self {
79		Self(e, StackTrace(vec![]))79		Self::new(e)
80	}80	}
81}81}
8282
89pub struct StackTrace(pub Vec<StackTraceElement>);89pub struct StackTrace(pub Vec<StackTraceElement>);
9090
91#[derive(Debug, Clone)]91#[derive(Debug, Clone)]
92pub struct LocError(pub Error, pub StackTrace);92pub struct LocError(Box<(Error, StackTrace)>);
93impl LocError {93impl LocError {
94	pub fn new(e: Error) -> Self {94	pub fn new(e: Error) -> Self {
95		Self(e, StackTrace(vec![]))95		Self(Box::new((e, StackTrace(vec![]))))
96	}96	}
97
98	pub fn error(&self) -> &Error {
99		&(self.0).0
100	}
101	pub fn trace(&self) -> &StackTrace {
102		&(self.0).1
103	}
104	pub fn trace_mut(&mut self) -> &mut StackTrace {
105		&mut (self.0).1
106	}
97}107}
98108
99pub type Result<V> = std::result::Result<V, LocError>;109pub type Result<V> = std::result::Result<V, LocError>;

--- a/crates/jrsonnet-evaluator/src/lib.rs
+++ b/crates/jrsonnet-evaluator/src/lib.rs
@@ -285,7 +285,7 @@
 		let result = f();
 		self.data_mut().stack_depth -= 1;
 		if let Err(mut err) = result {
-			(err.1).0.push(StackTraceElement {
+			err.trace_mut().0.push(StackTraceElement {
 				location: e.clone(),
 				desc: frame_desc(),
 			});

--- 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();