git.delta.rocks / jrsonnet / refs/commits / 45caf79f1ab3

--- a/crates/jrsonnet-evaluator/src/builtin/mod.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/mod.rs
@@ -1,8 +1,8 @@
 use crate::{
 	equals,
 	error::{Error::*, Result},
-	parse_args, primitive_equals, push, throw,
-	with_state, ArrValue, Context, FuncVal, LazyVal, Val,
+	parse_args, primitive_equals, push, throw, with_state, ArrValue, Context, FuncVal, LazyVal,
+	Val,
 };
 use format::{format_arr, format_obj};
 use jrsonnet_interner::IStr;

--- a/crates/jrsonnet-evaluator/src/lib.rs
+++ b/crates/jrsonnet-evaluator/src/lib.rs
@@ -139,7 +139,7 @@
 	e: Option<&ExprLocation>,
 	frame_desc: impl FnOnce() -> String,
 	f: impl FnOnce() -> Result<T>,
- ) -> Result<T> {
+) -> Result<T> {
 	push(e, frame_desc, f)
 }
 
@@ -340,11 +340,17 @@
 	pub fn with_tla(&self, val: Val) -> Result<Val> {
 		self.run_in_state(|| {
 			Ok(match val {
-				Val::Func(func) => push(None, || "during TLA call".to_owned(), || Ok(func.evaluate_map(
-					self.create_default_context()?,
-					&self.settings().tla_vars,
-					true,
-				)?))?,
+				Val::Func(func) => push(
+					None,
+					|| "during TLA call".to_owned(),
+					|| {
+						Ok(func.evaluate_map(
+							self.create_default_context()?,
+							&self.settings().tla_vars,
+							true,
+						)?)
+					},
+				)?,
 				v => v,
 			})
 		})

--- a/crates/jrsonnet-evaluator/src/trace/location.rs
+++ b/crates/jrsonnet-evaluator/src/trace/location.rs
@@ -37,7 +37,11 @@
 	];
 	let mut with_no_known_line_ending = vec![];
 	let mut this_line_offset = 0;
-	for (pos, ch) in file.chars().enumerate().chain(std::iter::once((file.len(), ' '))) {
+	for (pos, ch) in file
+		.chars()
+		.enumerate()
+		.chain(std::iter::once((file.len(), ' ')))
+	{
 		column += 1;
 		match offset_map.last() {
 			Some(x) if x.0 == pos => {

118			.trace()118			.trace()
119			.0119			.0
120			.iter()120			.iter()
121			.map(|el| el.location.as_ref().map(|l| {121			.map(|el| {
122				el.location.as_ref().map(|l| {
122				use std::fmt::Write;123					use std::fmt::Write;
123				let mut resolved_path = self.resolver.resolve(&l.0);124					let mut resolved_path = self.resolver.resolve(&l.0);
124				// TODO: Process all trace elements first125					// TODO: Process all trace elements first
125				let location = evaluation_state126					let location = evaluation_state.map_source_locations(&l.0, &[l.1, l.2]);
126					.map_source_locations(&l.0, &[l.1, l.2]);
127				write!(resolved_path, ":").unwrap();127					write!(resolved_path, ":").unwrap();
128				print_code_location(&mut resolved_path, &location[0], &location[1]).unwrap();128					print_code_location(&mut resolved_path, &location[0], &location[1]).unwrap();
129				resolved_path129					resolved_path
130			}))130				})
131			})
131			.collect::<Vec<_>>();132			.collect::<Vec<_>>();
132		let align = file_names.iter().flatten().map(|e| e.len()).max().unwrap_or(0);133		let align = file_names
134			.iter()

--- a/crates/jrsonnet-evaluator/src/typed.rs
+++ b/crates/jrsonnet-evaluator/src/typed.rs
@@ -16,8 +16,8 @@
 		match $value {
 			$match(v) => v,
 			_ => unreachable!(),
-		}
-	}}
+			}
+		}};
 }
 
 #[derive(Debug, Error, Clone)]