`d859bb9d0adb`

3 files changed

modifiedcrates/jrsonnet-evaluator/src/error.rsdiff before after both

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

modifiedcrates/jrsonnet-evaluator/src/lib.rsdiff before after both

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

modifiedcrates/jrsonnet-evaluator/src/trace/mod.rsdiff before after both

86		evaluation_state: &EvaluationState,86		evaluation_state: &EvaluationState,
87		error: &LocError,87		error: &LocError,
88	) -> Result<(), std::fmt::Error> {88	) -> Result<(), std::fmt::Error> {
89		writeln!(out, "{:?}", error.0)?;89		writeln!(out, "{:?}", error.error())?;
90		let file_names = (error.1)90		let file_names = error
91			.trace()
91			.092			.0
92			.iter()93			.iter()
93			.map(|el| {94			.map(|el| {
105			})106			})
106			.collect::<Vec<_>>();107			.collect::<Vec<_>>();
107		let align = file_names.iter().map(|e| e.len()).max().unwrap_or(0);108		let align = file_names.iter().map(|e| e.len()).max().unwrap_or(0);
108		for (i, (el, file)) in (error.1).0.iter().zip(file_names).enumerate() {109		for (i, (el, file)) in error.trace().0.iter().zip(file_names).enumerate() {
109			if i != 0 {110			if i != 0 {
110				writeln!(out)?;111				writeln!(out)?;
111			}112			}
131		evaluation_state: &EvaluationState,132		evaluation_state: &EvaluationState,
132		error: &LocError,133		error: &LocError,
133	) -> Result<(), std::fmt::Error> {134	) -> Result<(), std::fmt::Error> {
134		writeln!(out, "{:?}", error.0)?;135		writeln!(out, "{:?}", error.error())?;
135		for (i, item) in (error.1).0.iter().enumerate() {136		for (i, item) in error.trace().0.iter().enumerate() {
136			if i != 0 {137			if i != 0 {
137				writeln!(out)?;138				writeln!(out)?;
138			}139			}
170			display_list::{DisplayList, FormatOptions},171			display_list::{DisplayList, FormatOptions},
171			snippet::{AnnotationType, Slice, Snippet, SourceAnnotation},172			snippet::{AnnotationType, Slice, Snippet, SourceAnnotation},
172		};173		};
173		writeln!(out, "{:?}", error.0)?;174		writeln!(out, "{:?}", error.error())?;
174		let trace = &error.1;175		let trace = &error.trace();
175		for item in trace.0.iter() {176		for item in trace.0.iter() {
176			let desc = &item.desc;177			let desc = &item.desc;
177			let source = item.location.clone();178			let source = item.location.clone();