git.delta.rocks / jrsonnet / refs/commits / 5df60b8b674f

difftreelog

style fix clippy warnings

rvmlxxrnYaroslav Bolyukin2026-03-21parent: #ac5b435.patch.diff
in: master

36 files changed

modifiedbindings/jsonnet/src/native.rsdiffbeforeafterboth
--- a/bindings/jsonnet/src/native.rs
+++ b/bindings/jsonnet/src/native.rs
@@ -43,7 +43,7 @@
 		}
 		n_args.push(None);
 		let mut success = 1;
-		let v = unsafe { (self.cb)(self.ctx, n_args.as_ptr().cast(), &mut success) };
+		let v = unsafe { (self.cb)(self.ctx, n_args.as_ptr().cast(), &raw mut success) };
 		let v = unsafe { *Box::from_raw(v) };
 		if success == 1 {
 			Ok(v)
modifiedcrates/jrsonnet-cli/src/tla.rsdiffbeforeafterboth
--- a/crates/jrsonnet-cli/src/tla.rs
+++ b/crates/jrsonnet-cli/src/tla.rs
@@ -7,6 +7,7 @@
 
 #[derive(Parser)]
 #[clap(next_help_heading = "TOP LEVEL ARGUMENTS")]
+#[allow(clippy::struct_field_names)]
 pub struct TlaOpts {
 	/// Add top level string argument.
 	/// Top level arguments will be passed to function before manifestification stage.
modifiedcrates/jrsonnet-evaluator/src/arr/mod.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/arr/mod.rs
+++ b/crates/jrsonnet-evaluator/src/arr/mod.rs
@@ -77,7 +77,7 @@
 			let i = i?;
 			if filter(&i)? {
 				out.push(i);
-			};
+			}
 		}
 		Ok(Self::eager(out))
 	}
modifiedcrates/jrsonnet-evaluator/src/arr/spec.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/arr/spec.rs
+++ b/crates/jrsonnet-evaluator/src/arr/spec.rs
@@ -38,7 +38,7 @@
 }
 impl ArrayLike for SliceArray {
 	fn len(&self) -> usize {
-		((self.to - self.from + self.step - 1) / self.step) as usize
+		(self.to - self.from).div_ceil(self.step) as usize
 	}
 
 	fn get(&self, index: usize) -> Result<Option<Val>> {
@@ -139,7 +139,7 @@
 			ArrayThunk::Errored(e) => return Err(e.clone()),
 			ArrayThunk::Pending => return Err(InfiniteRecursionDetected.into()),
 			ArrayThunk::Waiting => {}
-		};
+		}
 
 		let ArrayThunk::Waiting =
 			replace(&mut self.cached.borrow_mut()[index], ArrayThunk::Pending)
@@ -158,15 +158,6 @@
 		Ok(Some(new_value))
 	}
 	fn get_lazy(&self, index: usize) -> Option<Thunk<Val>> {
-		if index >= self.len() {
-			return None;
-		}
-		match &self.cached.borrow()[index] {
-			ArrayThunk::Computed(c) => return Some(Thunk::evaluated(c.clone())),
-			ArrayThunk::Errored(e) => return Some(Thunk::errored(e.clone())),
-			ArrayThunk::Waiting | ArrayThunk::Pending => {}
-		};
-
 		#[derive(Trace)]
 		struct ExprArrThunk {
 			expr: ExprArray,
@@ -183,6 +174,15 @@
 			}
 		}
 
+		if index >= self.len() {
+			return None;
+		}
+		match &self.cached.borrow()[index] {
+			ArrayThunk::Computed(c) => return Some(Thunk::evaluated(c.clone())),
+			ArrayThunk::Errored(e) => return Some(Thunk::errored(e.clone())),
+			ArrayThunk::Waiting | ArrayThunk::Pending => {}
+		}
+
 		Some(Thunk::new(ExprArrThunk {
 			expr: self.clone(),
 			index,
@@ -441,7 +441,7 @@
 			ArrayThunk::Errored(e) => return Err(e.clone()),
 			ArrayThunk::Pending => return Err(InfiniteRecursionDetected.into()),
 			ArrayThunk::Waiting => {}
-		};
+		}
 
 		let ArrayThunk::Waiting =
 			replace(&mut self.cached.borrow_mut()[index], ArrayThunk::Pending)
@@ -467,15 +467,6 @@
 		Ok(Some(new_value))
 	}
 	fn get_lazy(&self, index: usize) -> Option<Thunk<Val>> {
-		if index >= self.len() {
-			return None;
-		}
-		match &self.cached.borrow()[index] {
-			ArrayThunk::Computed(c) => return Some(Thunk::evaluated(c.clone())),
-			ArrayThunk::Errored(e) => return Some(Thunk::errored(e.clone())),
-			ArrayThunk::Waiting | ArrayThunk::Pending => {}
-		};
-
 		#[derive(Trace)]
 		struct MappedArrayThunk<const WITH_INDEX: bool> {
 			arr: MappedArray<WITH_INDEX>,
@@ -489,6 +480,15 @@
 			}
 		}
 
+		if index >= self.len() {
+			return None;
+		}
+		match &self.cached.borrow()[index] {
+			ArrayThunk::Computed(c) => return Some(Thunk::evaluated(c.clone())),
+			ArrayThunk::Errored(e) => return Some(Thunk::errored(e.clone())),
+			ArrayThunk::Waiting | ArrayThunk::Pending => {}
+		}
+
 		Some(Thunk::new(MappedArrayThunk {
 			arr: self.clone(),
 			index,
modifiedcrates/jrsonnet-evaluator/src/async_import.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/async_import.rs
+++ b/crates/jrsonnet-evaluator/src/async_import.rs
@@ -21,7 +21,8 @@
 // Visits all nodes, trying to find import statements
 #[allow(clippy::too_many_lines)]
 pub fn find_imports(expr: &Spanned<Expr>, out: &mut FoundImports) {
-	fn in_destruct(dest: &Destruct, #[allow(unused_variables)] out: &mut FoundImports) {
+	#[allow(unused_variables, clippy::needless_pass_by_ref_mut)]
+	fn in_destruct(dest: &Destruct, out: &mut FoundImports) {
 		match dest {
 			#[cfg(feature = "exp-destruct")]
 			Destruct::Array {
@@ -295,8 +296,6 @@
 	let resolved = (s.import_resolver() as &dyn Any)
 		.downcast_ref::<ResolvedImportResolver>()
 		.expect("for async imports, import_resolver should be set to ResolvedImportResolver");
-
-	let mut resolved_map = resolved.resolved.borrow_mut();
 
 	let mut queue = vec![Job::LoadFile {
 		path: handler.resolve_from_default(path).await?,
@@ -340,14 +339,17 @@
 				}
 			}
 			Job::ResolveImport { from, import } => {
-				if let Some((resolved, expression)) =
-					resolved_map.get_mut(&(from.clone(), import.path.clone()))
 				{
-					if import.expression && !*expression {
-						*expression = true;
-						queue.push(Job::ParseFile(resolved.clone()));
+					let mut resolved_map = resolved.resolved.borrow_mut();
+					if let Some((resolved, expression)) =
+						resolved_map.get_mut(&(from.clone(), import.path.clone()))
+					{
+						if import.expression && !*expression {
+							*expression = true;
+							queue.push(Job::ParseFile(resolved.clone()));
+						}
+						continue;
 					}
-					continue;
 				}
 				let resolved = handler.resolve_from(&from, &import.path).await?;
 				queue.push(Job::LoadFile {
modifiedcrates/jrsonnet-evaluator/src/evaluate/destructure.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/evaluate/destructure.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/destructure.rs
@@ -1,6 +1,7 @@
+use std::{collections::HashMap, hash::BuildHasher};
+
 use jrsonnet_interner::IStr;
 use jrsonnet_parser::{BindSpec, Destruct};
-use rustc_hash::FxHashMap;
 
 use crate::{
 	bail,
@@ -10,11 +11,11 @@
 
 #[allow(clippy::too_many_lines)]
 #[allow(unused_variables)]
-pub fn destruct(
+pub fn destruct<H: BuildHasher>(
 	d: &Destruct,
 	parent: Thunk<Val>,
 	fctx: Pending<Context>,
-	new_bindings: &mut FxHashMap<IStr, Thunk<Val>>,
+	new_bindings: &mut HashMap<IStr, Thunk<Val>, H>,
 ) -> Result<()> {
 	match d {
 		Destruct::Full(v) => {
@@ -159,10 +160,10 @@
 	Ok(())
 }
 
-pub fn evaluate_dest(
+pub fn evaluate_dest<H: BuildHasher>(
 	d: &BindSpec,
 	fctx: Pending<Context>,
-	new_bindings: &mut FxHashMap<IStr, Thunk<Val>>,
+	new_bindings: &mut HashMap<IStr, Thunk<Val>, H>,
 ) -> Result<()> {
 	match d {
 		BindSpec::Field { into, value } => {
modifiedcrates/jrsonnet-evaluator/src/evaluate/mod.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/evaluate/mod.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/mod.rs
@@ -291,7 +291,7 @@
 	let uctx = CachedUnbound::new(evaluate_object_locals(ctx.clone(), locals));
 
 	for field in &members.fields {
-		evaluate_field_member(&mut builder, ctx.clone(), uctx.clone(), &field)?;
+		evaluate_field_member(&mut builder, ctx.clone(), uctx.clone(), field)?;
 	}
 
 	if !members.asserts.is_empty() {
@@ -304,13 +304,13 @@
 			fn run(&self, sup_this: SupThis) -> Result<()> {
 				let ctx = self.uctx.bind(sup_this)?;
 				for assert in &*self.asserts {
-					evaluate_assert(ctx.clone(), &assert)?;
+					evaluate_assert(ctx.clone(), assert)?;
 				}
 				Ok(())
 			}
 		}
 		builder.assert(ObjectAssert {
-			uctx: uctx.clone(),
+			uctx,
 			asserts: members.asserts.clone(),
 		});
 	}
@@ -567,7 +567,7 @@
 				evaluate_dest(b, fctx.clone(), &mut new_bindings)?;
 			}
 			let ctx = ctx.extend_bindings(new_bindings).into_future(fctx);
-			evaluate(ctx, &returned.clone())?
+			evaluate(ctx, returned)?
 		}
 		Arr(items) => {
 			if items.is_empty() {
modifiedcrates/jrsonnet-evaluator/src/evaluate/operator.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/evaluate/operator.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/operator.rs
@@ -95,9 +95,9 @@
 		// string format
 		(Str(_), _) => false,
 
-		(_, Num(b)) => return **b == 0.,
+		(_, Num(b)) => **b == 0.,
 		#[cfg(feature = "exp-bigint")]
-		(_, BigInt(b)) => return **b == num_bigint::BigInt::ZERO,
+		(_, BigInt(b)) => **b == num_bigint::BigInt::ZERO,
 
 		// something else
 		_ => false,
modifiedcrates/jrsonnet-evaluator/src/function/arglike.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/function/arglike.rs
+++ b/crates/jrsonnet-evaluator/src/function/arglike.rs
@@ -239,7 +239,7 @@
 	}
 
 	fn named_names(&self, handler: &mut dyn FnMut(&IStr)) {
-		for (name, _) in self {
+		for name in self.keys() {
 			handler(name);
 		}
 	}
modifiedcrates/jrsonnet-evaluator/src/function/parse.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/function/parse.rs
+++ b/crates/jrsonnet-evaluator/src/function/parse.rs
@@ -1,5 +1,3 @@
-use std::mem::replace;
-
 use jrsonnet_parser::{
 	function::{FunctionSignature, ParamName},
 	ExprParams,
@@ -87,7 +85,7 @@
 			}
 
 			destruct(
-				&into,
+				into,
 				{
 					let ctx = fctx.clone();
 					let name = into.name();
@@ -97,7 +95,7 @@
 				fctx.clone(),
 				&mut defaults,
 			)?;
-			if !into.name().is_anonymous() {
+			if into.name().is_named() {
 				filled_named += 1;
 			} else {
 				filled_positionals += 1;
@@ -165,7 +163,7 @@
 			.iter()
 			.position(|p| p.name() == name)
 			.ok_or_else(|| UnknownFunctionParameter(name.clone()))?;
-		if replace(&mut passed_args[id], Some(arg)).is_some() {
+		if passed_args[id].replace(arg).is_some() {
 			bail!(BindingParameterASecondTime(name.clone()));
 		}
 		filled_args += 1;
@@ -230,7 +228,7 @@
 					let params = params.clone();
 					Thunk!(move || Err(FunctionParameterNotBoundInCall(
 						param_name,
-						params.signature.clone()
+						params.signature
 					)
 					.into()))
 				},
modifiedcrates/jrsonnet-evaluator/src/gc.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/gc.rs
+++ b/crates/jrsonnet-evaluator/src/gc.rs
@@ -1,3 +1,8 @@
+#![allow(
+	clippy::implicit_hasher,
+	reason = "those methods exist exactly because with_capacity is only present for default BuildHasher"
+)]
+
 /// Macros to help deal with Gc
 use jrsonnet_gcmodule::Trace;
 use rustc_hash::{FxBuildHasher, FxHashMap, FxHashSet};
@@ -8,20 +13,20 @@
 }
 impl<V> WithCapacityExt for FxHashSet<V> {
 	fn with_capacity(capacity: usize) -> Self {
-		Self::with_capacity_and_hasher(capacity, FxBuildHasher::default())
+		Self::with_capacity_and_hasher(capacity, FxBuildHasher)
 	}
 
 	fn new() -> Self {
-		Self::with_hasher(FxBuildHasher::default())
+		Self::with_hasher(FxBuildHasher)
 	}
 }
 impl<K, V> WithCapacityExt for FxHashMap<K, V> {
 	fn with_capacity(capacity: usize) -> Self {
-		Self::with_capacity_and_hasher(capacity, FxBuildHasher::default())
+		Self::with_capacity_and_hasher(capacity, FxBuildHasher)
 	}
 
 	fn new() -> Self {
-		Self::with_hasher(FxBuildHasher::default())
+		Self::with_hasher(FxBuildHasher)
 	}
 }
 
modifiedcrates/jrsonnet-evaluator/src/lib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/lib.rs
+++ b/crates/jrsonnet-evaluator/src/lib.rs
@@ -367,7 +367,7 @@
 		let res = evaluate(self.create_default_context(file_name), &parsed);
 
 		let mut file_cache = self.file_cache();
-		let mut file = file_cache.entry(path.clone());
+		let mut file = file_cache.entry(path);
 
 		let Entry::Occupied(file) = &mut file else {
 			unreachable!("this file was just here")
modifiedcrates/jrsonnet-evaluator/src/manifest.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/manifest.rs
+++ b/crates/jrsonnet-evaluator/src/manifest.rs
@@ -240,7 +240,7 @@
 					}
 					ToString if i != 0 => buf.push(' '),
 					Minify | ToString => {}
-				};
+				}
 
 				in_description_frame(
 					|| format!("elem <{i}> manifestification"),
@@ -335,7 +335,7 @@
 			buf.push('}');
 		}
 		Val::Func(_) => bail!("tried to manifest function"),
-	};
+	}
 	Ok(())
 }
 
modifiedcrates/jrsonnet-evaluator/src/map.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/map.rs
+++ b/crates/jrsonnet-evaluator/src/map.rs
@@ -16,7 +16,7 @@
 
 impl LayeredHashMap {
 	pub fn iter_keys(self, mut handler: impl FnMut(IStr)) {
-		for (k, _) in &self.0.current {
+		for k in self.0.current.keys() {
 			handler(k.clone());
 		}
 		if let Some(parent) = self.0.parent.clone() {
@@ -47,11 +47,7 @@
 
 	pub fn contains_key(&self, key: &IStr) -> bool {
 		(self.0).current.contains_key(key)
-			|| self
-				.0
-				.parent
-				.as_ref()
-				.map_or(false, |p| p.contains_key(key))
+			|| self.0.parent.as_ref().is_some_and(|p| p.contains_key(key))
 	}
 }
 
modifiedcrates/jrsonnet-evaluator/src/obj/mod.rsdiffbeforeafterboth
before · crates/jrsonnet-evaluator/src/obj/mod.rs
1use std::{2	any::Any,3	cell::{Cell, RefCell},4	collections::hash_map::Entry,5	fmt::{self, Debug},6	hash::{Hash, Hasher},7	num::Saturating,8	ops::ControlFlow,9};1011use educe::Educe;12use jrsonnet_gcmodule::{cc_dyn, Acyclic, Cc, Trace, Weak};13use jrsonnet_interner::IStr;14use jrsonnet_parser::{Span, Visibility};15use rustc_hash::{FxHashMap, FxHashSet};1617mod oop;1819pub use oop::ObjValueBuilder;2021use crate::{22	arr::{PickObjectKeyValues, PickObjectValues},23	bail,24	error::{suggest_object_fields, ErrorKind::*},25	identity_hash,26	operator::evaluate_add_op,27	val::{ArrValue, ThunkValue},28	CcUnbound, MaybeUnbound, Result, Thunk, Unbound, Val,29};3031#[cfg(not(feature = "exp-preserve-order"))]32mod ordering {33	#![allow(34		// This module works as stub for preserve-order feature35		clippy::unused_self,36	)]3738	use jrsonnet_gcmodule::Trace;3940	#[derive(Clone, Copy, Default, Debug, Trace)]41	pub struct FieldIndex(());42	impl FieldIndex {43		pub const fn next(self) -> Self {44			Self(())45		}46	}4748	#[derive(Clone, Copy, Default, Debug, Trace)]49	pub struct SuperDepth(());50	impl SuperDepth {51		pub(super) fn deepen(self) {}52	}53}5455#[cfg(feature = "exp-preserve-order")]56mod ordering {57	use std::cmp::Reverse;5859	use jrsonnet_gcmodule::Trace;6061	#[derive(Clone, Copy, Default, Debug, Trace, PartialEq, Eq, PartialOrd, Ord)]62	pub struct FieldIndex(u32);63	impl FieldIndex {64		pub fn next(self) -> Self {65			Self(self.0 + 1)66		}67	}6869	#[derive(Clone, Copy, Default, PartialEq, Eq, PartialOrd, Ord, Debug)]70	pub struct SuperDepth(u32);71	impl SuperDepth {72		pub(super) fn deepen(&mut self) {73			self.0 += 174		}75	}7677	#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Debug)]78	pub struct FieldSortKey(Reverse<SuperDepth>, FieldIndex);79	impl FieldSortKey {80		pub fn new(depth: SuperDepth, index: FieldIndex) -> Self {81			Self(Reverse(depth), index)82		}83	}84}8586#[cfg(feature = "exp-preserve-order")]87use ordering::FieldSortKey;88use ordering::{FieldIndex, SuperDepth};8990// 0 - add91//  12 - visibility92#[derive(Clone, Copy)]93pub struct ObjFieldFlags(u8);94impl ObjFieldFlags {95	fn new(add: bool, visibility: Visibility) -> Self {96		let mut v = 0;97		if add {98			v |= 1;99		}100		v |= match visibility {101			Visibility::Normal => 0b000,102			Visibility::Hidden => 0b010,103			Visibility::Unhide => 0b100,104		};105		Self(v)106	}107	pub fn add(&self) -> bool {108		self.0 & 1 != 0109	}110	pub fn visibility(&self) -> Visibility {111		match (self.0 & 0b110) >> 1 {112			0b00 => Visibility::Normal,113			0b01 => Visibility::Hidden,114			0b10 => Visibility::Unhide,115			_ => unreachable!(),116		}117	}118}119impl Debug for ObjFieldFlags {120	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {121		f.debug_struct("ObjFieldFlags")122			.field("add", &self.add())123			.field("visibility", &self.visibility())124			.finish()125	}126}127128#[allow(clippy::module_name_repetitions)]129#[derive(Debug, Trace)]130pub struct ObjMember {131	#[trace(skip)]132	flags: ObjFieldFlags,133	original_index: FieldIndex,134	pub invoke: MaybeUnbound,135	pub location: Option<Span>,136}137138cc_dyn!(CcObjectAssertion, ObjectAssertion);139pub trait ObjectAssertion: Trace {140	fn run(&self, sup_this: SupThis) -> Result<()>;141}142143// Field => This144145#[derive(Trace, Debug)]146enum CacheValue {147	Cached(Result<Option<Val>>),148	Pending,149}150151type EnumFieldsHandler<'a> =152	dyn FnMut(SuperDepth, FieldIndex, IStr, EnumFields) -> ControlFlow<()> + 'a;153154pub enum EnumFields {155	Normal(Visibility),156	Omit(Skip),157}158159#[derive(Trace, Clone)]160pub enum GetFor {161	// Return value162	Final(Val),163	// Continue iterating over cores, add current value to sum stack164	SuperPlus(Val),165	// Ignore the field value, stop at this layer instead166	Omit(#[trace(skip)] Skip),167	NotFound,168}169170#[derive(Acyclic, Clone)]171pub enum FieldVisibility {172	Found(Visibility),173	Omit(Skip),174	NotFound,175}176177#[derive(Acyclic, Clone)]178pub enum HasFieldIncludeHidden {179	Exists,180	NotFound,181	Omit(Skip),182}183184type Skip = Saturating<usize>;185186pub trait ObjectCore: Trace + Any + Debug {187	// If callback returns false, iteration stops, and this call returns false.188	fn enum_fields_core(189		&self,190		super_depth: &mut SuperDepth,191		handler: &mut EnumFieldsHandler<'_>,192	) -> bool;193194	fn has_field_include_hidden_core(&self, name: IStr) -> HasFieldIncludeHidden;195196	fn get_for_core(&self, key: IStr, sup_this: SupThis, omit_only: bool) -> Result<GetFor>;197	fn field_visibility_core(&self, field: IStr) -> FieldVisibility;198199	fn run_assertions_core(&self, sup_this: SupThis) -> Result<()>;200}201202#[derive(Clone, Trace)]203pub struct WeakObjValue(#[trace(skip)] Weak<ObjValueInner>);204impl Debug for WeakObjValue {205	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {206		f.debug_tuple("WeakObjValue").finish()207	}208}209210impl PartialEq for WeakObjValue {211	fn eq(&self, other: &Self) -> bool {212		Weak::ptr_eq(&self.0, &other.0)213	}214}215216impl Eq for WeakObjValue {}217impl Hash for WeakObjValue {218	fn hash<H: Hasher>(&self, hasher: &mut H) {219		// Safety: usize is POD220		let addr = unsafe { *std::ptr::addr_of!(self.0).cast() };221		hasher.write_usize(addr);222	}223}224225cc_dyn!(226	#[derive(Clone, Debug)]227	CcObjectCore, ObjectCore,228	pub fn new() {...}229);230#[derive(Trace, Educe)]231#[educe(Debug)]232struct ObjValueInner {233	cores: Vec<CcObjectCore>,234	assertions_ran: Cell<bool>,235	value_cache: RefCell<FxHashMap<(IStr, CoreIdx), CacheValue>>,236}237238thread_local! {239	static RUNNING_ASSERTIONS: RefCell<FxHashSet<ObjValue>> = RefCell::default();240}241fn is_asserting(obj: &ObjValue) -> bool {242	RUNNING_ASSERTIONS.with_borrow(|v| v.contains(obj))243}244/// Returns false if already asserting245fn start_asserting(obj: &ObjValue) -> bool {246	RUNNING_ASSERTIONS.with_borrow_mut(|v| v.insert(obj.clone()))247}248fn finish_asserting(obj: &ObjValue) {249	RUNNING_ASSERTIONS.with_borrow_mut(|v| {250		let r = v.remove(obj);251		debug_assert!(252			r,253			"finish_asserting was called before start_asserting or twice"254		);255	});256}257258thread_local! {259	static EMPTY_OBJ: ObjValue = ObjValue(Cc::new(ObjValueInner {260		cores: vec![],261		assertions_ran: Cell::new(true),262		value_cache: RefCell::default(),263	}))264}265266#[allow(clippy::module_name_repetitions)]267#[derive(Clone, Trace, Debug, Educe)]268#[educe(PartialEq, Hash, Eq)]269pub struct ObjValue(270	#[educe(PartialEq(method(Cc::ptr_eq)), Hash(method(identity_hash)))] Cc<ObjValueInner>,271);272273impl ObjValue {274	pub fn empty() -> Self {275		EMPTY_OBJ.with(|v| v.clone())276	}277	pub fn is_empty(&self) -> bool {278		self.0.cores.is_empty() || self.len() == 0279	}280}281282#[derive(Trace, Debug)]283struct StandaloneSuperCore {284	sup: CoreIdx,285	this: ObjValue,286}287impl ObjectCore for StandaloneSuperCore {288	fn enum_fields_core(289		&self,290		super_depth: &mut SuperDepth,291		handler: &mut EnumFieldsHandler<'_>,292	) -> bool {293		self.this.enum_fields_idx(super_depth, handler, self.sup)294	}295296	fn has_field_include_hidden_core(&self, name: IStr) -> HasFieldIncludeHidden {297		if self.this.has_field_include_hidden_idx(name, self.sup) {298			HasFieldIncludeHidden::Exists299		} else {300			HasFieldIncludeHidden::NotFound301		}302	}303304	fn get_for_core(&self, key: IStr, _sup_this: SupThis, omit_only: bool) -> Result<GetFor> {305		if omit_only {306			return Ok(GetFor::NotFound);307		}308		let v = self.this.get_idx(key, self.sup)?;309		Ok(v.map_or(GetFor::NotFound, |v| GetFor::Final(v)))310	}311312	fn field_visibility_core(&self, field: IStr) -> FieldVisibility {313		match self.this.field_visibility_idx(field, self.sup) {314			Some(c) => FieldVisibility::Found(c),315			None => FieldVisibility::NotFound,316		}317	}318319	fn run_assertions_core(&self, _sup_this: SupThis) -> Result<()> {320		self.this.run_assertions()321	}322}323324#[derive(Debug, Acyclic)]325struct OmitFieldsCore {326	omit: FxHashSet<IStr>,327	prev_layers: usize,328}329impl ObjectCore for OmitFieldsCore {330	fn enum_fields_core(331		&self,332		super_depth: &mut SuperDepth,333		handler: &mut EnumFieldsHandler<'_>,334	) -> bool {335		let mut fi = FieldIndex::default();336		for f in &self.omit {337			if handler(338				*super_depth,339				fi,340				f.clone(),341				EnumFields::Omit(Saturating(self.prev_layers)),342			) == ControlFlow::Break(())343			{344				return false;345			}346			fi = fi.next();347		}348		true349	}350351	fn has_field_include_hidden_core(&self, name: IStr) -> HasFieldIncludeHidden {352		if self.omit.contains(&name) {353			return HasFieldIncludeHidden::Omit(Saturating(self.prev_layers));354		}355		HasFieldIncludeHidden::NotFound356	}357358	fn get_for_core(&self, key: IStr, _sup_this: SupThis, _omit_only: bool) -> Result<GetFor> {359		if self.omit.contains(&key) {360			return Ok(GetFor::Omit(Saturating(self.prev_layers)));361		}362		Ok(GetFor::NotFound)363	}364365	fn field_visibility_core(&self, field: IStr) -> FieldVisibility {366		if self.omit.contains(&field) {367			return FieldVisibility::Omit(Saturating(self.prev_layers));368		}369		FieldVisibility::NotFound370	}371372	fn run_assertions_core(&self, _sup_this: SupThis) -> Result<()> {373		Ok(())374	}375}376377#[derive(Hash, PartialEq, Eq, Trace, Clone, Copy, Debug)]378struct CoreIdx {379	idx: usize,380}381impl CoreIdx {382	fn super_exists(self) -> bool {383		self.idx != 0384	}385}386#[derive(Trace, Clone, PartialEq, Eq, Hash, Debug)]387pub struct SupThis {388	sup: CoreIdx,389	this: ObjValue,390}391impl SupThis {392	pub fn has_super(&self) -> bool {393		self.sup.super_exists()394	}395	/// Implementation of `"field" in super` operation,396	/// works faster than standalone super path.397	///398	/// In case of no `super` existence, returns false.399	pub fn field_in_super(&self, field: IStr) -> bool {400		self.this.has_field_include_hidden_idx(field, self.sup)401	}402	/// Implementation of `super.field` operation,403	/// works faster than standalone super path.404	///405	/// In case of no `super` existence, returns `NoSuperFound`406	pub fn get_super(&self, field: IStr) -> Result<Option<Val>> {407		if !self.sup.super_exists() {408			bail!(NoSuperFound);409		}410		self.this.get_idx(field, self.sup)411	}412	/// `super` with `self` overriden for top-level lookups.413	/// Exists when super appears outside of `super.field`/`"field" in super` expressions414	/// Exclusive to jrsonnet.415	///416	/// Might return `NoSuperFound` error.417	pub fn standalone_super(&self) -> Result<ObjValue> {418		if !self.sup.super_exists() {419			bail!(NoSuperFound)420		}421		let mut out = ObjValue::builder();422		out.reserve_cores(1).extend_with_core(StandaloneSuperCore {423			sup: self.sup,424			this: self.this.clone(),425		});426		Ok(out.build())427	}428	pub fn this(&self) -> &ObjValue {429		&self.this430	}431	pub fn downgrade(self) -> WeakSupThis {432		WeakSupThis {433			sup: self.sup,434			this: self.this.downgrade(),435		}436	}437}438#[derive(Trace, PartialEq, Eq, Hash, Debug)]439pub struct WeakSupThis {440	sup: CoreIdx,441	this: WeakObjValue,442}443444impl ObjValue {445	pub fn builder() -> ObjValueBuilder {446		ObjValueBuilder::new()447	}448	pub fn builder_with_capacity(capacity: usize) -> ObjValueBuilder {449		ObjValueBuilder::with_capacity(capacity)450	}451	pub(crate) fn extend_with_raw_member(self, key: IStr, value: ObjMember) -> Self {452		let mut out = ObjValueBuilder::with_capacity(1);453		out.with_super(self);454		let mut member = out.field(key);455		if value.flags.add() {456			member = member.add();457		}458		if let Some(loc) = value.location {459			member = member.with_location(loc);460		}461		let _ = member462			.with_visibility(value.flags.visibility())463			.binding(value.invoke);464		out.build()465	}466	pub fn extend_field(&mut self, name: IStr) -> ObjMemberBuilder<ExtendBuilder<'_>> {467		ObjMemberBuilder::new(ExtendBuilder(self), name, FieldIndex::default())468	}469470	pub fn extend(&mut self) -> ObjValueBuilder {471		let mut out = ObjValueBuilder::new();472		out.with_super(self.clone());473		out474	}475476	#[must_use]477	pub fn extend_from(&self, sup: Self) -> Self {478		let mut cores = sup.0.cores.clone();479		cores.extend(self.0.cores.iter().cloned());480		ObjValue(Cc::new(ObjValueInner {481			cores,482			value_cache: RefCell::default(),483			assertions_ran: Cell::new(false),484		}))485	}486	// #[must_use]487	// pub fn with_this(&self, this: Self) -> Self {488	// 	self.0.with_this(self.clone(), this)489	// }490	/// Returns amount of visible object fields491	/// If object only contains hidden fields - may return zero.492	pub fn len(&self) -> usize {493		self.fields_visibility()494			.values()495			.filter(|d| d.visible())496			.count()497	}498	/// For each field, calls callback.499	/// If callback returns false - ends iteration prematurely.500	///501	/// Returns false if ended prematurely502	pub fn enum_fields(&self, handler: &mut EnumFieldsHandler<'_>) -> bool {503		let mut super_depth = SuperDepth::default();504		self.enum_fields_idx(505			&mut super_depth,506			handler,507			CoreIdx {508				idx: self.0.cores.len(),509			},510		)511	}512	fn enum_fields_idx(513		&self,514		super_depth: &mut SuperDepth,515		handler: &mut EnumFieldsHandler<'_>,516		idx: CoreIdx,517	) -> bool {518		for core in self.0.cores[..idx.idx].iter().rev() {519			if !core.0.enum_fields_core(super_depth, handler) {520				return false;521			}522			super_depth.deepen();523		}524		true525	}526527	pub fn has_field_include_hidden(&self, name: IStr) -> bool {528		self.has_field_include_hidden_idx(529			name,530			CoreIdx {531				idx: self.0.cores.len(),532			},533		)534	}535	fn has_field_include_hidden_idx(&self, name: IStr, core: CoreIdx) -> bool {536		let mut skip = Saturating(0usize);537		for ele in self.0.cores[..core.idx].iter().rev() {538			match ele.0.has_field_include_hidden_core(name.clone()) {539				HasFieldIncludeHidden::Exists => {540					if skip.0 == 0 {541						return true;542					}543				}544				HasFieldIncludeHidden::Omit(new_skip) => {545					// +1 including this core546					skip = skip.max(new_skip + Saturating(1));547				}548				HasFieldIncludeHidden::NotFound => {}549			}550			skip -= 1;551		}552		false553	}554	pub fn has_field(&self, name: IStr) -> bool {555		match self.field_visibility(name) {556			Some(Visibility::Unhide | Visibility::Normal) => true,557			Some(Visibility::Hidden) | None => false,558		}559	}560	pub fn has_field_ex(&self, name: IStr, include_hidden: bool) -> bool {561		if include_hidden {562			self.has_field_include_hidden(name)563		} else {564			self.has_field(name)565		}566	}567	pub fn get(&self, key: IStr) -> Result<Option<Val>> {568		self.get_idx(569			key,570			CoreIdx {571				idx: self.0.cores.len(),572			},573		)574	}575576	fn get_idx(&self, key: IStr, core: CoreIdx) -> Result<Option<Val>> {577		let cache_key = (key.clone(), core);578		{579			let mut cache = self.0.value_cache.borrow_mut();580			// entry_ref candidate?581			match cache.entry(cache_key.clone()) {582				Entry::Occupied(v) => match v.get() {583					CacheValue::Cached(v) => return v.clone(),584					CacheValue::Pending => {585						if !is_asserting(self) {586							bail!(InfiniteRecursionDetected);587						}588					}589				},590				Entry::Vacant(v) => {591					v.insert(CacheValue::Pending);592				}593			};594		}595		let result = self.get_idx_uncached(key, core);596		{597			let mut cache = self.0.value_cache.borrow_mut();598			cache.insert(cache_key, CacheValue::Cached(result.clone()));599		}600		result601	}602	fn get_idx_uncached(&self, key: IStr, core: CoreIdx) -> Result<Option<Val>> {603		self.run_assertions()?;604		let mut add_stack = Vec::with_capacity(2);605		let mut skip = Saturating(0);606		for (sup, core) in self.0.cores[..core.idx].iter().enumerate().rev() {607			let sup_this = SupThis {608				sup: CoreIdx { idx: sup },609				this: self.clone(),610			};611			match core.0.get_for_core(key.clone(), sup_this, skip.0 != 0)? {612				GetFor::Final(val) if add_stack.is_empty() => {613					if skip.0 == 0 {614						return Ok(Some(val));615					}616				}617				GetFor::Final(val) => {618					if skip.0 == 0 {619						add_stack.push(val);620						break;621					}622				}623				GetFor::SuperPlus(val) => {624					if skip.0 == 0 {625						add_stack.push(val);626					}627				}628				GetFor::Omit(new_skip) => {629					// +1 including this core630					skip = skip.max(new_skip + Saturating(1));631				}632				GetFor::NotFound => {}633			}634			skip -= 1;635		}636		if add_stack.is_empty() {637			// None of layers had this field638			return Ok(None);639		} else if add_stack.len() == 1 {640			// A layer had this field, but it wanted this field to be added with super.641			// However, no super had this field, fail-safe642			return Ok(Some(add_stack.pop().expect("single element on stack")));643		}644		let mut values = add_stack.into_iter().rev();645		let init = values.next().expect("at least 2 elements");646647		values648			.try_fold(init, |a, b| evaluate_add_op(&a, &b))649			.map(Some)650651		// self.0.get_raw(key, this)652	}653654	pub fn get_or_bail(&self, key: IStr) -> Result<Val> {655		let Some(value) = self.get(key.clone())? else {656			let suggestions = suggest_object_fields(self, key.clone());657			bail!(NoSuchField(key, suggestions))658		};659		Ok(value)660	}661662	fn field_visibility(&self, field: IStr) -> Option<Visibility> {663		self.field_visibility_idx(664			field,665			CoreIdx {666				idx: self.0.cores.len(),667			},668		)669	}670	fn field_visibility_idx(&self, field: IStr, core: CoreIdx) -> Option<Visibility> {671		let mut exists = false;672		let mut skip = Saturating(0usize);673		for ele in self.0.cores[..core.idx].iter().rev() {674			let vis = ele.0.field_visibility_core(field.clone());675			match vis {676				FieldVisibility::Found(vis @ (Visibility::Unhide | Visibility::Hidden)) => {677					if skip.0 == 0 {678						return Some(vis);679					}680				}681				FieldVisibility::Found(Visibility::Normal) => {682					if skip.0 == 0 {683						exists = true;684					}685				}686				FieldVisibility::NotFound => {}687				FieldVisibility::Omit(new_skip) => {688					// +1 including this core689					skip = skip.max(new_skip + Saturating(1));690				}691			}692			skip -= 1;693		}694		exists.then_some(Visibility::Normal)695	}696697	pub fn run_assertions(&self) -> Result<()> {698		if self.0.assertions_ran.get() {699			return Ok(());700		}701		if !start_asserting(self) {702			return Ok(());703		}704		for (idx, ele) in self.0.cores.iter().enumerate() {705			let sup_this = SupThis {706				sup: CoreIdx { idx },707				this: self.clone(),708			};709			ele.0.run_assertions_core(sup_this).inspect_err(|_e| {710				finish_asserting(self);711			})?;712		}713		finish_asserting(self);714		self.0.assertions_ran.set(true);715		Ok(())716	}717718	pub fn iter(719		&self,720		#[cfg(feature = "exp-preserve-order")] preserve_order: bool,721	) -> impl Iterator<Item = (IStr, Result<Val>)> + '_ {722		let fields = self.fields(723			#[cfg(feature = "exp-preserve-order")]724			preserve_order,725		);726		fields.into_iter().map(|field| {727			(728				field.clone(),729				self.get(field)730					.map(|opt| opt.expect("iterating over keys, field exists")),731			)732		})733	}734	pub fn get_lazy(&self, key: IStr) -> Option<Thunk<Val>> {735		#[derive(Trace)]736		struct ObjFieldThunk {737			obj: ObjValue,738			key: IStr,739		}740		impl ThunkValue for ObjFieldThunk {741			type Output = Val;742743			fn get(&self) -> Result<Self::Output> {744				self.obj745					.get(self.key.clone())746					.transpose()747					.expect("field existence checked")748			}749		}750751		if !self.has_field_ex(key.clone(), true) {752			return None;753		}754755		Some(Thunk::new(ObjFieldThunk {756			obj: self.clone(),757			key,758		}))759	}760	pub fn get_lazy_or_bail(&self, key: IStr) -> Thunk<Val> {761		#[derive(Trace)]762		struct ObjFieldThunk {763			obj: ObjValue,764			key: IStr,765		}766		impl ThunkValue for ObjFieldThunk {767			type Output = Val;768769			fn get(&self) -> Result<Self::Output> {770				self.obj.get_or_bail(self.key.clone())771			}772		}773774		Thunk::new(ObjFieldThunk {775			obj: self.clone(),776			key,777		})778	}779	pub fn ptr_eq(a: &Self, b: &Self) -> bool {780		Cc::ptr_eq(&a.0, &b.0)781	}782	pub fn downgrade(self) -> WeakObjValue {783		WeakObjValue(self.0.downgrade())784	}785}786787#[derive(Debug)]788struct FieldVisibilityData {789	omitted_until: Saturating<usize>,790	exists_visible: Option<Visibility>,791	#[cfg(feature = "exp-preserve-order")]792	key: FieldSortKey,793}794impl FieldVisibilityData {795	fn visible(&self) -> bool {796		self.exists_visible797			.expect("non-existing fields shall be dropped at the end of fn fields_visibility()")798			.is_visible()799	}800	#[cfg(feature = "exp-preserve-order")]801	fn sort_key(&self) -> FieldSortKey {802		self.key803	}804}805806impl ObjValue {807	fn fields_visibility(&self) -> FxHashMap<IStr, FieldVisibilityData> {808		let mut out = FxHashMap::default();809810		let mut super_depth = SuperDepth::default();811		let mut omit_index = Saturating(0);812		for core in self.0.cores.iter().rev() {813			core.0814				.enum_fields_core(&mut super_depth, &mut |_depth, _index, name, visibility| {815					let entry = out.entry(name);816					let data = entry.or_insert(FieldVisibilityData {817						exists_visible: None,818						#[cfg(feature = "exp-preserve-order")]819						key: FieldSortKey::new(_depth, _index),820						omitted_until: omit_index,821					});822					match visibility {823						EnumFields::Omit(new_skip) => {824							// +1 including this core825							data.omitted_until = data826								.omitted_until827								.max(omit_index + new_skip + Saturating(1));828						}829						EnumFields::Normal(Visibility::Normal) => {830							if data.omitted_until <= omit_index && data.exists_visible.is_none() {831								data.exists_visible = Some(Visibility::Normal);832							}833						}834						EnumFields::Normal(Visibility::Hidden) => {835							if data.omitted_until <= omit_index {836								data.exists_visible = Some(match data.exists_visible {837									// We're iterating in reverse, later unhide is preserved838									Some(Visibility::Unhide) => Visibility::Unhide,839									_ => Visibility::Hidden,840								});841							}842						}843						EnumFields::Normal(Visibility::Unhide) => {844							if data.omitted_until <= omit_index {845								data.exists_visible = Some(match data.exists_visible {846									// We're iterating in reverse, later hide is preserved847									Some(Visibility::Hidden) => Visibility::Hidden,848									_ => Visibility::Unhide,849								});850							}851						}852					}853					ControlFlow::Continue(())854				});855856			super_depth.deepen();857			omit_index += 1;858		}859860		out.retain(|_, v| v.exists_visible.is_some());861862		out863	}864	pub fn fields_ex(865		&self,866		include_hidden: bool,867		#[cfg(feature = "exp-preserve-order")] preserve_order: bool,868	) -> Vec<IStr> {869		#[cfg(feature = "exp-preserve-order")]870		if preserve_order {871			let (mut fields, mut keys): (Vec<_>, Vec<_>) = self872				.fields_visibility()873				.into_iter()874				.filter(|(_, d)| include_hidden || d.visible())875				.enumerate()876				.map(|(idx, (k, d))| (k, (d.sort_key(), idx)))877				.unzip();878			keys.sort_unstable_by_key(|v| v.0);879			// Reorder in-place by resulting indexes880			for i in 0..fields.len() {881				let x = fields[i].clone();882				let mut j = i;883				loop {884					let k = keys[j].1;885					keys[j].1 = j;886					if k == i {887						break;888					}889					fields[j] = fields[k].clone();890					j = k;891				}892				fields[j] = x;893			}894			return fields;895		}896897		let mut fields: Vec<_> = self898			.fields_visibility()899			.into_iter()900			.filter(|(_, d)| include_hidden || d.visible())901			.map(|(k, _)| k)902			.collect();903		fields.sort_unstable();904		fields905	}906	pub fn fields(&self, #[cfg(feature = "exp-preserve-order")] preserve_order: bool) -> Vec<IStr> {907		self.fields_ex(908			false,909			#[cfg(feature = "exp-preserve-order")]910			preserve_order,911		)912	}913	pub fn values_ex(914		&self,915		include_hidden: bool,916		#[cfg(feature = "exp-preserve-order")] preserve_order: bool,917	) -> ArrValue {918		ArrValue::new(PickObjectValues::new(919			self.clone(),920			self.fields_ex(921				include_hidden,922				#[cfg(feature = "exp-preserve-order")]923				preserve_order,924			),925		))926	}927	pub fn values(&self, #[cfg(feature = "exp-preserve-order")] preserve_order: bool) -> ArrValue {928		self.values_ex(929			false,930			#[cfg(feature = "exp-preserve-order")]931			preserve_order,932		)933	}934	pub fn key_values_ex(935		&self,936		include_hidden: bool,937		#[cfg(feature = "exp-preserve-order")] preserve_order: bool,938	) -> ArrValue {939		ArrValue::new(PickObjectKeyValues::new(940			self.clone(),941			self.fields_ex(942				include_hidden,943				#[cfg(feature = "exp-preserve-order")]944				preserve_order,945			),946		))947	}948	pub fn key_values(949		&self,950		#[cfg(feature = "exp-preserve-order")] preserve_order: bool,951	) -> ArrValue {952		self.key_values_ex(953			false,954			#[cfg(feature = "exp-preserve-order")]955			preserve_order,956		)957	}958}959960#[allow(clippy::module_name_repetitions)]961#[must_use = "value not added unless binding() was called"]962pub struct ObjMemberBuilder<Kind> {963	kind: Kind,964	name: IStr,965	add: bool,966	visibility: Visibility,967	original_index: FieldIndex,968	location: Option<Span>,969}970971#[allow(clippy::missing_const_for_fn)]972impl<Kind> ObjMemberBuilder<Kind> {973	pub(crate) fn new(kind: Kind, name: IStr, original_index: FieldIndex) -> Self {974		Self {975			kind,976			name,977			original_index,978			add: false,979			visibility: Visibility::Normal,980			location: None,981		}982	}983984	pub const fn with_add(mut self, add: bool) -> Self {985		self.add = add;986		self987	}988	pub fn add(self) -> Self {989		self.with_add(true)990	}991	pub fn with_visibility(mut self, visibility: Visibility) -> Self {992		self.visibility = visibility;993		self994	}995	pub fn hide(self) -> Self {996		self.with_visibility(Visibility::Hidden)997	}998	pub fn with_location(mut self, location: Span) -> Self {999		self.location = Some(location);1000		self1001	}1002	fn build_member(self, binding: MaybeUnbound) -> (Kind, IStr, ObjMember) {1003		(1004			self.kind,1005			self.name,1006			ObjMember {1007				flags: ObjFieldFlags::new(self.add, self.visibility),1008				original_index: self.original_index,1009				invoke: binding,1010				location: self.location,1011			},1012		)1013	}1014}10151016pub struct ExtendBuilder<'v>(&'v mut ObjValue);1017impl ObjMemberBuilder<ExtendBuilder<'_>> {1018	pub fn value(self, value: impl Into<Val>) {1019		self.binding(MaybeUnbound::Bound(Thunk::evaluated(value.into())));1020	}1021	pub fn bindable(self, bindable: impl Unbound<Bound = Val>) {1022		self.binding(MaybeUnbound::Unbound(CcUnbound::new(bindable)));1023	}1024	pub fn binding(self, binding: MaybeUnbound) {1025		let (receiver, name, member) = self.build_member(binding);1026		let new = receiver.0.clone();1027		*receiver.0 = new.extend_with_raw_member(name, member);1028	}1029}
after · crates/jrsonnet-evaluator/src/obj/mod.rs
1use std::{2	any::Any,3	cell::{Cell, RefCell},4	clone::Clone,5	collections::hash_map::Entry,6	fmt::{self, Debug},7	hash::{Hash, Hasher},8	num::Saturating,9	ops::ControlFlow,10};1112use educe::Educe;13use jrsonnet_gcmodule::{cc_dyn, Acyclic, Cc, Trace, Weak};14use jrsonnet_interner::IStr;15use jrsonnet_parser::{Span, Visibility};16use rustc_hash::{FxHashMap, FxHashSet};1718mod oop;1920pub use oop::ObjValueBuilder;2122use crate::{23	arr::{PickObjectKeyValues, PickObjectValues},24	bail,25	error::{suggest_object_fields, ErrorKind::*},26	identity_hash,27	operator::evaluate_add_op,28	val::{ArrValue, ThunkValue},29	CcUnbound, MaybeUnbound, Result, Thunk, Unbound, Val,30};3132#[cfg(not(feature = "exp-preserve-order"))]33mod ordering {34	#![allow(35		// This module works as stub for preserve-order feature36		clippy::unused_self,37	)]3839	use jrsonnet_gcmodule::Trace;4041	#[derive(Clone, Copy, Default, Debug, Trace)]42	pub struct FieldIndex(());43	impl FieldIndex {44		pub const fn next(self) -> Self {45			Self(())46		}47	}4849	#[derive(Clone, Copy, Default, Debug, Trace)]50	pub struct SuperDepth(());51	impl SuperDepth {52		pub(super) fn deepen(self) {}53	}54}5556#[cfg(feature = "exp-preserve-order")]57mod ordering {58	use std::cmp::Reverse;5960	use jrsonnet_gcmodule::Trace;6162	#[derive(Clone, Copy, Default, Debug, Trace, PartialEq, Eq, PartialOrd, Ord)]63	pub struct FieldIndex(u32);64	impl FieldIndex {65		pub fn next(self) -> Self {66			Self(self.0 + 1)67		}68	}6970	#[derive(Clone, Copy, Default, PartialEq, Eq, PartialOrd, Ord, Debug)]71	pub struct SuperDepth(u32);72	impl SuperDepth {73		pub(super) fn deepen(&mut self) {74			self.0 += 175		}76	}7778	#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Debug)]79	pub struct FieldSortKey(Reverse<SuperDepth>, FieldIndex);80	impl FieldSortKey {81		pub fn new(depth: SuperDepth, index: FieldIndex) -> Self {82			Self(Reverse(depth), index)83		}84	}85}8687#[cfg(feature = "exp-preserve-order")]88use ordering::FieldSortKey;89use ordering::{FieldIndex, SuperDepth};9091// 0 - add92//  12 - visibility93#[derive(Clone, Copy)]94pub struct ObjFieldFlags(u8);95impl ObjFieldFlags {96	fn new(add: bool, visibility: Visibility) -> Self {97		let mut v = 0;98		if add {99			v |= 1;100		}101		v |= match visibility {102			Visibility::Normal => 0b000,103			Visibility::Hidden => 0b010,104			Visibility::Unhide => 0b100,105		};106		Self(v)107	}108	pub fn add(&self) -> bool {109		self.0 & 1 != 0110	}111	pub fn visibility(&self) -> Visibility {112		match (self.0 & 0b110) >> 1 {113			0b00 => Visibility::Normal,114			0b01 => Visibility::Hidden,115			0b10 => Visibility::Unhide,116			_ => unreachable!(),117		}118	}119}120impl Debug for ObjFieldFlags {121	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {122		f.debug_struct("ObjFieldFlags")123			.field("add", &self.add())124			.field("visibility", &self.visibility())125			.finish()126	}127}128129#[allow(clippy::module_name_repetitions)]130#[derive(Debug, Trace)]131pub struct ObjMember {132	#[trace(skip)]133	flags: ObjFieldFlags,134	original_index: FieldIndex,135	pub invoke: MaybeUnbound,136	pub location: Option<Span>,137}138139cc_dyn!(CcObjectAssertion, ObjectAssertion);140pub trait ObjectAssertion: Trace {141	fn run(&self, sup_this: SupThis) -> Result<()>;142}143144// Field => This145146#[derive(Trace, Debug)]147enum CacheValue {148	Cached(Result<Option<Val>>),149	Pending,150}151152type EnumFieldsHandler<'a> =153	dyn FnMut(SuperDepth, FieldIndex, IStr, EnumFields) -> ControlFlow<()> + 'a;154155pub enum EnumFields {156	Normal(Visibility),157	Omit(Skip),158}159160#[derive(Trace, Clone)]161pub enum GetFor {162	// Return value163	Final(Val),164	// Continue iterating over cores, add current value to sum stack165	SuperPlus(Val),166	// Ignore the field value, stop at this layer instead167	Omit(#[trace(skip)] Skip),168	NotFound,169}170171#[derive(Acyclic, Clone)]172pub enum FieldVisibility {173	Found(Visibility),174	Omit(Skip),175	NotFound,176}177178#[derive(Acyclic, Clone)]179pub enum HasFieldIncludeHidden {180	Exists,181	NotFound,182	Omit(Skip),183}184185type Skip = Saturating<usize>;186187pub trait ObjectCore: Trace + Any + Debug {188	// If callback returns false, iteration stops, and this call returns false.189	fn enum_fields_core(190		&self,191		super_depth: &mut SuperDepth,192		handler: &mut EnumFieldsHandler<'_>,193	) -> bool;194195	fn has_field_include_hidden_core(&self, name: IStr) -> HasFieldIncludeHidden;196197	fn get_for_core(&self, key: IStr, sup_this: SupThis, omit_only: bool) -> Result<GetFor>;198	fn field_visibility_core(&self, field: IStr) -> FieldVisibility;199200	fn run_assertions_core(&self, sup_this: SupThis) -> Result<()>;201}202203#[derive(Clone, Trace)]204pub struct WeakObjValue(#[trace(skip)] Weak<ObjValueInner>);205impl Debug for WeakObjValue {206	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {207		f.debug_tuple("WeakObjValue").finish()208	}209}210211impl PartialEq for WeakObjValue {212	fn eq(&self, other: &Self) -> bool {213		Weak::ptr_eq(&self.0, &other.0)214	}215}216217impl Eq for WeakObjValue {}218impl Hash for WeakObjValue {219	fn hash<H: Hasher>(&self, hasher: &mut H) {220		// Safety: usize is POD221		let addr = unsafe { *std::ptr::addr_of!(self.0).cast() };222		hasher.write_usize(addr);223	}224}225226cc_dyn!(227	#[derive(Clone, Debug)]228	CcObjectCore, ObjectCore,229	pub fn new() {...}230);231#[derive(Trace, Educe)]232#[educe(Debug)]233struct ObjValueInner {234	cores: Vec<CcObjectCore>,235	assertions_ran: Cell<bool>,236	value_cache: RefCell<FxHashMap<(IStr, CoreIdx), CacheValue>>,237}238239thread_local! {240	static RUNNING_ASSERTIONS: RefCell<FxHashSet<ObjValue>> = RefCell::default();241}242fn is_asserting(obj: &ObjValue) -> bool {243	RUNNING_ASSERTIONS.with_borrow(|v| v.contains(obj))244}245/// Returns false if already asserting246fn start_asserting(obj: &ObjValue) -> bool {247	RUNNING_ASSERTIONS.with_borrow_mut(|v| v.insert(obj.clone()))248}249fn finish_asserting(obj: &ObjValue) {250	RUNNING_ASSERTIONS.with_borrow_mut(|v| {251		let r = v.remove(obj);252		debug_assert!(253			r,254			"finish_asserting was called before start_asserting or twice"255		);256	});257}258259thread_local! {260	static EMPTY_OBJ: ObjValue = ObjValue(Cc::new(ObjValueInner {261		cores: vec![],262		assertions_ran: Cell::new(true),263		value_cache: RefCell::default(),264	}))265}266267#[allow(clippy::module_name_repetitions)]268#[derive(Clone, Trace, Debug, Educe)]269#[educe(PartialEq, Hash, Eq)]270pub struct ObjValue(271	#[educe(PartialEq(method(Cc::ptr_eq)), Hash(method(identity_hash)))] Cc<ObjValueInner>,272);273274impl ObjValue {275	pub fn empty() -> Self {276		EMPTY_OBJ.with(Clone::clone)277	}278	pub fn is_empty(&self) -> bool {279		self.0.cores.is_empty() || self.len() == 0280	}281}282283#[derive(Trace, Debug)]284struct StandaloneSuperCore {285	sup: CoreIdx,286	this: ObjValue,287}288impl ObjectCore for StandaloneSuperCore {289	fn enum_fields_core(290		&self,291		super_depth: &mut SuperDepth,292		handler: &mut EnumFieldsHandler<'_>,293	) -> bool {294		self.this.enum_fields_idx(super_depth, handler, self.sup)295	}296297	fn has_field_include_hidden_core(&self, name: IStr) -> HasFieldIncludeHidden {298		if self.this.has_field_include_hidden_idx(name, self.sup) {299			HasFieldIncludeHidden::Exists300		} else {301			HasFieldIncludeHidden::NotFound302		}303	}304305	fn get_for_core(&self, key: IStr, _sup_this: SupThis, omit_only: bool) -> Result<GetFor> {306		if omit_only {307			return Ok(GetFor::NotFound);308		}309		let v = self.this.get_idx(key, self.sup)?;310		Ok(v.map_or(GetFor::NotFound, GetFor::Final))311	}312313	fn field_visibility_core(&self, field: IStr) -> FieldVisibility {314		self.this315			.field_visibility_idx(field, self.sup)316			.map_or(FieldVisibility::NotFound, FieldVisibility::Found)317	}318319	fn run_assertions_core(&self, _sup_this: SupThis) -> Result<()> {320		self.this.run_assertions()321	}322}323324#[derive(Debug, Acyclic)]325struct OmitFieldsCore {326	omit: FxHashSet<IStr>,327	prev_layers: usize,328}329impl ObjectCore for OmitFieldsCore {330	fn enum_fields_core(331		&self,332		super_depth: &mut SuperDepth,333		handler: &mut EnumFieldsHandler<'_>,334	) -> bool {335		let mut fi = FieldIndex::default();336		for f in &self.omit {337			if handler(338				*super_depth,339				fi,340				f.clone(),341				EnumFields::Omit(Saturating(self.prev_layers)),342			) == ControlFlow::Break(())343			{344				return false;345			}346			fi = fi.next();347		}348		true349	}350351	fn has_field_include_hidden_core(&self, name: IStr) -> HasFieldIncludeHidden {352		if self.omit.contains(&name) {353			return HasFieldIncludeHidden::Omit(Saturating(self.prev_layers));354		}355		HasFieldIncludeHidden::NotFound356	}357358	fn get_for_core(&self, key: IStr, _sup_this: SupThis, _omit_only: bool) -> Result<GetFor> {359		if self.omit.contains(&key) {360			return Ok(GetFor::Omit(Saturating(self.prev_layers)));361		}362		Ok(GetFor::NotFound)363	}364365	fn field_visibility_core(&self, field: IStr) -> FieldVisibility {366		if self.omit.contains(&field) {367			return FieldVisibility::Omit(Saturating(self.prev_layers));368		}369		FieldVisibility::NotFound370	}371372	fn run_assertions_core(&self, _sup_this: SupThis) -> Result<()> {373		Ok(())374	}375}376377#[derive(Hash, PartialEq, Eq, Trace, Clone, Copy, Debug)]378struct CoreIdx {379	idx: usize,380}381impl CoreIdx {382	fn super_exists(self) -> bool {383		self.idx != 0384	}385}386#[derive(Trace, Clone, PartialEq, Eq, Hash, Debug)]387pub struct SupThis {388	sup: CoreIdx,389	this: ObjValue,390}391impl SupThis {392	pub fn has_super(&self) -> bool {393		self.sup.super_exists()394	}395	/// Implementation of `"field" in super` operation,396	/// works faster than standalone super path.397	///398	/// In case of no `super` existence, returns false.399	pub fn field_in_super(&self, field: IStr) -> bool {400		self.this.has_field_include_hidden_idx(field, self.sup)401	}402	/// Implementation of `super.field` operation,403	/// works faster than standalone super path.404	///405	/// In case of no `super` existence, returns `NoSuperFound`406	pub fn get_super(&self, field: IStr) -> Result<Option<Val>> {407		if !self.sup.super_exists() {408			bail!(NoSuperFound);409		}410		self.this.get_idx(field, self.sup)411	}412	/// `super` with `self` overriden for top-level lookups.413	/// Exists when super appears outside of `super.field`/`"field" in super` expressions414	/// Exclusive to jrsonnet.415	///416	/// Might return `NoSuperFound` error.417	pub fn standalone_super(&self) -> Result<ObjValue> {418		if !self.sup.super_exists() {419			bail!(NoSuperFound)420		}421		let mut out = ObjValue::builder();422		out.reserve_cores(1).extend_with_core(StandaloneSuperCore {423			sup: self.sup,424			this: self.this.clone(),425		});426		Ok(out.build())427	}428	pub fn this(&self) -> &ObjValue {429		&self.this430	}431	pub fn downgrade(self) -> WeakSupThis {432		WeakSupThis {433			sup: self.sup,434			this: self.this.downgrade(),435		}436	}437}438#[derive(Trace, PartialEq, Eq, Hash, Debug)]439pub struct WeakSupThis {440	sup: CoreIdx,441	this: WeakObjValue,442}443444impl ObjValue {445	pub fn builder() -> ObjValueBuilder {446		ObjValueBuilder::new()447	}448	pub fn builder_with_capacity(capacity: usize) -> ObjValueBuilder {449		ObjValueBuilder::with_capacity(capacity)450	}451	pub(crate) fn extend_with_raw_member(self, key: IStr, value: ObjMember) -> Self {452		let mut out = ObjValueBuilder::with_capacity(1);453		out.with_super(self);454		let mut member = out.field(key);455		if value.flags.add() {456			member = member.add();457		}458		if let Some(loc) = value.location {459			member = member.with_location(loc);460		}461		let _ = member462			.with_visibility(value.flags.visibility())463			.binding(value.invoke);464		out.build()465	}466	pub fn extend_field(&mut self, name: IStr) -> ObjMemberBuilder<ExtendBuilder<'_>> {467		ObjMemberBuilder::new(ExtendBuilder(self), name, FieldIndex::default())468	}469470	pub fn extend(&mut self) -> ObjValueBuilder {471		let mut out = ObjValueBuilder::new();472		out.with_super(self.clone());473		out474	}475476	#[must_use]477	pub fn extend_from(&self, sup: Self) -> Self {478		let mut cores = sup.0.cores.clone();479		cores.extend(self.0.cores.iter().cloned());480		ObjValue(Cc::new(ObjValueInner {481			cores,482			value_cache: RefCell::default(),483			assertions_ran: Cell::new(false),484		}))485	}486	// #[must_use]487	// pub fn with_this(&self, this: Self) -> Self {488	// 	self.0.with_this(self.clone(), this)489	// }490	/// Returns amount of visible object fields491	/// If object only contains hidden fields - may return zero.492	pub fn len(&self) -> usize {493		self.fields_visibility()494			.values()495			.filter(|d| d.visible())496			.count()497	}498	/// For each field, calls callback.499	/// If callback returns false - ends iteration prematurely.500	///501	/// Returns false if ended prematurely502	pub fn enum_fields(&self, handler: &mut EnumFieldsHandler<'_>) -> bool {503		let mut super_depth = SuperDepth::default();504		self.enum_fields_idx(505			&mut super_depth,506			handler,507			CoreIdx {508				idx: self.0.cores.len(),509			},510		)511	}512	fn enum_fields_idx(513		&self,514		super_depth: &mut SuperDepth,515		handler: &mut EnumFieldsHandler<'_>,516		idx: CoreIdx,517	) -> bool {518		for core in self.0.cores[..idx.idx].iter().rev() {519			if !core.0.enum_fields_core(super_depth, handler) {520				return false;521			}522			super_depth.deepen();523		}524		true525	}526527	pub fn has_field_include_hidden(&self, name: IStr) -> bool {528		self.has_field_include_hidden_idx(529			name,530			CoreIdx {531				idx: self.0.cores.len(),532			},533		)534	}535	fn has_field_include_hidden_idx(&self, name: IStr, core: CoreIdx) -> bool {536		let mut skip = Saturating(0usize);537		for ele in self.0.cores[..core.idx].iter().rev() {538			match ele.0.has_field_include_hidden_core(name.clone()) {539				HasFieldIncludeHidden::Exists => {540					if skip.0 == 0 {541						return true;542					}543				}544				HasFieldIncludeHidden::Omit(new_skip) => {545					// +1 including this core546					skip = skip.max(new_skip + Saturating(1));547				}548				HasFieldIncludeHidden::NotFound => {}549			}550			skip -= 1;551		}552		false553	}554	pub fn has_field(&self, name: IStr) -> bool {555		match self.field_visibility(name) {556			Some(Visibility::Unhide | Visibility::Normal) => true,557			Some(Visibility::Hidden) | None => false,558		}559	}560	pub fn has_field_ex(&self, name: IStr, include_hidden: bool) -> bool {561		if include_hidden {562			self.has_field_include_hidden(name)563		} else {564			self.has_field(name)565		}566	}567	pub fn get(&self, key: IStr) -> Result<Option<Val>> {568		self.get_idx(569			key,570			CoreIdx {571				idx: self.0.cores.len(),572			},573		)574	}575576	fn get_idx(&self, key: IStr, core: CoreIdx) -> Result<Option<Val>> {577		let cache_key = (key.clone(), core);578		{579			let mut cache = self.0.value_cache.borrow_mut();580			// entry_ref candidate?581			match cache.entry(cache_key.clone()) {582				Entry::Occupied(v) => match v.get() {583					CacheValue::Cached(v) => return v.clone(),584					CacheValue::Pending => {585						if !is_asserting(self) {586							bail!(InfiniteRecursionDetected);587						}588					}589				},590				Entry::Vacant(v) => {591					v.insert(CacheValue::Pending);592				}593			};594		}595		let result = self.get_idx_uncached(key, core);596		{597			let mut cache = self.0.value_cache.borrow_mut();598			cache.insert(cache_key, CacheValue::Cached(result.clone()));599		}600		result601	}602	fn get_idx_uncached(&self, key: IStr, core: CoreIdx) -> Result<Option<Val>> {603		self.run_assertions()?;604		let mut add_stack = Vec::with_capacity(2);605		let mut skip = Saturating(0);606		for (sup, core) in self.0.cores[..core.idx].iter().enumerate().rev() {607			let sup_this = SupThis {608				sup: CoreIdx { idx: sup },609				this: self.clone(),610			};611			match core.0.get_for_core(key.clone(), sup_this, skip.0 != 0)? {612				GetFor::Final(val) if add_stack.is_empty() => {613					if skip.0 == 0 {614						return Ok(Some(val));615					}616				}617				GetFor::Final(val) => {618					if skip.0 == 0 {619						add_stack.push(val);620						break;621					}622				}623				GetFor::SuperPlus(val) => {624					if skip.0 == 0 {625						add_stack.push(val);626					}627				}628				GetFor::Omit(new_skip) => {629					// +1 including this core630					skip = skip.max(new_skip + Saturating(1));631				}632				GetFor::NotFound => {}633			}634			skip -= 1;635		}636		if add_stack.is_empty() {637			// None of layers had this field638			return Ok(None);639		} else if add_stack.len() == 1 {640			// A layer had this field, but it wanted this field to be added with super.641			// However, no super had this field, fail-safe642			return Ok(Some(add_stack.pop().expect("single element on stack")));643		}644		let mut values = add_stack.into_iter().rev();645		let init = values.next().expect("at least 2 elements");646647		values648			.try_fold(init, |a, b| evaluate_add_op(&a, &b))649			.map(Some)650651		// self.0.get_raw(key, this)652	}653654	pub fn get_or_bail(&self, key: IStr) -> Result<Val> {655		let Some(value) = self.get(key.clone())? else {656			let suggestions = suggest_object_fields(self, key.clone());657			bail!(NoSuchField(key, suggestions))658		};659		Ok(value)660	}661662	fn field_visibility(&self, field: IStr) -> Option<Visibility> {663		self.field_visibility_idx(664			field,665			CoreIdx {666				idx: self.0.cores.len(),667			},668		)669	}670	fn field_visibility_idx(&self, field: IStr, core: CoreIdx) -> Option<Visibility> {671		let mut exists = false;672		let mut skip = Saturating(0usize);673		for ele in self.0.cores[..core.idx].iter().rev() {674			let vis = ele.0.field_visibility_core(field.clone());675			match vis {676				FieldVisibility::Found(vis @ (Visibility::Unhide | Visibility::Hidden)) => {677					if skip.0 == 0 {678						return Some(vis);679					}680				}681				FieldVisibility::Found(Visibility::Normal) => {682					if skip.0 == 0 {683						exists = true;684					}685				}686				FieldVisibility::NotFound => {}687				FieldVisibility::Omit(new_skip) => {688					// +1 including this core689					skip = skip.max(new_skip + Saturating(1));690				}691			}692			skip -= 1;693		}694		exists.then_some(Visibility::Normal)695	}696697	pub fn run_assertions(&self) -> Result<()> {698		if self.0.assertions_ran.get() {699			return Ok(());700		}701		if !start_asserting(self) {702			return Ok(());703		}704		for (idx, ele) in self.0.cores.iter().enumerate() {705			let sup_this = SupThis {706				sup: CoreIdx { idx },707				this: self.clone(),708			};709			ele.0.run_assertions_core(sup_this).inspect_err(|_e| {710				finish_asserting(self);711			})?;712		}713		finish_asserting(self);714		self.0.assertions_ran.set(true);715		Ok(())716	}717718	pub fn iter(719		&self,720		#[cfg(feature = "exp-preserve-order")] preserve_order: bool,721	) -> impl Iterator<Item = (IStr, Result<Val>)> + '_ {722		let fields = self.fields(723			#[cfg(feature = "exp-preserve-order")]724			preserve_order,725		);726		fields.into_iter().map(|field| {727			(728				field.clone(),729				self.get(field)730					.map(|opt| opt.expect("iterating over keys, field exists")),731			)732		})733	}734	pub fn get_lazy(&self, key: IStr) -> Option<Thunk<Val>> {735		#[derive(Trace)]736		struct ObjFieldThunk {737			obj: ObjValue,738			key: IStr,739		}740		impl ThunkValue for ObjFieldThunk {741			type Output = Val;742743			fn get(&self) -> Result<Self::Output> {744				self.obj745					.get(self.key.clone())746					.transpose()747					.expect("field existence checked")748			}749		}750751		if !self.has_field_ex(key.clone(), true) {752			return None;753		}754755		Some(Thunk::new(ObjFieldThunk {756			obj: self.clone(),757			key,758		}))759	}760	pub fn get_lazy_or_bail(&self, key: IStr) -> Thunk<Val> {761		#[derive(Trace)]762		struct ObjFieldThunk {763			obj: ObjValue,764			key: IStr,765		}766		impl ThunkValue for ObjFieldThunk {767			type Output = Val;768769			fn get(&self) -> Result<Self::Output> {770				self.obj.get_or_bail(self.key.clone())771			}772		}773774		Thunk::new(ObjFieldThunk {775			obj: self.clone(),776			key,777		})778	}779	pub fn ptr_eq(a: &Self, b: &Self) -> bool {780		Cc::ptr_eq(&a.0, &b.0)781	}782	pub fn downgrade(self) -> WeakObjValue {783		WeakObjValue(self.0.downgrade())784	}785}786787#[derive(Debug)]788struct FieldVisibilityData {789	omitted_until: Saturating<usize>,790	exists_visible: Option<Visibility>,791	#[cfg(feature = "exp-preserve-order")]792	key: FieldSortKey,793}794impl FieldVisibilityData {795	fn visible(&self) -> bool {796		self.exists_visible797			.expect("non-existing fields shall be dropped at the end of fn fields_visibility()")798			.is_visible()799	}800	#[cfg(feature = "exp-preserve-order")]801	fn sort_key(&self) -> FieldSortKey {802		self.key803	}804}805806impl ObjValue {807	fn fields_visibility(&self) -> FxHashMap<IStr, FieldVisibilityData> {808		let mut out = FxHashMap::default();809810		let mut super_depth = SuperDepth::default();811		let mut omit_index = Saturating(0);812		for core in self.0.cores.iter().rev() {813			core.0814				.enum_fields_core(&mut super_depth, &mut |_depth, _index, name, visibility| {815					let entry = out.entry(name);816					let data = entry.or_insert(FieldVisibilityData {817						exists_visible: None,818						#[cfg(feature = "exp-preserve-order")]819						key: FieldSortKey::new(_depth, _index),820						omitted_until: omit_index,821					});822					match visibility {823						EnumFields::Omit(new_skip) => {824							// +1 including this core825							data.omitted_until = data826								.omitted_until827								.max(omit_index + new_skip + Saturating(1));828						}829						EnumFields::Normal(Visibility::Normal) => {830							if data.omitted_until <= omit_index && data.exists_visible.is_none() {831								data.exists_visible = Some(Visibility::Normal);832							}833						}834						EnumFields::Normal(Visibility::Hidden) => {835							if data.omitted_until <= omit_index {836								data.exists_visible = Some(match data.exists_visible {837									// We're iterating in reverse, later unhide is preserved838									Some(Visibility::Unhide) => Visibility::Unhide,839									_ => Visibility::Hidden,840								});841							}842						}843						EnumFields::Normal(Visibility::Unhide) => {844							if data.omitted_until <= omit_index {845								data.exists_visible = Some(match data.exists_visible {846									// We're iterating in reverse, later hide is preserved847									Some(Visibility::Hidden) => Visibility::Hidden,848									_ => Visibility::Unhide,849								});850							}851						}852					}853					ControlFlow::Continue(())854				});855856			super_depth.deepen();857			omit_index += 1;858		}859860		out.retain(|_, v| v.exists_visible.is_some());861862		out863	}864	pub fn fields_ex(865		&self,866		include_hidden: bool,867		#[cfg(feature = "exp-preserve-order")] preserve_order: bool,868	) -> Vec<IStr> {869		#[cfg(feature = "exp-preserve-order")]870		if preserve_order {871			let (mut fields, mut keys): (Vec<_>, Vec<_>) = self872				.fields_visibility()873				.into_iter()874				.filter(|(_, d)| include_hidden || d.visible())875				.enumerate()876				.map(|(idx, (k, d))| (k, (d.sort_key(), idx)))877				.unzip();878			keys.sort_unstable_by_key(|v| v.0);879			// Reorder in-place by resulting indexes880			for i in 0..fields.len() {881				let x = fields[i].clone();882				let mut j = i;883				loop {884					let k = keys[j].1;885					keys[j].1 = j;886					if k == i {887						break;888					}889					fields[j] = fields[k].clone();890					j = k;891				}892				fields[j] = x;893			}894			return fields;895		}896897		let mut fields: Vec<_> = self898			.fields_visibility()899			.into_iter()900			.filter(|(_, d)| include_hidden || d.visible())901			.map(|(k, _)| k)902			.collect();903		fields.sort_unstable();904		fields905	}906	pub fn fields(&self, #[cfg(feature = "exp-preserve-order")] preserve_order: bool) -> Vec<IStr> {907		self.fields_ex(908			false,909			#[cfg(feature = "exp-preserve-order")]910			preserve_order,911		)912	}913	pub fn values_ex(914		&self,915		include_hidden: bool,916		#[cfg(feature = "exp-preserve-order")] preserve_order: bool,917	) -> ArrValue {918		ArrValue::new(PickObjectValues::new(919			self.clone(),920			self.fields_ex(921				include_hidden,922				#[cfg(feature = "exp-preserve-order")]923				preserve_order,924			),925		))926	}927	pub fn values(&self, #[cfg(feature = "exp-preserve-order")] preserve_order: bool) -> ArrValue {928		self.values_ex(929			false,930			#[cfg(feature = "exp-preserve-order")]931			preserve_order,932		)933	}934	pub fn key_values_ex(935		&self,936		include_hidden: bool,937		#[cfg(feature = "exp-preserve-order")] preserve_order: bool,938	) -> ArrValue {939		ArrValue::new(PickObjectKeyValues::new(940			self.clone(),941			self.fields_ex(942				include_hidden,943				#[cfg(feature = "exp-preserve-order")]944				preserve_order,945			),946		))947	}948	pub fn key_values(949		&self,950		#[cfg(feature = "exp-preserve-order")] preserve_order: bool,951	) -> ArrValue {952		self.key_values_ex(953			false,954			#[cfg(feature = "exp-preserve-order")]955			preserve_order,956		)957	}958}959960#[allow(clippy::module_name_repetitions)]961#[must_use = "value not added unless binding() was called"]962pub struct ObjMemberBuilder<Kind> {963	kind: Kind,964	name: IStr,965	add: bool,966	visibility: Visibility,967	original_index: FieldIndex,968	location: Option<Span>,969}970971#[allow(clippy::missing_const_for_fn)]972impl<Kind> ObjMemberBuilder<Kind> {973	pub(crate) fn new(kind: Kind, name: IStr, original_index: FieldIndex) -> Self {974		Self {975			kind,976			name,977			original_index,978			add: false,979			visibility: Visibility::Normal,980			location: None,981		}982	}983984	pub const fn with_add(mut self, add: bool) -> Self {985		self.add = add;986		self987	}988	pub fn add(self) -> Self {989		self.with_add(true)990	}991	pub fn with_visibility(mut self, visibility: Visibility) -> Self {992		self.visibility = visibility;993		self994	}995	pub fn hide(self) -> Self {996		self.with_visibility(Visibility::Hidden)997	}998	pub fn with_location(mut self, location: Span) -> Self {999		self.location = Some(location);1000		self1001	}1002	fn build_member(self, binding: MaybeUnbound) -> (Kind, IStr, ObjMember) {1003		(1004			self.kind,1005			self.name,1006			ObjMember {1007				flags: ObjFieldFlags::new(self.add, self.visibility),1008				original_index: self.original_index,1009				invoke: binding,1010				location: self.location,1011			},1012		)1013	}1014}10151016pub struct ExtendBuilder<'v>(&'v mut ObjValue);1017impl ObjMemberBuilder<ExtendBuilder<'_>> {1018	pub fn value(self, value: impl Into<Val>) {1019		self.binding(MaybeUnbound::Bound(Thunk::evaluated(value.into())));1020	}1021	pub fn bindable(self, bindable: impl Unbound<Bound = Val>) {1022		self.binding(MaybeUnbound::Unbound(CcUnbound::new(bindable)));1023	}1024	pub fn binding(self, binding: MaybeUnbound) {1025		let (receiver, name, member) = self.build_member(binding);1026		let new = receiver.0.clone();1027		*receiver.0 = new.extend_with_raw_member(name, member);1028	}1029}
modifiedcrates/jrsonnet-evaluator/src/obj/oop.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/obj/oop.rs
+++ b/crates/jrsonnet-evaluator/src/obj/oop.rs
@@ -1,4 +1,4 @@
-use std::cell::Cell;
+use std::cell::{Cell, RefCell};
 use std::ops::ControlFlow;
 use std::{fmt, mem};
 
@@ -105,7 +105,7 @@
 
 	fn run_assertions_core(&self, sup_this: SupThis) -> Result<()> {
 		if let Some(assertion) = &self.assertion {
-			assertion.0.run(sup_this.clone())?;
+			assertion.0.run(sup_this)?;
 		}
 		Ok(())
 	}
@@ -196,7 +196,7 @@
 		ObjValue(Cc::new(ObjValueInner {
 			cores: self.sup,
 			assertions_ran: Cell::new(false),
-			value_cache: Default::default(),
+			value_cache: RefCell::default(),
 		}))
 	}
 }
modifiedcrates/jrsonnet-evaluator/src/stack.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/stack.rs
+++ b/crates/jrsonnet-evaluator/src/stack.rs
@@ -17,6 +17,7 @@
 	}
 }
 #[cfg(not(nightly))]
+#[allow(dead_code)]
 type NightlyLocalKey<T> = std::thread::LocalKey<T>;
 
 #[cfg(nightly)]
@@ -60,7 +61,7 @@
 pub struct StackDepthGuard(PhantomData<()>);
 impl Drop for StackDepthGuard {
 	fn drop(&mut self) {
-		STACK_LIMIT.with(|limit| limit.current_depth.set(limit.current_depth.get() - 1))
+		STACK_LIMIT.with(|limit| limit.current_depth.set(limit.current_depth.get() - 1));
 	}
 }
 
modifiedcrates/jrsonnet-evaluator/src/stdlib/format.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/stdlib/format.rs
+++ b/crates/jrsonnet-evaluator/src/stdlib/format.rs
@@ -297,6 +297,7 @@
 const NUMBERS: &[u8] = b"0123456789abcdefghijklmnopqrstuvwxyz";
 
 #[inline]
+#[allow(clippy::fn_params_excessive_bools)]
 pub fn render_integer(
 	out: &mut String,
 	neg: bool,
@@ -330,7 +331,7 @@
 
 	let pref_len = zero_prefix.len() as u16;
 	let zp2 = zp
-		.saturating_sub(if !prefix_in_padding { pref_len } else { 0 })
+		.saturating_sub(if prefix_in_padding { 0 } else { pref_len })
 		.max(precision)
 		.saturating_sub(if prefix_in_padding { pref_len } else { 0 } + digits.len() as u16);
 
@@ -369,6 +370,7 @@
 		out, neg, iv, padding, precision, blank, sign, 10, "", false, false,
 	);
 }
+#[allow(clippy::fn_params_excessive_bools)]
 pub fn render_octal(
 	out: &mut String,
 	neg: bool,
@@ -439,8 +441,8 @@
 	// Note that it can also be equal to 10**prec and we'll need to carry
 	// over to the wholes.  We operate on the absolute numbers, so that we
 	// don't have trouble with the rounding direction.
-	let denominator = 10.0f64.powi(precision as i32);
-	let numerator = n.abs() * denominator + 0.5;
+	let denominator = 10.0f64.powi(i32::from(precision));
+	let numerator = n.abs().mul_add(denominator, 0.5);
 	let whole = (numerator / denominator).floor();
 	let frac = numerator.floor() % denominator;
 
@@ -611,7 +613,7 @@
 			} else {
 				value.abs().log10().floor()
 			};
-			if exponent < -4.0 || exponent >= fpprec as f64 {
+			if exponent < -4.0 || exponent >= f64::from(fpprec) {
 				render_float_sci(
 					&mut tmp_out,
 					value,
@@ -661,7 +663,7 @@
 			}
 		},
 		ConvTypeV::Percent => tmp_out.push('%'),
-	};
+	}
 
 	let padding = width.saturating_sub(tmp_out.len() as u16);
 
modifiedcrates/jrsonnet-evaluator/src/tla.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/tla.rs
+++ b/crates/jrsonnet-evaluator/src/tla.rs
@@ -1,13 +1,14 @@
+use std::{collections::HashMap, hash::BuildHasher};
+
 use jrsonnet_interner::IStr;
 use jrsonnet_parser::Source;
-use rustc_hash::FxHashMap;
 
 use crate::{
 	function::{CallLocation, TlaArg},
 	in_description_frame, with_state, Result, Val,
 };
 
-pub fn apply_tla(args: &FxHashMap<IStr, TlaArg>, val: Val) -> Result<Val> {
+pub fn apply_tla<H: BuildHasher>(args: &HashMap<IStr, TlaArg, H>, val: Val) -> Result<Val> {
 	Ok(if let Val::Func(func) = val {
 		in_description_frame(
 			|| "during TLA call".to_owned(),
modifiedcrates/jrsonnet-evaluator/src/typed/conversions.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/typed/conversions.rs
+++ b/crates/jrsonnet-evaluator/src/typed/conversions.rs
@@ -462,7 +462,7 @@
 		};
 		if let Some(bytes) = a.as_any().downcast_ref::<BytesArray>() {
 			return Ok(bytes.0.as_slice().into());
-		};
+		}
 		<Self as Typed>::TYPE.check(&value)?;
 		// Any::downcast_ref::<ByteArray>(&a);
 		let mut out = Vec::with_capacity(a.len());
modifiedcrates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -65,7 +65,7 @@
 			MemoizedClusureThunkInner::Errored(e) => return Err(e.clone()),
 			MemoizedClusureThunkInner::Pending => return Err(InfiniteRecursionDetected.into()),
 			MemoizedClusureThunkInner::Waiting { .. } => (),
-		};
+		}
 		let MemoizedClusureThunkInner::Waiting { env, closure } = replace(
 			&mut *self.0.borrow_mut(),
 			MemoizedClusureThunkInner::Pending,
@@ -288,14 +288,11 @@
 			Self::Str(s) => {
 				let mut computed_len = None;
 				let mut get_len = || {
-					computed_len.map_or_else(
-						|| {
-							let len = s.chars().count();
-							let _ = computed_len.insert(len);
-							len
-						},
-						|len| len,
-					)
+					computed_len.unwrap_or_else(|| {
+						let len = s.chars().count();
+						let _ = computed_len.insert(len);
+						len
+					})
 				};
 				let mut get_idx = |pos: Option<i32>, default| {
 					match pos {
@@ -446,7 +443,7 @@
 	pub const fn get(&self) -> f64 {
 		self.0
 	}
-	pub(crate) fn truncate_for_bitwise(&self) -> Result<i64> {
+	pub(crate) fn truncate_for_bitwise(self) -> Result<i64> {
 		if self.0 < MIN_SAFE_INTEGER || self.0 > MAX_SAFE_INTEGER {
 			bail!("numberic value outside of safe integer range for bitwise operation");
 		}
modifiedcrates/jrsonnet-interner/src/lib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-interner/src/lib.rs
+++ b/crates/jrsonnet-interner/src/lib.rs
@@ -227,9 +227,11 @@
 type PoolMap = HashMap<Inner, (), FxBuildHasher>;
 
 thread_local! {
-	static POOL: RefCell<PoolMap> = RefCell::new(HashMap::with_capacity_and_hasher(200, FxBuildHasher::default()));
+	static POOL: RefCell<PoolMap> = RefCell::new(HashMap::with_capacity_and_hasher(200, FxBuildHasher));
 }
 
+/// Utils for embedding jrsonnet in non-rust.
+///
 /// Jrsonnet golang bindings require that it is possible to move jsonnet
 /// VM between OS threads, and this is not possible due to usage of
 /// `thread_local`. Instead, there is two methods added, one should be
modifiedcrates/jrsonnet-macros/src/lib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-macros/src/lib.rs
+++ b/crates/jrsonnet-macros/src/lib.rs
@@ -127,6 +127,7 @@
 	Default(Expr),
 }
 
+#[allow(clippy::large_enum_variant, reason = "this macro is not that hot for it to matter")]
 enum ArgInfo {
 	Normal {
 		ty: Box<Type>,
modifiedcrates/jrsonnet-parser/src/expr.rsdiffbeforeafterboth
--- a/crates/jrsonnet-parser/src/expr.rs
+++ b/crates/jrsonnet-parser/src/expr.rs
@@ -166,6 +166,10 @@
 	pub fn len(&self) -> usize {
 		self.exprs.len()
 	}
+	pub fn is_empty(&self) -> bool {
+		self.exprs.is_empty()
+	}
+
 	pub fn binds_len(&self) -> usize {
 		self.binds_len
 	}
modifiedcrates/jrsonnet-stdlib/src/arrays.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/arrays.rs
+++ b/crates/jrsonnet-stdlib/src/arrays.rs
@@ -98,9 +98,9 @@
 			for c in str.chars() {
 				match func(Either2::A(c.to_string()))? {
 					Val::Str(o) => write!(out, "{o}").unwrap(),
-					Val::Null => continue,
+					Val::Null => {},
 					_ => bail!("in std.join all items should be strings"),
-				};
+				}
 			}
 			Ok(IndexableVal::Str(out.into()))
 		}
@@ -114,9 +114,9 @@
 							out.push(oe?);
 						}
 					}
-					Val::Null => continue,
+					Val::Null => {},
 					_ => bail!("in std.join all items should be arrays"),
-				};
+				}
 			}
 			Ok(IndexableVal::Arr(out.into()))
 		}
@@ -205,7 +205,6 @@
 						out.push(item?);
 					}
 				} else if matches!(item, Val::Null) {
-					continue;
 				} else {
 					bail!("in std.join all items should be arrays");
 				}
@@ -226,7 +225,6 @@
 					first = false;
 					write!(out, "{item}").unwrap();
 				} else if matches!(item, Val::Null) {
-					continue;
 				} else {
 					bail!("in std.join all items should be strings");
 				}
modifiedcrates/jrsonnet-stdlib/src/manifest/xml.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/manifest/xml.rs
+++ b/crates/jrsonnet-stdlib/src/manifest/xml.rs
@@ -46,7 +46,7 @@
 		};
 		if arr.is_empty() {
 			bail!("JSONML value should have tag (array length should be >=1)");
-		};
+		}
 		let tag = String::from_untyped(
 			arr.get(0)
 				.description("getting JSONML tag")?
modifiedcrates/jrsonnet-stdlib/src/manifest/yaml.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/manifest/yaml.rs
+++ b/crates/jrsonnet-stdlib/src/manifest/yaml.rs
@@ -90,6 +90,7 @@
 		RESERVED.iter().any(|k| key.eq_ignore_ascii_case(k))
 	}
 
+	#[allow(clippy::if_same_then_else)]
 	// Check for unsafe characters
 	if !key
 		.chars()
@@ -98,7 +99,7 @@
 		return false;
 	}
 	// Check for reserved words
-	if is_reserved(key) {
+	else if is_reserved(key) {
 		return false;
 	}
 	// Check for timestamp values.  Since spaces and colons are already forbidden,
@@ -107,7 +108,7 @@
 	// - all characters match [0-9\-]
 	// - has exactly 2 dashes
 	// are considered dates.
-	if key.chars().all(|v| matches!(v, '0'..='9' | '-')) && count_char(key, '-') == 2 {
+	else if key.chars().all(|v| matches!(v, '0'..='9' | '-')) && count_char(key, '-') == 2 {
 		return false;
 	}
 	// Check for integers.  Keys that meet all of the following:
modifiedcrates/jrsonnet-stdlib/src/misc.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/misc.rs
+++ b/crates/jrsonnet-stdlib/src/misc.rs
@@ -172,7 +172,7 @@
 	let Some(patch) = patch.as_obj() else {
 		return Ok(patch);
 	};
-	let target = target.as_obj().unwrap_or_else(|| ObjValue::empty());
+	let target = target.as_obj().unwrap_or_else(ObjValue::empty);
 	let target_fields = target
 		.fields(
 			// FIXME: Makes no sense to preserve order for BTreeSet, it would be better to use IndexSet here?
modifiedcrates/jrsonnet-stdlib/src/sets.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/sets.rs
+++ b/crates/jrsonnet-stdlib/src/sets.rs
@@ -21,7 +21,7 @@
 	let x = keyF(x)?;
 
 	while low < high {
-		let middle = (high + low) / 2;
+		let middle = usize::midpoint(high, low);
 		let comp = keyF(arr.get_lazy(middle).expect("in bounds"))?;
 		match evaluate_compare_op(&comp, &x, BinaryOpType::Lt)? {
 			Ordering::Less => low = middle + 1,
@@ -66,7 +66,7 @@
 				bv = b.next();
 				bk = bv.map(keyF).transpose()?;
 			}
-		};
+		}
 	}
 	Ok(ArrValue::lazy(out))
 }
@@ -106,7 +106,7 @@
 				bv = b.next();
 				bk = bv.map(keyF).transpose()?;
 			}
-		};
+		}
 	}
 	while let Some(_ac) = &ak {
 		// In a, but not in b
@@ -154,7 +154,7 @@
 				bv = b.next();
 				bk = bv.clone().map(keyF).transpose()?;
 			}
-		};
+		}
 	}
 	// a.len() > b.len()
 	while let Some(_ac) = &ak {
modifiedcrates/jrsonnet-stdlib/src/sort.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/sort.rs
+++ b/crates/jrsonnet-stdlib/src/sort.rs
@@ -66,7 +66,7 @@
 				return Err(err);
 			}
 		}
-	};
+	}
 	Ok(values)
 }
 
@@ -107,7 +107,7 @@
 				return Err(err);
 			}
 		}
-	};
+	}
 	Ok(vk.into_iter().map(|v| v.0).collect())
 }
 
@@ -204,7 +204,7 @@
 	}
 }
 
-fn eval_keyf(val: Val, key_f: &Option<FuncVal>) -> Result<Val> {
+fn eval_keyf(val: Val, key_f: Option<&FuncVal>) -> Result<Val> {
 	if let Some(key_f) = key_f {
 		key_f.evaluate_simple(&(val,), false)
 	} else {
@@ -212,13 +212,13 @@
 	}
 }
 
-fn array_top1(arr: ArrValue, key_f: Option<FuncVal>, ordering: Ordering) -> Result<Val> {
+fn array_top1(arr: ArrValue, key_f: Option<&FuncVal>, ordering: Ordering) -> Result<Val> {
 	let mut iter = arr.iter();
 	let mut min = iter.next().expect("not empty")?;
-	let mut min_key = eval_keyf(min.clone(), &key_f)?;
+	let mut min_key = eval_keyf(min.clone(), key_f)?;
 	for item in iter {
 		let cur = item?;
-		let cur_key = eval_keyf(cur.clone(), &key_f)?;
+		let cur_key = eval_keyf(cur.clone(), key_f)?;
 		if evaluate_compare_op(&cur_key, &min_key, BinaryOpType::Lt)? == ordering {
 			min = cur;
 			min_key = cur_key;
@@ -236,7 +236,7 @@
 	if arr.is_empty() {
 		return eval_on_empty(onEmpty);
 	}
-	array_top1(arr, keyF, Ordering::Less)
+	array_top1(arr, keyF.as_ref(), Ordering::Less)
 }
 #[builtin]
 pub fn builtin_max_array(
@@ -247,5 +247,5 @@
 	if arr.is_empty() {
 		return eval_on_empty(onEmpty);
 	}
-	array_top1(arr, keyF, Ordering::Greater)
+	array_top1(arr, keyF.as_ref(), Ordering::Greater)
 }
modifiedcrates/jrsonnet-stdlib/src/strings.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/strings.rs
+++ b/crates/jrsonnet-stdlib/src/strings.rs
@@ -53,7 +53,7 @@
 
 #[builtin]
 pub fn builtin_equals_ignore_case(str1: String, str2: String) -> bool {
-	str1.to_ascii_lowercase() == str2.to_ascii_lowercase()
+	str1.eq_ignore_ascii_case(&str2)
 }
 
 #[builtin]
modifiedcrates/jrsonnet-types/src/lib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-types/src/lib.rs
+++ b/crates/jrsonnet-types/src/lib.rs
@@ -133,7 +133,7 @@
 			Self::Sum(v) => write_union(f, false, v.iter())?,
 			Self::SumRef(v) => write_union(f, false, v.iter().copied())?,
 			Self::Lazy(lazy) => write!(f, "Lazy<{lazy}>")?,
-		};
+		}
 		Ok(())
 	}
 }
modifiedtests/tests/common.rsdiffbeforeafterboth
--- a/tests/tests/common.rs
+++ b/tests/tests/common.rs
@@ -57,12 +57,13 @@
 #[builtin]
 fn param_names(fun: FuncVal) -> Vec<String> {
 	fun.params()
-		.into_iter()
+		.iter()
 		.map(|v| v.name().as_str().unwrap_or("<unnamed>").to_owned())
 		.collect()
 }
 
 #[derive(Trace)]
+#[allow(dead_code)]
 pub struct ContextInitializer;
 impl ContextInitializerT for ContextInitializer {
 	fn populate(&self, _for_file: Source, builder: &mut ContextBuilder) {
modifiedtests/tests/cpp_test_suite.rsdiffbeforeafterboth
--- a/tests/tests/cpp_test_suite.rs
+++ b/tests/tests/cpp_test_suite.rs
@@ -23,29 +23,29 @@
 	// C++ test suite
 	std_context.add_ext_str("var1".into(), "test".into());
 	std_context
-		.add_ext_code("var2".into(), "{x:1,y:2}")
+		.add_ext_code("var2", "{x:1,y:2}")
 		.expect("code is valid");
 
 	// Golang test suite
 	std_context
-		.add_ext_code("codeVar".into(), "3+3")
+		.add_ext_code("codeVar", "3+3")
 		.expect("code is valid");
 	std_context.add_ext_str("stringVar".into(), "2 + 2".into());
 	std_context
 		.add_ext_code(
-			"selfRecursiveVar".into(),
+			"selfRecursiveVar",
 			r#"[42, std.extVar("selfRecursiveVar")[0] + 1]"#,
 		)
 		.expect("code is valid");
 	std_context
 		.add_ext_code(
-			"mutuallyRecursiveVar1".into(),
+			"mutuallyRecursiveVar1",
 			r#"[42, std.extVar("mutuallyRecursiveVar2")[0] + 1]"#,
 		)
 		.expect("code is valid");
 	std_context
 		.add_ext_code(
-			"mutuallyRecursiveVar2".into(),
+			"mutuallyRecursiveVar2",
 			r#"[42, std.extVar("mutuallyRecursiveVar1")[0] + 1]"#,
 		)
 		.expect("code is valid");
@@ -203,9 +203,9 @@
 		let root = root_tests.join(root_dir);
 		let root_override = root_tests.join(format!("{root_dir}_golden_override"));
 
-		for entry in fs::read_dir(&root).map_err(|e| io::Error::new(ErrorKind::Other, format!("failed to enumerate cpp_test_suite dir (Note: it needs to be cloned from C++ jsonnet repo for this test): {e}")))? {
+		for entry in fs::read_dir(&root).map_err(|e| io::Error::other(format!("failed to enumerate cpp_test_suite dir (Note: it needs to be cloned from C++ jsonnet repo for this test): {e}")))? {
 		let entry = entry?;
-		if !entry.path().extension().map_or(false, |e| e == "jsonnet") {
+		if entry.path().extension().is_none_or(|e| e != "jsonnet") {
 			continue;
 		}
 
@@ -213,7 +213,7 @@
 			.path()
 			.file_name()
 			.and_then(|v| v.to_str())
-			.map_or(false, |v| SKIPPED.contains(&v))
+			.is_some_and(|v| SKIPPED.contains(&v))
 		{
 			continue;
 		}
@@ -227,7 +227,7 @@
 		golden_path2.set_extension("golden");
 
 		let golden_override =
-			root_override.join(&golden_path.file_name().expect("file has basename"));
+			root_override.join(golden_path.file_name().expect("file has basename"));
 
 		// .jsonnet.golden for C++ tests
 		let mut golden = read_file(&golden_path)?;
@@ -282,7 +282,7 @@
 					}
 				}
 			}
-		};
+		}
 	}
 	}
 
modifiedtests/tests/golden.rsdiffbeforeafterboth
--- a/tests/tests/golden.rs
+++ b/tests/tests/golden.rs
@@ -40,8 +40,8 @@
 #[test]
 fn golden() {
 	glob!("../", "golden/*.jsonnet", |path| {
-		let result = run(&path);
+		let result = run(path);
 
-		assert_snapshot!(result)
+		assert_snapshot!(result);
 	});
 }
modifiedtests/tests/suite.rsdiffbeforeafterboth
--- a/tests/tests/suite.rs
+++ b/tests/tests/suite.rs
@@ -32,7 +32,7 @@
 			file.display(),
 			trace_format.format(&e).unwrap()
 		),
-	};
+	}
 }
 
 #[test]
@@ -42,11 +42,9 @@
 
 	for entry in fs::read_dir(&root)? {
 		let entry = entry?;
-		if !entry.path().extension().map_or(false, |e| e == "jsonnet") {
-			continue;
+		if entry.path().extension().is_some_and(|e| e == "jsonnet") {
+			run(&entry.path());
 		}
-
-		run(&entry.path());
 	}
 
 	Ok(())