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

difftreelog

style fix formatting

wsyrkszxYaroslav Bolyukin2026-04-25parent: #112adb2.patch.diff
in: master

31 files changed

modifiedcrates/jrsonnet-evaluator/src/analyze.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/analyze.rs
+++ b/crates/jrsonnet-evaluator/src/analyze.rs
@@ -21,10 +21,10 @@
 use jrsonnet_gcmodule::Acyclic;
 use jrsonnet_interner::IStr;
 use jrsonnet_ir::{
-	function::FunctionSignature, ArgsDesc, AssertExpr, AssertStmt, BinaryOp, BinaryOpType,
-	BindSpec, CompSpec, Destruct, Expr, ExprParams, FieldName, ForSpecData, IfElse, IfSpecData,
-	ImportKind, LiteralType, NumValue, ObjBody, ObjComp, ObjMembers, Slice, SliceDesc, Span,
-	Spanned, UnaryOpType, Visibility,
+	ArgsDesc, AssertExpr, AssertStmt, BinaryOp, BinaryOpType, BindSpec, CompSpec, Destruct, Expr,
+	ExprParams, FieldName, ForSpecData, IfElse, IfSpecData, ImportKind, LiteralType, NumValue,
+	ObjBody, ObjComp, ObjMembers, Slice, SliceDesc, Span, Spanned, UnaryOpType, Visibility,
+	function::FunctionSignature,
 };
 use rustc_hash::FxHashMap;
 use smallvec::SmallVec;
modifiedcrates/jrsonnet-evaluator/src/arr/mod.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/arr/mod.rs
+++ b/crates/jrsonnet-evaluator/src/arr/mod.rs
@@ -5,9 +5,9 @@
 	rc::Rc,
 };
 
-use jrsonnet_gcmodule::{cc_dyn, Cc};
+use jrsonnet_gcmodule::{Cc, cc_dyn};
 
-use crate::{analyze::LExpr, function::NativeFn, typed::IntoUntyped, Context, Result, Thunk, Val};
+use crate::{Context, Result, Thunk, Val, analyze::LExpr, function::NativeFn, typed::IntoUntyped};
 
 mod spec;
 pub use spec::{ArrayLike, *};
modifiedcrates/jrsonnet-evaluator/src/arr/spec.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/arr/spec.rs
+++ b/crates/jrsonnet-evaluator/src/arr/spec.rs
@@ -11,13 +11,13 @@
 
 use super::ArrValue;
 use crate::{
+	Context, Error, ObjValue, Result, Thunk, Val,
 	analyze::LExpr,
 	error::ErrorKind::InfiniteRecursionDetected,
 	evaluate::evaluate,
 	function::NativeFn,
 	typed::{IntoUntyped, Typed},
 	val::ThunkValue,
-	Context, Error, ObjValue, Result, Thunk, Val,
 };
 
 pub trait ArrayLike: Any + Trace + Debug {
modifiedcrates/jrsonnet-evaluator/src/ctx.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/ctx.rs
+++ b/crates/jrsonnet-evaluator/src/ctx.rs
@@ -4,7 +4,7 @@
 use jrsonnet_gcmodule::{Cc, Trace};
 use jrsonnet_interner::IStr;
 
-use crate::{analyze::LocalId, error, error::ErrorKind::*, Pending, Result, SupThis, Thunk, Val};
+use crate::{Pending, Result, SupThis, Thunk, Val, analyze::LocalId, error, error::ErrorKind::*};
 
 #[derive(Debug, Trace, Clone, Educe)]
 #[educe(PartialEq)]
modifiedcrates/jrsonnet-evaluator/src/error.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/error.rs
+++ b/crates/jrsonnet-evaluator/src/error.rs
@@ -9,10 +9,10 @@
 use thiserror::Error;
 
 use crate::{
+	ObjValue, ResolvePathOwned,
 	function::{CallLocation, FunctionSignature, ParamName},
 	stdlib::format::FormatError,
 	typed::TypeLocError,
-	ObjValue, ResolvePathOwned,
 };
 
 #[derive(Debug, Clone, Acyclic)]
@@ -286,11 +286,11 @@
 }
 impl fmt::Display for Error {
 	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-		writeln!(f, "{}", self.0 .0)?;
-		for el in &self.0 .1 .0 {
+		writeln!(f, "{}", self.0.0)?;
+		for el in &self.0.1.0 {
 			write!(f, "\t{}", el.desc)?;
 			if let Some(loc) = &el.location {
-				write!(f, "at {}", loc.0 .0 .0)?;
+				write!(f, "at {}", loc.0.0.0)?;
 				loc.0.map_source_locations(&[loc.1, loc.2]);
 			}
 			writeln!(f)?;
modifiedcrates/jrsonnet-evaluator/src/evaluate/compspec.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/evaluate/compspec.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/compspec.rs
@@ -7,12 +7,12 @@
 	evaluate_field_member_static, evaluate_field_member_unbound,
 };
 use crate::{
+	Context, ContextBuilder, ObjValue, ObjValueBuilder, Pending, Result, Thunk, Val,
 	analyze::{LArrComp, LBind, LCompSpec, LDestruct, LExpr, LFieldMember, LObjComp, LocalId},
 	arr::ArrValue,
 	bail,
 	error::ErrorKind::*,
 	evaluate::evaluate,
-	Context, ContextBuilder, ObjValue, ObjValueBuilder, Pending, Result, Thunk, Val,
 };
 
 trait CompCollector {
modifiedcrates/jrsonnet-evaluator/src/evaluate/destructure.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/evaluate/destructure.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/destructure.rs
@@ -3,10 +3,10 @@
 use jrsonnet_gcmodule::Trace;
 
 use crate::{
+	Context, ContextBuilder, Pending, Result, SupThis, Thunk, Unbound, Val,
 	analyze::{LBind, LDestruct, LDestructField, LDestructRest, LExpr, LocalId},
 	bail,
 	evaluate::evaluate,
-	Context, ContextBuilder, Pending, Result, SupThis, Thunk, Unbound, Val,
 };
 
 #[allow(dead_code, reason = "not dead in exp-destruct")]
@@ -97,7 +97,7 @@
 	use jrsonnet_interner::IStr;
 	use rustc_hash::FxHashSet;
 
-	use crate::{bail, ObjValueBuilder};
+	use crate::{ObjValueBuilder, bail};
 
 	let captured_fields: FxHashSet<IStr> = fields.iter().map(|f| f.name.clone()).collect();
 	let field_names: Vec<(IStr, bool)> = fields
modifiedcrates/jrsonnet-evaluator/src/evaluate/mod.rsdiffbeforeafterboth
before · crates/jrsonnet-evaluator/src/evaluate/mod.rs
1use std::rc::Rc;23use jrsonnet_gcmodule::{Cc, Trace};4use jrsonnet_interner::IStr;5use jrsonnet_ir::ImportKind;6use jrsonnet_types::ValType;78use self::{9	compspec::{evaluate_arr_comp, evaluate_obj_comp},10	destructure::{evaluate_locals, evaluate_locals_unbound},11	operator::evaluate_binary_op_special,12};13use crate::{14	analyze::{15		LArgsDesc, LAssertStmt, LExpr, LFieldMember, LFieldName, LFunction, LIndexPart, LObjBody,16		LObjMembers,17	},18	bail,19	error::{suggest_object_fields, ErrorKind::*},20	evaluate::operator::evaluate_unary_op,21	function::{prepared::PreparedFuncVal, CallLocation, FuncDesc, FuncVal},22	in_frame, runtime_error,23	typed::FromUntyped as _,24	val::{CachedUnbound, Thunk},25	with_state, Context, Error, ObjValue, ObjValueBuilder, ObjectAssertion, Result, ResultExt as _,26	SupThis, Unbound, Val,27};2829pub mod compspec;30pub mod destructure;31pub mod operator;3233// This is the amount of bytes that need to be left on the stack before increasing the size.34// It must be at least as large as the stack required by any code that does not call35// `ensure_sufficient_stack`.36const RED_ZONE: usize = 100 * 1024;3738// Only the first stack that is pushed, grows exponentially (2^n * STACK_PER_RECURSION) from then39// on. This flag has performance relevant characteristics. Don't set it too high.40const STACK_PER_RECURSION: usize = 1024 * 1024;4142/// Grows the stack on demand to prevent stack overflow. Call this in strategic locations43/// to "break up" recursive calls. E.g. almost any call to `visit_expr` or equivalent can benefit44/// from this.45///46/// Should not be sprinkled around carelessly, as it causes a little bit of overhead.47#[inline]48pub fn ensure_sufficient_stack<R>(f: impl FnOnce() -> R) -> R {49	stacker::maybe_grow(RED_ZONE, STACK_PER_RECURSION, f)50}5152pub fn evaluate_trivial(expr: &LExpr) -> Option<Val> {53	// TODO: Eager trivial array54	Some(match expr {55		LExpr::Str(s) => Val::string(s.clone()),56		LExpr::Num(n) => Val::Num(*n),57		LExpr::Bool(false) => Val::Bool(false),58		LExpr::Bool(true) => Val::Bool(true),59		LExpr::Null => Val::Null,60		_ => return None,61	})62}6364/// Evaluate a method definition.65pub fn evaluate_method(ctx: Context, name: IStr, func: &Rc<LFunction>) -> Val {66	Val::Func(FuncVal::Normal(Cc::new(FuncDesc {67		name,68		ctx,69		func: func.clone(),70	})))71}7273pub fn evaluate_field_name(ctx: Context, field_name: &LFieldName) -> Result<Option<IStr>> {74	Ok(match field_name {75		LFieldName::Fixed(n) => Some(n.clone()),76		LFieldName::Dyn(expr) => in_frame(77			// TODO: Spanned<LFieldName>78			CallLocation::native(),79			|| "evaluating field name".to_string(),80			|| {81				let v = evaluate(ctx.clone(), expr)?;82				Ok(if matches!(v, Val::Null) {83					None84				} else {85					Some(IStr::from_untyped(v)?)86				})87			},88		)?,89	})90}9192pub fn evaluate_thunk(ctx: Context, expr: Rc<LExpr>, tailstrict: bool) -> Result<Thunk<Val>> {93	Ok(if tailstrict {94		Thunk::evaluated(evaluate(ctx, &expr)?)95	} else {96		Thunk!(move || { evaluate(ctx, &expr) })97	})98}99100mod names {101	use crate::names;102103	names! {104		anonymous: "anonymous",105	}106}107108pub fn evaluate_named(name: &IStr, ctx: Context, expr: &LExpr) -> Result<Val> {109	if let LExpr::Function(f) = &expr {110		return Ok(evaluate_method(111			ctx,112			f.name.clone().unwrap_or_else(|| name.clone()),113			f,114		));115	}116	evaluate(ctx, expr)117}118119pub fn evaluate(ctx: Context, expr: &LExpr) -> Result<Val> {120	Ok(match expr {121		LExpr::Null => Val::Null,122		LExpr::Bool(b) => Val::Bool(*b),123		LExpr::Str(s) => Val::string(s.clone()),124		LExpr::Num(n) => Val::Num(*n),125		LExpr::Local(id) => {126			let Some(thunk) = ctx.binding(*id) else {127				bail!("should not happen: unbound local {id:?}");128			};129			thunk.evaluate()?130		}131		LExpr::BadLocal(name) => panic!("unresolvable reference: {name}"),132		LExpr::Arr(items) => Val::Arr(crate::arr::ArrValue::expr(ctx, items.clone())),133		LExpr::UnaryOp(op, value) => {134			let value = evaluate(ctx, value)?;135			evaluate_unary_op(*op, &value)?136		}137		LExpr::BinaryOp { lhs, op, rhs } => evaluate_binary_op_special(ctx, lhs, *op, rhs)?,138		LExpr::LocalExpr { binds, body } => {139			let ctx = evaluate_locals(ctx, binds);140			evaluate(ctx, body)?141		}142		LExpr::IfElse {143			cond,144			cond_then,145			cond_else,146		} => {147			let cond_val = evaluate(ctx.clone(), cond)?;148			let Val::Bool(b) = cond_val else {149				bail!(TypeMismatch(150					"if condition",151					vec![ValType::Bool],152					cond_val.value_type()153				))154			};155			if b {156				evaluate(ctx, cond_then)?157			} else if let Some(e) = cond_else {158				evaluate(ctx, e)?159			} else {160				Val::Null161			}162		}163		LExpr::Error(s, e) => in_frame(164			CallLocation::new(s),165			|| "error statement".to_owned(),166			|| bail!(RuntimeError(evaluate(ctx, e)?.to_string()?,)),167		)?,168		LExpr::AssertExpr { assert, rest } => {169			evaluate_assert(ctx.clone(), assert)?;170			evaluate(ctx, rest)?171		}172173		LExpr::Function(func) => evaluate_method(174			ctx,175			func.name.clone().unwrap_or_else(names::anonymous),176			func,177		),178		LExpr::Apply {179			applicable,180			args,181			tailstrict,182		} => evaluate_apply(183			ctx,184			applicable,185			args,186			CallLocation::new(&args.span),187			*tailstrict,188		)?,189		LExpr::Index { indexable, parts } => evaluate_index(ctx, indexable, parts)?,190		LExpr::Obj(body) => evaluate_obj_body(None, ctx, body)?,191		LExpr::ObjExtend(lhs, body) => {192			let lhs_val = evaluate(ctx.clone(), lhs)?;193			let Val::Obj(lhs_obj) = lhs_val else {194				bail!(TypeMismatch(195					"object extend lhs",196					vec![ValType::Obj],197					lhs_val.value_type(),198				))199			};200			evaluate_obj_body(Some(lhs_obj), ctx, body)?201		}202		LExpr::ArrComp(comp) => evaluate_arr_comp(ctx, comp)?,203		LExpr::Slice(slice) => {204			use crate::typed::BoundedUsize;205			let val = evaluate(ctx.clone(), &slice.value)?;206			let indexable = val.into_indexable()?;207			let start = slice208				.start209				.as_ref()210				.map(|e| evaluate(ctx.clone(), e))211				.transpose()?212				.map(|v| -> Result<i32> {213					v.as_num()214						.ok_or_else(|| {215							TypeMismatch("slice start", vec![ValType::Num], v.value_type()).into()216						})217						.map(|n| n as i32)218				})219				.transpose()?;220			let end = slice221				.end222				.as_ref()223				.map(|e| evaluate(ctx.clone(), e))224				.transpose()?225				.map(|v| -> Result<i32> {226					v.as_num()227						.ok_or_else(|| {228							TypeMismatch("slice end", vec![ValType::Num], v.value_type()).into()229						})230						.map(|n| n as i32)231				})232				.transpose()?;233			let step = slice234				.step235				.as_ref()236				.map(|e| evaluate(ctx, e))237				.transpose()?238				.map(|v| -> Result<BoundedUsize<1, { i32::MAX as usize }>> {239					let n = v.as_num().ok_or_else(|| -> crate::Error {240						TypeMismatch("slice step", vec![ValType::Num], v.value_type()).into()241					})?;242					BoundedUsize::new(n as usize)243						.ok_or_else(|| runtime_error!("slice step must be >= 1"))244				})245				.transpose()?;246			Val::from(indexable.slice(start, end, step)?)247		}248		LExpr::Super => Val::Obj(ctx.try_sup_this()?.standalone_super()?),249		LExpr::Import {250			kind,251			kind_span,252			path,253		} => with_state(|state| {254			let resolved = state.resolve_from(kind_span.0.source_path(), &path.clone())?;255			Ok::<_, Error>(match kind.value {256				ImportKind::Normal => in_frame(257					CallLocation::new(&kind.span),258					|| "import".to_string(),259					|| state.import_resolved(resolved),260				)?,261				ImportKind::Str => Val::string(state.import_resolved_str(resolved)?),262				ImportKind::Bin => Val::arr(state.import_resolved_bin(resolved)?),263			})264		})?,265	})266}267268fn evaluate_apply(269	ctx: Context,270	applicable: &LExpr,271	args: &LArgsDesc,272	loc: CallLocation<'_>,273	tailstrict: bool,274) -> Result<Val> {275	let func_val = evaluate(ctx.clone(), applicable)?;276	let Val::Func(func) = func_val else {277		bail!(OnlyFunctionsCanBeCalledGot(func_val.value_type()))278	};279280	let name = func.name();281	let unnamed = args282		.unnamed283		.iter()284		.cloned()285		.map(|e| evaluate_thunk(ctx.clone(), e, tailstrict))286		.collect::<Result<Vec<_>>>()?;287288	let named = args289		.values290		.iter()291		.cloned()292		.map(|e| evaluate_thunk(ctx.clone(), e, tailstrict))293		.collect::<Result<Vec<_>>>()?;294	let prepare = PreparedFuncVal::new(func, unnamed.len(), &args.names)295		.with_description_src(loc, || format!("function <{name}> preparation"))?;296	in_frame(297		loc,298		|| format!("function <{name}> call"),299		|| prepare.call(CallLocation::native(), &unnamed, &named),300	)301}302303fn evaluate_index(ctx: Context, indexable: &LExpr, parts: &[LIndexPart]) -> Result<Val> {304	let mut value = if let LExpr::Super = indexable {305		let sup_this = ctx.try_sup_this()?;306		// First part must be evaluated to get the super field name307		if parts.is_empty() {308			bail!(RuntimeError("super requires an index".into()))309		}310		let key_val = evaluate(ctx.clone(), &parts[0].value)?;311		let Val::Str(key) = &key_val else {312			bail!(ValueIndexMustBeTypeGot(313				ValType::Obj,314				ValType::Str,315				key_val.value_type(),316			))317		};318		let field = key.clone().into_flat();319		if let Some(v) = sup_this.get_super(field.clone())? {320			// Continue with remaining parts321			let mut value = v;322			for part in &parts[1..] {323				value = index_val(ctx.clone(), CallLocation::new(&part.span), value, part)?;324			}325			return Ok(value);326		}327		let suggestions = suggest_object_fields(sup_this.this(), field.clone());328		bail!(NoSuchField(field, suggestions))329	} else {330		evaluate(ctx.clone(), indexable)?331	};332333	for part in parts {334		value = index_val(ctx.clone(), CallLocation::new(&part.span), value, part)?;335	}336	Ok(value)337}338339fn index_val(ctx: Context, loc: CallLocation<'_>, value: Val, part: &LIndexPart) -> Result<Val> {340	let key_val = evaluate(ctx, &part.value)?;341	Ok(match (&value, &key_val) {342		(Val::Obj(obj), Val::Str(key)) => {343			let field = key.clone().into_flat();344			if let Some(v) = obj345				.get(field.clone())346				.with_description_src(loc, || format!("field <{field}> access"))?347			{348				v349			} else {350				bail!(NoSuchField(351					field.clone(),352					suggest_object_fields(obj, field)353				))354			}355		}356		(Val::Arr(arr), Val::Num(idx)) => {357			let n = idx.get();358			if n.fract() > f64::EPSILON {359				bail!(FractionalIndex)360			}361			if n < 0.0 {362				bail!(ArrayBoundsError(363					n as isize, // truncation is fine for error display364					arr.len()365				));366			}367			#[expect(368				clippy::cast_possible_truncation,369				clippy::cast_sign_loss,370				reason = "n is checked positive"371			)]372			let i = n as u32;373			arr.get(i)374				.with_description_src(loc, || format!("element <{i}> access"))?375				.ok_or_else(|| ArrayBoundsError(i as isize, arr.len()))?376		}377		(Val::Str(s), Val::Num(idx)) => {378			let n = idx.get();379			if n.fract() > f64::EPSILON {380				bail!(FractionalIndex)381			}382			let flat = s.clone().into_flat();383			if n < 0.0 {384				bail!(ArrayBoundsError(385					n as isize, // truncation is fine for error display386					flat.chars().count() as u32387				));388			}389			#[expect(390				clippy::cast_possible_truncation,391				clippy::cast_sign_loss,392				reason = "n is checked positive, overflow will truncate as expected"393			)]394			let i = n as usize;395			let Some(char) = flat.chars().nth(i) else {396				bail!(StringBoundsError(i, flat.chars().count()))397			};398			Val::string(char)399		}400		_ => bail!(ValueIndexMustBeTypeGot(401			value.value_type(),402			ValType::Str,403			key_val.value_type()404		)),405	})406}407408fn evaluate_obj_body(super_obj: Option<ObjValue>, ctx: Context, body: &LObjBody) -> Result<Val> {409	match body {410		LObjBody::MemberList(members) => evaluate_obj_members(super_obj, ctx, members),411		LObjBody::ObjComp(comp) => evaluate_obj_comp(super_obj, ctx, comp),412	}413}414415pub fn evaluate_field_member_unbound<B: Unbound<Bound = Context> + Clone>(416	builder: &mut ObjValueBuilder,417	ctx: Context,418	uctx: B,419	field: &LFieldMember,420) -> Result<()> {421	#[derive(Trace)]422	struct UnboundValue<B: Trace> {423		uctx: B,424		value: Rc<LExpr>,425		name: IStr,426	}427	impl<B: Unbound<Bound = Context>> Unbound for UnboundValue<B> {428		type Bound = Val;429		fn bind(&self, sup_this: SupThis) -> Result<Val> {430			evaluate(self.uctx.bind(sup_this)?, &self.value)431		}432	}433434	let LFieldMember {435		name,436		plus,437		visibility,438		value,439	} = field;440	let Some(name) = evaluate_field_name(ctx, name)? else {441		return Ok(());442	};443444	builder445		.field(name.clone())446		.with_add(*plus)447		.with_visibility(*visibility)448		.bindable(UnboundValue {449			uctx,450			value: value.clone(),451			name,452		})453}454pub fn evaluate_field_member_static(455	builder: &mut ObjValueBuilder,456	field_ctx: Context,457	value_ctx: Context,458	field: &LFieldMember,459) -> Result<()> {460	let LFieldMember {461		name,462		plus,463		visibility,464		value,465	} = field;466	let Some(name) = evaluate_field_name(field_ctx, name)? else {467		return Ok(());468	};469470	let value = value.clone();471	builder472		.field(name)473		.with_add(*plus)474		.with_visibility(*visibility)475		.try_thunk(Thunk!(move || { evaluate(value_ctx, &value) }))?;476	Ok(())477}478479fn evaluate_obj_members(480	super_obj: Option<ObjValue>,481	ctx: Context,482	members: &LObjMembers,483) -> Result<Val> {484	let mut builder = ObjValueBuilder::with_capacity(members.fields.len());485	if let Some(sup) = super_obj {486		builder.with_super(sup);487	}488489	let needs_unbound = members.this.is_some() || members.uses_super;490491	if needs_unbound {492		let uctx = CachedUnbound::new(evaluate_locals_unbound(493			ctx.clone(),494			members.locals.clone(),495			members.this,496		));497		for field in &members.fields {498			evaluate_field_member_unbound(&mut builder, ctx.clone(), uctx.clone(), field)?;499		}500		if !members.asserts.is_empty() {501			builder.assert(evaluate_object_assertions_unbound(502				uctx,503				members.asserts.clone(),504			));505		}506	} else {507		let field_ctx = ctx;508		let value_ctx = evaluate_locals(field_ctx.clone(), &members.locals);509		for field in &members.fields {510			evaluate_field_member_static(511				&mut builder,512				field_ctx.clone(),513				value_ctx.clone(),514				field,515			)?;516		}517		if !members.asserts.is_empty() {518			builder.assert(evaluate_object_assertions_static(519				value_ctx,520				members.asserts.clone(),521			));522		}523	}524525	Ok(Val::Obj(builder.build()))526}527528pub fn evaluate_assert(ctx: Context, assertion: &LAssertStmt) -> Result<()> {529	let LAssertStmt { cond, message } = assertion;530	let assertion_result = in_frame(531		CallLocation::native(),532		|| "assertion condition".to_owned(),533		|| bool::from_untyped(evaluate(ctx.clone(), cond)?),534	)?;535	if !assertion_result {536		in_frame(537			CallLocation::new(&cond.span),538			|| "assertion failure".to_owned(),539			|| {540				if let Some(msg) = message {541					bail!(AssertionFailed(evaluate(ctx, msg)?.to_string()?));542				}543				bail!(AssertionFailed(Val::Null.to_string()?));544			},545		)?;546	}547	Ok(())548}549550fn evaluate_object_assertions_unbound<B: Unbound<Bound = Context>>(551	uctx: B,552	asserts: Rc<Vec<LAssertStmt>>,553) -> impl ObjectAssertion {554	#[derive(Trace)]555	struct ObjectAssert<B: Trace> {556		uctx: B,557		asserts: Rc<Vec<LAssertStmt>>,558	}559	impl<B: Unbound<Bound = Context>> ObjectAssertion for ObjectAssert<B> {560		fn run(&self, sup_this: SupThis) -> Result<()> {561			let ctx = self.uctx.bind(sup_this)?;562			for assert in &*self.asserts {563				evaluate_assert(ctx.clone(), assert)?;564			}565			Ok(())566		}567	}568	ObjectAssert { uctx, asserts }569}570fn evaluate_object_assertions_static(571	ctx: Context,572	asserts: Rc<Vec<LAssertStmt>>,573) -> impl ObjectAssertion {574	#[derive(Trace)]575	struct ObjectAssert {576		ctx: Context,577		asserts: Rc<Vec<LAssertStmt>>,578	}579	impl ObjectAssertion for ObjectAssert {580		fn run(&self, _sup_this: SupThis) -> Result<()> {581			for assert in &*self.asserts {582				evaluate_assert(self.ctx.clone(), assert)?;583			}584			Ok(())585		}586	}587	ObjectAssert { ctx, asserts }588}
after · crates/jrsonnet-evaluator/src/evaluate/mod.rs
1use std::rc::Rc;23use jrsonnet_gcmodule::{Cc, Trace};4use jrsonnet_interner::IStr;5use jrsonnet_ir::ImportKind;6use jrsonnet_types::ValType;78use self::{9	compspec::{evaluate_arr_comp, evaluate_obj_comp},10	destructure::{evaluate_locals, evaluate_locals_unbound},11	operator::evaluate_binary_op_special,12};13use crate::{14	Context, Error, ObjValue, ObjValueBuilder, ObjectAssertion, Result, ResultExt as _, SupThis,15	Unbound, Val,16	analyze::{17		LArgsDesc, LAssertStmt, LExpr, LFieldMember, LFieldName, LFunction, LIndexPart, LObjBody,18		LObjMembers,19	},20	bail,21	error::{ErrorKind::*, suggest_object_fields},22	evaluate::operator::evaluate_unary_op,23	function::{CallLocation, FuncDesc, FuncVal, prepared::PreparedFuncVal},24	in_frame, runtime_error,25	typed::FromUntyped as _,26	val::{CachedUnbound, Thunk},27	with_state,28};2930pub mod compspec;31pub mod destructure;32pub mod operator;3334// This is the amount of bytes that need to be left on the stack before increasing the size.35// It must be at least as large as the stack required by any code that does not call36// `ensure_sufficient_stack`.37const RED_ZONE: usize = 100 * 1024;3839// Only the first stack that is pushed, grows exponentially (2^n * STACK_PER_RECURSION) from then40// on. This flag has performance relevant characteristics. Don't set it too high.41const STACK_PER_RECURSION: usize = 1024 * 1024;4243/// Grows the stack on demand to prevent stack overflow. Call this in strategic locations44/// to "break up" recursive calls. E.g. almost any call to `visit_expr` or equivalent can benefit45/// from this.46///47/// Should not be sprinkled around carelessly, as it causes a little bit of overhead.48#[inline]49pub fn ensure_sufficient_stack<R>(f: impl FnOnce() -> R) -> R {50	stacker::maybe_grow(RED_ZONE, STACK_PER_RECURSION, f)51}5253pub fn evaluate_trivial(expr: &LExpr) -> Option<Val> {54	// TODO: Eager trivial array55	Some(match expr {56		LExpr::Str(s) => Val::string(s.clone()),57		LExpr::Num(n) => Val::Num(*n),58		LExpr::Bool(false) => Val::Bool(false),59		LExpr::Bool(true) => Val::Bool(true),60		LExpr::Null => Val::Null,61		_ => return None,62	})63}6465/// Evaluate a method definition.66pub fn evaluate_method(ctx: Context, name: IStr, func: &Rc<LFunction>) -> Val {67	Val::Func(FuncVal::Normal(Cc::new(FuncDesc {68		name,69		ctx,70		func: func.clone(),71	})))72}7374pub fn evaluate_field_name(ctx: Context, field_name: &LFieldName) -> Result<Option<IStr>> {75	Ok(match field_name {76		LFieldName::Fixed(n) => Some(n.clone()),77		LFieldName::Dyn(expr) => in_frame(78			// TODO: Spanned<LFieldName>79			CallLocation::native(),80			|| "evaluating field name".to_string(),81			|| {82				let v = evaluate(ctx.clone(), expr)?;83				Ok(if matches!(v, Val::Null) {84					None85				} else {86					Some(IStr::from_untyped(v)?)87				})88			},89		)?,90	})91}9293pub fn evaluate_thunk(ctx: Context, expr: Rc<LExpr>, tailstrict: bool) -> Result<Thunk<Val>> {94	Ok(if tailstrict {95		Thunk::evaluated(evaluate(ctx, &expr)?)96	} else {97		Thunk!(move || { evaluate(ctx, &expr) })98	})99}100101mod names {102	use crate::names;103104	names! {105		anonymous: "anonymous",106	}107}108109pub fn evaluate_named(name: &IStr, ctx: Context, expr: &LExpr) -> Result<Val> {110	if let LExpr::Function(f) = &expr {111		return Ok(evaluate_method(112			ctx,113			f.name.clone().unwrap_or_else(|| name.clone()),114			f,115		));116	}117	evaluate(ctx, expr)118}119120pub fn evaluate(ctx: Context, expr: &LExpr) -> Result<Val> {121	Ok(match expr {122		LExpr::Null => Val::Null,123		LExpr::Bool(b) => Val::Bool(*b),124		LExpr::Str(s) => Val::string(s.clone()),125		LExpr::Num(n) => Val::Num(*n),126		LExpr::Local(id) => {127			let Some(thunk) = ctx.binding(*id) else {128				bail!("should not happen: unbound local {id:?}");129			};130			thunk.evaluate()?131		}132		LExpr::BadLocal(name) => panic!("unresolvable reference: {name}"),133		LExpr::Arr(items) => Val::Arr(crate::arr::ArrValue::expr(ctx, items.clone())),134		LExpr::UnaryOp(op, value) => {135			let value = evaluate(ctx, value)?;136			evaluate_unary_op(*op, &value)?137		}138		LExpr::BinaryOp { lhs, op, rhs } => evaluate_binary_op_special(ctx, lhs, *op, rhs)?,139		LExpr::LocalExpr { binds, body } => {140			let ctx = evaluate_locals(ctx, binds);141			evaluate(ctx, body)?142		}143		LExpr::IfElse {144			cond,145			cond_then,146			cond_else,147		} => {148			let cond_val = evaluate(ctx.clone(), cond)?;149			let Val::Bool(b) = cond_val else {150				bail!(TypeMismatch(151					"if condition",152					vec![ValType::Bool],153					cond_val.value_type()154				))155			};156			if b {157				evaluate(ctx, cond_then)?158			} else if let Some(e) = cond_else {159				evaluate(ctx, e)?160			} else {161				Val::Null162			}163		}164		LExpr::Error(s, e) => in_frame(165			CallLocation::new(s),166			|| "error statement".to_owned(),167			|| bail!(RuntimeError(evaluate(ctx, e)?.to_string()?,)),168		)?,169		LExpr::AssertExpr { assert, rest } => {170			evaluate_assert(ctx.clone(), assert)?;171			evaluate(ctx, rest)?172		}173174		LExpr::Function(func) => evaluate_method(175			ctx,176			func.name.clone().unwrap_or_else(names::anonymous),177			func,178		),179		LExpr::Apply {180			applicable,181			args,182			tailstrict,183		} => evaluate_apply(184			ctx,185			applicable,186			args,187			CallLocation::new(&args.span),188			*tailstrict,189		)?,190		LExpr::Index { indexable, parts } => evaluate_index(ctx, indexable, parts)?,191		LExpr::Obj(body) => evaluate_obj_body(None, ctx, body)?,192		LExpr::ObjExtend(lhs, body) => {193			let lhs_val = evaluate(ctx.clone(), lhs)?;194			let Val::Obj(lhs_obj) = lhs_val else {195				bail!(TypeMismatch(196					"object extend lhs",197					vec![ValType::Obj],198					lhs_val.value_type(),199				))200			};201			evaluate_obj_body(Some(lhs_obj), ctx, body)?202		}203		LExpr::ArrComp(comp) => evaluate_arr_comp(ctx, comp)?,204		LExpr::Slice(slice) => {205			use crate::typed::BoundedUsize;206			let val = evaluate(ctx.clone(), &slice.value)?;207			let indexable = val.into_indexable()?;208			let start = slice209				.start210				.as_ref()211				.map(|e| evaluate(ctx.clone(), e))212				.transpose()?213				.map(|v| -> Result<i32> {214					v.as_num()215						.ok_or_else(|| {216							TypeMismatch("slice start", vec![ValType::Num], v.value_type()).into()217						})218						.map(|n| n as i32)219				})220				.transpose()?;221			let end = slice222				.end223				.as_ref()224				.map(|e| evaluate(ctx.clone(), e))225				.transpose()?226				.map(|v| -> Result<i32> {227					v.as_num()228						.ok_or_else(|| {229							TypeMismatch("slice end", vec![ValType::Num], v.value_type()).into()230						})231						.map(|n| n as i32)232				})233				.transpose()?;234			let step = slice235				.step236				.as_ref()237				.map(|e| evaluate(ctx, e))238				.transpose()?239				.map(|v| -> Result<BoundedUsize<1, { i32::MAX as usize }>> {240					let n = v.as_num().ok_or_else(|| -> crate::Error {241						TypeMismatch("slice step", vec![ValType::Num], v.value_type()).into()242					})?;243					BoundedUsize::new(n as usize)244						.ok_or_else(|| runtime_error!("slice step must be >= 1"))245				})246				.transpose()?;247			Val::from(indexable.slice(start, end, step)?)248		}249		LExpr::Super => Val::Obj(ctx.try_sup_this()?.standalone_super()?),250		LExpr::Import {251			kind,252			kind_span,253			path,254		} => with_state(|state| {255			let resolved = state.resolve_from(kind_span.0.source_path(), &path.clone())?;256			Ok::<_, Error>(match kind.value {257				ImportKind::Normal => in_frame(258					CallLocation::new(&kind.span),259					|| "import".to_string(),260					|| state.import_resolved(resolved),261				)?,262				ImportKind::Str => Val::string(state.import_resolved_str(resolved)?),263				ImportKind::Bin => Val::arr(state.import_resolved_bin(resolved)?),264			})265		})?,266	})267}268269fn evaluate_apply(270	ctx: Context,271	applicable: &LExpr,272	args: &LArgsDesc,273	loc: CallLocation<'_>,274	tailstrict: bool,275) -> Result<Val> {276	let func_val = evaluate(ctx.clone(), applicable)?;277	let Val::Func(func) = func_val else {278		bail!(OnlyFunctionsCanBeCalledGot(func_val.value_type()))279	};280281	let name = func.name();282	let unnamed = args283		.unnamed284		.iter()285		.cloned()286		.map(|e| evaluate_thunk(ctx.clone(), e, tailstrict))287		.collect::<Result<Vec<_>>>()?;288289	let named = args290		.values291		.iter()292		.cloned()293		.map(|e| evaluate_thunk(ctx.clone(), e, tailstrict))294		.collect::<Result<Vec<_>>>()?;295	let prepare = PreparedFuncVal::new(func, unnamed.len(), &args.names)296		.with_description_src(loc, || format!("function <{name}> preparation"))?;297	in_frame(298		loc,299		|| format!("function <{name}> call"),300		|| prepare.call(CallLocation::native(), &unnamed, &named),301	)302}303304fn evaluate_index(ctx: Context, indexable: &LExpr, parts: &[LIndexPart]) -> Result<Val> {305	let mut value = if let LExpr::Super = indexable {306		let sup_this = ctx.try_sup_this()?;307		// First part must be evaluated to get the super field name308		if parts.is_empty() {309			bail!(RuntimeError("super requires an index".into()))310		}311		let key_val = evaluate(ctx.clone(), &parts[0].value)?;312		let Val::Str(key) = &key_val else {313			bail!(ValueIndexMustBeTypeGot(314				ValType::Obj,315				ValType::Str,316				key_val.value_type(),317			))318		};319		let field = key.clone().into_flat();320		if let Some(v) = sup_this.get_super(field.clone())? {321			// Continue with remaining parts322			let mut value = v;323			for part in &parts[1..] {324				value = index_val(ctx.clone(), CallLocation::new(&part.span), value, part)?;325			}326			return Ok(value);327		}328		let suggestions = suggest_object_fields(sup_this.this(), field.clone());329		bail!(NoSuchField(field, suggestions))330	} else {331		evaluate(ctx.clone(), indexable)?332	};333334	for part in parts {335		value = index_val(ctx.clone(), CallLocation::new(&part.span), value, part)?;336	}337	Ok(value)338}339340fn index_val(ctx: Context, loc: CallLocation<'_>, value: Val, part: &LIndexPart) -> Result<Val> {341	let key_val = evaluate(ctx, &part.value)?;342	Ok(match (&value, &key_val) {343		(Val::Obj(obj), Val::Str(key)) => {344			let field = key.clone().into_flat();345			if let Some(v) = obj346				.get(field.clone())347				.with_description_src(loc, || format!("field <{field}> access"))?348			{349				v350			} else {351				bail!(NoSuchField(352					field.clone(),353					suggest_object_fields(obj, field)354				))355			}356		}357		(Val::Arr(arr), Val::Num(idx)) => {358			let n = idx.get();359			if n.fract() > f64::EPSILON {360				bail!(FractionalIndex)361			}362			if n < 0.0 {363				bail!(ArrayBoundsError(364					n as isize, // truncation is fine for error display365					arr.len()366				));367			}368			#[expect(369				clippy::cast_possible_truncation,370				clippy::cast_sign_loss,371				reason = "n is checked positive"372			)]373			let i = n as u32;374			arr.get(i)375				.with_description_src(loc, || format!("element <{i}> access"))?376				.ok_or_else(|| ArrayBoundsError(i as isize, arr.len()))?377		}378		(Val::Str(s), Val::Num(idx)) => {379			let n = idx.get();380			if n.fract() > f64::EPSILON {381				bail!(FractionalIndex)382			}383			let flat = s.clone().into_flat();384			if n < 0.0 {385				bail!(ArrayBoundsError(386					n as isize, // truncation is fine for error display387					flat.chars().count() as u32388				));389			}390			#[expect(391				clippy::cast_possible_truncation,392				clippy::cast_sign_loss,393				reason = "n is checked positive, overflow will truncate as expected"394			)]395			let i = n as usize;396			let Some(char) = flat.chars().nth(i) else {397				bail!(StringBoundsError(i, flat.chars().count()))398			};399			Val::string(char)400		}401		_ => bail!(ValueIndexMustBeTypeGot(402			value.value_type(),403			ValType::Str,404			key_val.value_type()405		)),406	})407}408409fn evaluate_obj_body(super_obj: Option<ObjValue>, ctx: Context, body: &LObjBody) -> Result<Val> {410	match body {411		LObjBody::MemberList(members) => evaluate_obj_members(super_obj, ctx, members),412		LObjBody::ObjComp(comp) => evaluate_obj_comp(super_obj, ctx, comp),413	}414}415416pub fn evaluate_field_member_unbound<B: Unbound<Bound = Context> + Clone>(417	builder: &mut ObjValueBuilder,418	ctx: Context,419	uctx: B,420	field: &LFieldMember,421) -> Result<()> {422	#[derive(Trace)]423	struct UnboundValue<B: Trace> {424		uctx: B,425		value: Rc<LExpr>,426		name: IStr,427	}428	impl<B: Unbound<Bound = Context>> Unbound for UnboundValue<B> {429		type Bound = Val;430		fn bind(&self, sup_this: SupThis) -> Result<Val> {431			evaluate(self.uctx.bind(sup_this)?, &self.value)432		}433	}434435	let LFieldMember {436		name,437		plus,438		visibility,439		value,440	} = field;441	let Some(name) = evaluate_field_name(ctx, name)? else {442		return Ok(());443	};444445	builder446		.field(name.clone())447		.with_add(*plus)448		.with_visibility(*visibility)449		.bindable(UnboundValue {450			uctx,451			value: value.clone(),452			name,453		})454}455pub fn evaluate_field_member_static(456	builder: &mut ObjValueBuilder,457	field_ctx: Context,458	value_ctx: Context,459	field: &LFieldMember,460) -> Result<()> {461	let LFieldMember {462		name,463		plus,464		visibility,465		value,466	} = field;467	let Some(name) = evaluate_field_name(field_ctx, name)? else {468		return Ok(());469	};470471	let value = value.clone();472	builder473		.field(name)474		.with_add(*plus)475		.with_visibility(*visibility)476		.try_thunk(Thunk!(move || { evaluate(value_ctx, &value) }))?;477	Ok(())478}479480fn evaluate_obj_members(481	super_obj: Option<ObjValue>,482	ctx: Context,483	members: &LObjMembers,484) -> Result<Val> {485	let mut builder = ObjValueBuilder::with_capacity(members.fields.len());486	if let Some(sup) = super_obj {487		builder.with_super(sup);488	}489490	let needs_unbound = members.this.is_some() || members.uses_super;491492	if needs_unbound {493		let uctx = CachedUnbound::new(evaluate_locals_unbound(494			ctx.clone(),495			members.locals.clone(),496			members.this,497		));498		for field in &members.fields {499			evaluate_field_member_unbound(&mut builder, ctx.clone(), uctx.clone(), field)?;500		}501		if !members.asserts.is_empty() {502			builder.assert(evaluate_object_assertions_unbound(503				uctx,504				members.asserts.clone(),505			));506		}507	} else {508		let field_ctx = ctx;509		let value_ctx = evaluate_locals(field_ctx.clone(), &members.locals);510		for field in &members.fields {511			evaluate_field_member_static(512				&mut builder,513				field_ctx.clone(),514				value_ctx.clone(),515				field,516			)?;517		}518		if !members.asserts.is_empty() {519			builder.assert(evaluate_object_assertions_static(520				value_ctx,521				members.asserts.clone(),522			));523		}524	}525526	Ok(Val::Obj(builder.build()))527}528529pub fn evaluate_assert(ctx: Context, assertion: &LAssertStmt) -> Result<()> {530	let LAssertStmt { cond, message } = assertion;531	let assertion_result = in_frame(532		CallLocation::native(),533		|| "assertion condition".to_owned(),534		|| bool::from_untyped(evaluate(ctx.clone(), cond)?),535	)?;536	if !assertion_result {537		in_frame(538			CallLocation::new(&cond.span),539			|| "assertion failure".to_owned(),540			|| {541				if let Some(msg) = message {542					bail!(AssertionFailed(evaluate(ctx, msg)?.to_string()?));543				}544				bail!(AssertionFailed(Val::Null.to_string()?));545			},546		)?;547	}548	Ok(())549}550551fn evaluate_object_assertions_unbound<B: Unbound<Bound = Context>>(552	uctx: B,553	asserts: Rc<Vec<LAssertStmt>>,554) -> impl ObjectAssertion {555	#[derive(Trace)]556	struct ObjectAssert<B: Trace> {557		uctx: B,558		asserts: Rc<Vec<LAssertStmt>>,559	}560	impl<B: Unbound<Bound = Context>> ObjectAssertion for ObjectAssert<B> {561		fn run(&self, sup_this: SupThis) -> Result<()> {562			let ctx = self.uctx.bind(sup_this)?;563			for assert in &*self.asserts {564				evaluate_assert(ctx.clone(), assert)?;565			}566			Ok(())567		}568	}569	ObjectAssert { uctx, asserts }570}571fn evaluate_object_assertions_static(572	ctx: Context,573	asserts: Rc<Vec<LAssertStmt>>,574) -> impl ObjectAssertion {575	#[derive(Trace)]576	struct ObjectAssert {577		ctx: Context,578		asserts: Rc<Vec<LAssertStmt>>,579	}580	impl ObjectAssertion for ObjectAssert {581		fn run(&self, _sup_this: SupThis) -> Result<()> {582			for assert in &*self.asserts {583				evaluate_assert(self.ctx.clone(), assert)?;584			}585			Ok(())586		}587	}588	ObjectAssert { ctx, asserts }589}
modifiedcrates/jrsonnet-evaluator/src/evaluate/operator.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/evaluate/operator.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/operator.rs
@@ -3,6 +3,7 @@
 use jrsonnet_ir::{BinaryOpType, UnaryOpType};
 
 use crate::{
+	Context, Result, Val,
 	analyze::LExpr,
 	arr::ArrValue,
 	bail, error,
@@ -10,8 +11,7 @@
 	evaluate::evaluate,
 	stdlib::std_format,
 	typed::IntoUntyped as _,
-	val::{equals, StrValue},
-	Context, Result, Val,
+	val::{StrValue, equals},
 };
 
 pub fn evaluate_unary_op(op: UnaryOpType, b: &Val) -> Result<Val> {
modifiedcrates/jrsonnet-evaluator/src/function/mod.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/function/mod.rs
+++ b/crates/jrsonnet-evaluator/src/function/mod.rs
@@ -8,13 +8,13 @@
 
 use self::{
 	builtin::Builtin,
-	prepared::{parse_prepared_builtin_call, PreparedCall},
+	prepared::{PreparedCall, parse_prepared_builtin_call},
 };
 use crate::{
+	Context, ContextBuilder, Result, Thunk, Val,
 	analyze::{LDestruct, LExpr, LFunction},
 	evaluate::{destructure::destruct, ensure_sufficient_stack, evaluate, evaluate_trivial},
 	function::builtin::BuiltinFunc,
-	Context, ContextBuilder, Result, Thunk, Val,
 };
 
 pub mod builtin;
@@ -210,8 +210,7 @@
 					return false;
 				}
 				#[allow(irrefutable_let_patterns, reason = "refutable with exp-destruct")]
-				let LDestruct::Full(id) = &param.destruct
-				else {
+				let LDestruct::Full(id) = &param.destruct else {
 					return false;
 				};
 				matches!(&*desc.func.body, LExpr::Local(v) if v == id)
modifiedcrates/jrsonnet-evaluator/src/function/parse.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/function/parse.rs
+++ b/crates/jrsonnet-evaluator/src/function/parse.rs
@@ -1,9 +1,9 @@
 use std::rc::Rc;
 
 use crate::{
+	Context, ContextBuilder, Result, Thunk,
 	analyze::LFunction,
 	evaluate::{destructure::destruct, evaluate},
-	Context, ContextBuilder, Result, Thunk,
 };
 
 /// Creates Context with all argument default values applied
modifiedcrates/jrsonnet-evaluator/src/function/prepared.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/function/prepared.rs
+++ b/crates/jrsonnet-evaluator/src/function/prepared.rs
@@ -5,10 +5,7 @@
 use rustc_hash::FxHashSet;
 
 use super::{CallLocation, FuncVal};
-use crate::{
-	Result, Thunk, Val, bail,
-	error::ErrorKind::*,
-};
+use crate::{Result, Thunk, Val, bail, error::ErrorKind::*};
 
 #[derive(Debug, Trace, Clone)]
 pub struct PreparedFuncVal {
modifiedcrates/jrsonnet-evaluator/src/integrations/serde.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/integrations/serde.rs
+++ b/crates/jrsonnet-evaluator/src/integrations/serde.rs
@@ -3,16 +3,16 @@
 use jrsonnet_interner::{IBytes, IStr};
 use jrsonnet_ir::NumValue;
 use serde::{
+	Deserialize, Serialize, Serializer,
 	de::{self, Visitor},
 	ser::{
 		Error, SerializeMap, SerializeSeq, SerializeStruct, SerializeStructVariant, SerializeTuple,
 		SerializeTupleStruct, SerializeTupleVariant,
 	},
-	Deserialize, Serialize, Serializer,
 };
 
 use crate::{
-	in_description_frame, runtime_error, Error as JrError, ObjValue, ObjValueBuilder, Result, Val,
+	Error as JrError, ObjValue, ObjValueBuilder, Result, Val, in_description_frame, runtime_error,
 };
 
 impl<'de> Deserialize<'de> for Val {
modifiedcrates/jrsonnet-evaluator/src/lib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/lib.rs
+++ b/crates/jrsonnet-evaluator/src/lib.rs
@@ -39,7 +39,7 @@
 pub use evaluate::ensure_sufficient_stack;
 use function::CallLocation;
 pub use import::*;
-use jrsonnet_gcmodule::{cc_dyn, Cc, Trace};
+use jrsonnet_gcmodule::{Cc, Trace, cc_dyn};
 pub use jrsonnet_interner::{IBytes, IStr};
 use jrsonnet_ir::Expr;
 pub use jrsonnet_ir::{NumValue, Source, SourcePath, Span};
modifiedcrates/jrsonnet-evaluator/src/manifest.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/manifest.rs
+++ b/crates/jrsonnet-evaluator/src/manifest.rs
@@ -1,8 +1,7 @@
 use std::{borrow::Cow, fmt::Write, hint::black_box, ptr};
 
 use crate::{
-	bail, evaluate::ensure_sufficient_stack, in_description_frame, Error,
-	Result, ResultExt, Val,
+	Error, Result, ResultExt, Val, bail, evaluate::ensure_sufficient_stack, in_description_frame,
 };
 
 pub trait ManifestFormat {
modifiedcrates/jrsonnet-evaluator/src/obj/mod.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/obj/mod.rs
+++ b/crates/jrsonnet-evaluator/src/obj/mod.rs
@@ -11,8 +11,8 @@
 };
 
 use educe::Educe;
-use im_rc::{vector, Vector};
-use jrsonnet_gcmodule::{cc_dyn, Acyclic, Cc, Trace, Weak};
+use im_rc::{Vector, vector};
+use jrsonnet_gcmodule::{Acyclic, Cc, Trace, Weak, cc_dyn};
 use jrsonnet_interner::IStr;
 use jrsonnet_ir::Span;
 use rustc_hash::{FxHashMap, FxHashSet};
@@ -23,13 +23,13 @@
 pub use oop::ObjValueBuilder;
 
 use crate::{
+	CcUnbound, MaybeUnbound, Result, Thunk, Unbound, Val,
 	arr::{PickObjectKeyValues, PickObjectValues},
 	bail,
-	error::{suggest_object_fields, ErrorKind::*},
+	error::{ErrorKind::*, suggest_object_fields},
 	evaluate::operator::evaluate_add_op,
 	identity_hash,
 	val::{ArrValue, ThunkValue},
-	CcUnbound, MaybeUnbound, Result, Thunk, Unbound, Val,
 };
 
 #[cfg(not(feature = "exp-preserve-order"))]
modifiedcrates/jrsonnet-evaluator/src/trace/mod.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/trace/mod.rs
+++ b/crates/jrsonnet-evaluator/src/trace/mod.rs
@@ -10,7 +10,7 @@
 #[cfg(feature = "explaining-traces")]
 use jrsonnet_ir::Span;
 
-use crate::{error::ErrorKind, Error};
+use crate::{Error, error::ErrorKind};
 
 /// The way paths should be displayed
 #[derive(Clone, Trace)]
@@ -259,7 +259,7 @@
 		struct ResetData {
 			loc: Span,
 		}
-		use hi_doc::{source_to_ansi, Formatting, SnippetBuilder, Text};
+		use hi_doc::{Formatting, SnippetBuilder, Text, source_to_ansi};
 
 		write!(out, "{}", error.error())?;
 		if let ErrorKind::ImportSyntaxError { path, error } = error.error() {
@@ -277,14 +277,15 @@
 			use crate::analyze::DiagLevel;
 			let mut builder: Option<SnippetBuilder> = None;
 			let mut current_src: Option<&str> = None;
-			let flush =
-				|builder: Option<SnippetBuilder>, out: &mut dyn std::fmt::Write| -> Result<(), std::fmt::Error> {
-					if let Some(b) = builder {
-						let ansi = source_to_ansi(&b.build());
-						write!(out, "\n{}", ansi.trim_end())?;
-					}
-					Ok(())
-				};
+			let flush = |builder: Option<SnippetBuilder>,
+			             out: &mut dyn std::fmt::Write|
+			 -> Result<(), std::fmt::Error> {
+				if let Some(b) = builder {
+					let ansi = source_to_ansi(&b.build());
+					write!(out, "\n{}", ansi.trim_end())?;
+				}
+				Ok(())
+			};
 			for diag in diagnostics {
 				if let Some(span) = &diag.span {
 					let src = span.0.code();
@@ -295,14 +296,12 @@
 					}
 					let b = builder.as_mut().unwrap();
 					let ab = match diag.level {
-						DiagLevel::Error => b.error(Text::fragment(
-							diag.message.clone(),
-							Formatting::default(),
-						)),
-						DiagLevel::Warning => b.warning(Text::fragment(
-							diag.message.clone(),
-							Formatting::default(),
-						)),
+						DiagLevel::Error => {
+							b.error(Text::fragment(diag.message.clone(), Formatting::default()))
+						}
+						DiagLevel::Warning => {
+							b.warning(Text::fragment(diag.message.clone(), Formatting::default()))
+						}
 					};
 					ab.range(span.range()).build();
 				} else {
modifiedcrates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -17,7 +17,13 @@
 
 pub use crate::arr::{ArrValue, ArrayLike};
 use crate::{
-	NumValue, ObjValue, Result, SupThis, Unbound, WeakSupThis, bail, error::{Error, ErrorKind::*}, evaluate::operator::{evaluate_compare_op, evaluate_mod_op}, function::FuncVal, gc::WithCapacityExt as _, manifest::{ManifestFormat, ToStringFormat}, typed::BoundedUsize
+	NumValue, ObjValue, Result, SupThis, Unbound, WeakSupThis, bail,
+	error::{Error, ErrorKind::*},
+	evaluate::operator::{evaluate_compare_op, evaluate_mod_op},
+	function::FuncVal,
+	gc::WithCapacityExt as _,
+	manifest::{ManifestFormat, ToStringFormat},
+	typed::BoundedUsize,
 };
 
 pub trait ThunkValue: Trace {
modifiedcrates/jrsonnet-ir-parser/src/lib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-ir-parser/src/lib.rs
+++ b/crates/jrsonnet-ir-parser/src/lib.rs
@@ -1,11 +1,11 @@
 use jrsonnet_gcmodule::Acyclic;
 use jrsonnet_ir::{
-	unescape, ArgsDesc, AssertExpr, AssertStmt, BinaryOp, BinaryOpType, BindSpec, CompSpec,
-	Destruct, Expr, ExprParam, ExprParams, FieldMember, FieldName, ForSpecData, IStr, IfElse,
-	IfSpecData, ImportKind, IndexPart, LiteralType, Member, NumValue, ObjBody, ObjComp, ObjMembers,
-	Slice, SliceDesc, Source, Span, Spanned, UnaryOpType, Visibility,
+	ArgsDesc, AssertExpr, AssertStmt, BinaryOp, BinaryOpType, BindSpec, CompSpec, Destruct, Expr,
+	ExprParam, ExprParams, FieldMember, FieldName, ForSpecData, IStr, IfElse, IfSpecData,
+	ImportKind, IndexPart, LiteralType, Member, NumValue, ObjBody, ObjComp, ObjMembers, Slice,
+	SliceDesc, Source, Span, Spanned, UnaryOpType, Visibility, unescape,
 };
-use jrsonnet_lexer::{collect_lexed_str_block, Lexeme, Lexer, Span as LexSpan, SyntaxKind, T};
+use jrsonnet_lexer::{Lexeme, Lexer, Span as LexSpan, SyntaxKind, T, collect_lexed_str_block};
 
 pub struct ParserSettings {
 	pub source: Source,
modifiedcrates/jrsonnet-ir/src/expr.rsdiffbeforeafterboth
--- a/crates/jrsonnet-ir/src/expr.rs
+++ b/crates/jrsonnet-ir/src/expr.rs
@@ -7,9 +7,9 @@
 use jrsonnet_interner::IStr;
 
 use crate::{
+	NumValue,
 	function::{FunctionSignature, ParamDefault, ParamName, ParamParse},
 	source::Source,
-	NumValue,
 };
 
 #[derive(Debug, PartialEq, Acyclic)]
modifiedcrates/jrsonnet-macros/src/lib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-macros/src/lib.rs
+++ b/crates/jrsonnet-macros/src/lib.rs
@@ -3,14 +3,13 @@
 use proc_macro2::TokenStream;
 use quote::{quote, quote_spanned};
 use syn::{
-	parenthesized,
+	Attribute, DeriveInput, Error, Expr, ExprClosure, FnArg, GenericArgument, Ident, ItemFn,
+	LitStr, Meta, Pat, Path, PathArguments, Result, ReturnType, Token, Type, parenthesized,
 	parse::{Parse, ParseStream},
 	parse_macro_input,
 	punctuated::Punctuated,
 	spanned::Spanned,
 	token::Comma,
-	Attribute, DeriveInput, Error, Expr, ExprClosure, FnArg, GenericArgument, Ident, ItemFn,
-	LitStr, Meta, Pat, Path, PathArguments, Result, ReturnType, Token, Type,
 };
 
 use self::typed::{derive_from_untyped_inner, derive_into_untyped_inner, derive_typed_inner};
modifiedcrates/jrsonnet-stdlib/src/arrays.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/arrays.rs
+++ b/crates/jrsonnet-stdlib/src/arrays.rs
@@ -1,12 +1,11 @@
 #![allow(non_snake_case)]
 
 use jrsonnet_evaluator::{
-	bail, error,
-	function::{builtin, NativeFn},
+	Either, IStr, ObjValue, ObjValueBuilder, Result, ResultExt, Thunk, Val, bail, error,
+	function::{NativeFn, builtin},
 	runtime_error,
 	typed::{BoundedUsize, Either2, FromUntyped},
-	val::{equals, ArrValue, IndexableVal},
-	Either, IStr, ObjValue, ObjValueBuilder, Result, ResultExt, Thunk, Val,
+	val::{ArrValue, IndexableVal, equals},
 };
 
 pub fn eval_on_empty(on_empty: Option<Thunk<Val>>) -> Result<Val> {
modifiedcrates/jrsonnet-stdlib/src/compat.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/compat.rs
+++ b/crates/jrsonnet-stdlib/src/compat.rs
@@ -1,6 +1,6 @@
 use std::cmp::Ordering;
 
-use jrsonnet_evaluator::{function::builtin, val::ArrValue, Result, Val};
+use jrsonnet_evaluator::{Result, Val, function::builtin, val::ArrValue};
 
 #[builtin]
 #[allow(non_snake_case)]
modifiedcrates/jrsonnet-stdlib/src/lib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/lib.rs
+++ b/crates/jrsonnet-stdlib/src/lib.rs
@@ -12,7 +12,12 @@
 pub use encoding::*;
 pub use hash::*;
 use jrsonnet_evaluator::{
-	IStr, InitialContextBuilder, NumValue, ObjValue, ObjValueBuilder, Source, Thunk, Val, error::Result, function::{CallLocation, FuncVal, builtin_id}, tla::TlaArg, trace::PathResolver, typed::SerializeTypedObj as _
+	IStr, InitialContextBuilder, NumValue, ObjValue, ObjValueBuilder, Source, Thunk, Val,
+	error::Result,
+	function::{CallLocation, FuncVal, builtin_id},
+	tla::TlaArg,
+	trace::PathResolver,
+	typed::SerializeTypedObj as _,
 };
 use jrsonnet_gcmodule::{Acyclic, Cc, Trace};
 use jrsonnet_macros::{IntoUntyped, Typed};
modifiedcrates/jrsonnet-stdlib/src/manifest/toml.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/manifest/toml.rs
+++ b/crates/jrsonnet-stdlib/src/manifest/toml.rs
@@ -1,7 +1,10 @@
 use std::borrow::Cow;
 
 use jrsonnet_evaluator::{
-	Error, IStr, ObjValue, Result, ResultExt, Val, bail, ensure_sufficient_stack, in_description_frame, manifest::{ManifestFormat, escape_string_json_buf}, val::ArrValue
+	Error, IStr, ObjValue, Result, ResultExt, Val, bail, ensure_sufficient_stack,
+	in_description_frame,
+	manifest::{ManifestFormat, escape_string_json_buf},
+	val::ArrValue,
 };
 
 pub struct TomlFormat<'s> {
@@ -218,14 +221,16 @@
 		}
 		first = false;
 		path.push(k.clone());
-		ensure_sufficient_stack(|| in_description_frame(
-			|| format!("section <{k}> manifestification"),
-			|| match v {
-				Val::Obj(obj) => manifest_table(&obj, path, buf, cur_padding, options),
-				Val::Arr(arr) => manifest_table_array(&arr, path, buf, cur_padding, options),
-				_ => unreachable!("iterating over sections"),
-			},
-		))?;
+		ensure_sufficient_stack(|| {
+			in_description_frame(
+				|| format!("section <{k}> manifestification"),
+				|| match v {
+					Val::Obj(obj) => manifest_table(&obj, path, buf, cur_padding, options),
+					Val::Arr(arr) => manifest_table_array(&arr, path, buf, cur_padding, options),
+					_ => unreachable!("iterating over sections"),
+				},
+			)
+		})?;
 		path.pop();
 	}
 	Ok(())
modifiedcrates/jrsonnet-stdlib/src/misc.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/misc.rs
+++ b/crates/jrsonnet-stdlib/src/misc.rs
@@ -1,13 +1,12 @@
 use std::{cell::RefCell, collections::BTreeSet};
 
 use jrsonnet_evaluator::{
-	bail,
+	Either, IStr, ObjValue, ObjValueBuilder, ResultExt, Thunk, Val, bail,
 	error::{ErrorKind::*, Result},
-	function::{builtin, CallLocation, FuncVal},
+	function::{CallLocation, FuncVal, builtin},
 	manifest::JsonFormat,
 	typed::{Either2, Either4},
-	val::{equals, ArrValue},
-	Either, IStr, ObjValue, ObjValueBuilder, ResultExt, Thunk, Val,
+	val::{ArrValue, equals},
 };
 use jrsonnet_gcmodule::Cc;
 
modifiedcrates/jrsonnet-stdlib/src/operator.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/operator.rs
+++ b/crates/jrsonnet-stdlib/src/operator.rs
@@ -2,11 +2,11 @@
 //! However, in our case we instead implement them in native, and implement native functions on top of core for backwards compatibility
 
 use jrsonnet_evaluator::{
+	IStr, NumValue, Result, Val,
 	function::builtin,
 	stdlib::std_format,
 	typed::{Either, Either2},
 	val::{equals, primitive_equals},
-	IStr, NumValue, Result, Val,
 };
 
 #[builtin]
modifiedcrates/jrsonnet-stdlib/src/sets.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/sets.rs
+++ b/crates/jrsonnet-stdlib/src/sets.rs
@@ -1,6 +1,6 @@
 use std::cmp::Ordering;
 
-use jrsonnet_evaluator::{function::builtin, val::ArrValue, Result, Thunk, Val};
+use jrsonnet_evaluator::{Result, Thunk, Val, function::builtin, val::ArrValue};
 
 use crate::keyf::KeyF;
 
modifiedcrates/jrsonnet-stdlib/src/sort.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/sort.rs
+++ b/crates/jrsonnet-stdlib/src/sort.rs
@@ -3,10 +3,9 @@
 use std::cmp::Ordering;
 
 use jrsonnet_evaluator::{
-	bail,
+	Result, Thunk, Val, bail,
 	function::builtin,
-	val::{equals, ArrValue},
-	Result, Thunk, Val,
+	val::{ArrValue, equals},
 };
 
 use crate::{eval_on_empty, keyf::KeyF};
modifiedtests/tests/builtin.rsdiffbeforeafterboth
--- a/tests/tests/builtin.rs
+++ b/tests/tests/builtin.rs
@@ -1,7 +1,11 @@
 mod common;
 
 use jrsonnet_evaluator::{
-	ContextInitializer, FileImportResolver, InitialContextBuilder, Result, Source, State, Thunk, Val, function::{CallLocation, FuncVal, builtin, builtin::{Builtin}}, trace::PathResolver, typed::FromUntyped
+	ContextInitializer, FileImportResolver, InitialContextBuilder, Result, Source, State, Thunk,
+	Val,
+	function::{CallLocation, FuncVal, builtin, builtin::Builtin},
+	trace::PathResolver,
+	typed::FromUntyped,
 };
 use jrsonnet_gcmodule::Trace;
 use jrsonnet_stdlib::ContextInitializer as StdContextInitializer;
modifiedtests/tests/common.rsdiffbeforeafterboth
--- a/tests/tests/common.rs
+++ b/tests/tests/common.rs
@@ -1,5 +1,7 @@
 use jrsonnet_evaluator::{
-	ContextBuilder, ContextInitializer as ContextInitializerT, InitialContextBuilder, ObjValueBuilder, Result, Thunk, Val, bail, function::{FuncVal, builtin}, Source
+	ContextBuilder, ContextInitializer as ContextInitializerT, InitialContextBuilder,
+	ObjValueBuilder, Result, Source, Thunk, Val, bail,
+	function::{FuncVal, builtin},
 };
 use jrsonnet_gcmodule::Trace;