git.delta.rocks / jrsonnet / refs/commits / 3f8fb69418f4

difftreelog

style increase clippy linting level

Lach2020-08-25parent: #d13245a.patch.diff
in: master

15 files changed

modifiedcrates/jrsonnet-evaluator/src/builtin/format.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/builtin/format.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/format.rs
@@ -314,7 +314,7 @@
 	for _ in 0..zp2 {
 		out.push('0');
 	}
-	out.push_str(&prefix);
+	out.push_str(prefix);
 
 	for digit in digits.into_iter().rev() {
 		let ch = NUMBERS[digit as usize] as char;
@@ -399,7 +399,10 @@
 		}
 		return;
 	}
-	let frac = (n.fract() * 10.0_f64.powf(precision as f64) + 0.5).floor();
+	let frac = n
+		.fract()
+		.mul_add(10.0_f64.powf(precision as f64), 0.5)
+		.floor();
 	if trailing || frac > 0.0 {
 		out.push('.');
 		let mut frac_str = String::new();
@@ -605,7 +608,7 @@
 }
 
 pub fn format_arr(str: &str, mut values: &[Val]) -> Result<String> {
-	let codes = parse_codes(&str)?;
+	let codes = parse_codes(str)?;
 	let mut out = String::new();
 
 	for code in codes {
@@ -659,7 +662,7 @@
 }
 
 pub fn format_obj(str: &str, values: &ObjValue) -> Result<String> {
-	let codes = parse_codes(&str)?;
+	let codes = parse_codes(str)?;
 	let mut out = String::new();
 
 	for code in codes {
modifiedcrates/jrsonnet-evaluator/src/builtin/manifest.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/builtin/manifest.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/manifest.rs
@@ -20,7 +20,7 @@
 	pub mtype: ManifestType,
 }
 
-pub(crate) fn manifest_json_ex(val: &Val, options: &ManifestJsonOptions<'_>) -> Result<String> {
+pub fn manifest_json_ex(val: &Val, options: &ManifestJsonOptions<'_>) -> Result<String> {
 	let mut out = String::new();
 	manifest_json_ex_buf(val, &mut out, &mut String::new(), options)?;
 	Ok(out)
modifiedcrates/jrsonnet-evaluator/src/builtin/mod.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/builtin/mod.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/mod.rs
@@ -16,6 +16,7 @@
 pub mod manifest;
 pub mod sort;
 
+#[allow(clippy::cognitive_complexity)]
 pub fn call_builtin(
 	context: Context,
 	loc: &Option<ExprLocation>,
@@ -23,7 +24,7 @@
 	name: &str,
 	args: &ArgsDesc,
 ) -> Result<Val> {
-	Ok(match (ns, &name as &str) {
+	Ok(match (ns, name as &str) {
 		// arr/string/function
 		("std", "length") => parse_args!(context, "std.length", args, 1, [
 			0, x: [Val::Str|Val::Arr|Val::Obj], vec![ValType::Str, ValType::Arr, ValType::Obj];
modifiedcrates/jrsonnet-evaluator/src/builtin/stdlib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/builtin/stdlib.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/stdlib.rs
@@ -22,7 +22,7 @@
 		}
 
 		jrsonnet_parser::parse(
-			&jrsonnet_stdlib::STDLIB_STR,
+			jrsonnet_stdlib::STDLIB_STR,
 			&ParserSettings {
 				loc_data: true,
 				file_name: Rc::new(PathBuf::from("std.jsonnet")),
modifiedcrates/jrsonnet-evaluator/src/ctx.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/ctx.rs
+++ b/crates/jrsonnet-evaluator/src/ctx.rs
@@ -48,8 +48,8 @@
 		&self.0.super_obj
 	}
 
-	pub fn new() -> Context {
-		Context(Rc::new(ContextInternals {
+	pub fn new() -> Self {
+		Self(Rc::new(ContextInternals {
 			dollar: None,
 			this: None,
 			super_obj: None,
@@ -65,14 +65,14 @@
 			.cloned()
 			.ok_or_else(|| UnknownVariable(name))?)
 	}
-	pub fn into_future(self, ctx: FutureContext) -> Context {
+	pub fn into_future(self, ctx: FutureContext) -> Self {
 		{
 			ctx.0.borrow_mut().replace(self);
 		}
 		ctx.unwrap()
 	}
 
-	pub fn with_var(self, name: Rc<str>, value: Val) -> Context {
+	pub fn with_var(self, name: Rc<str>, value: Val) -> Self {
 		let mut new_bindings =
 			FxHashMap::with_capacity_and_hasher(1, BuildHasherDefault::default());
 		new_bindings.insert(name, resolved_lazy_val!(value));
@@ -85,7 +85,7 @@
 		new_dollar: Option<ObjValue>,
 		new_this: Option<ObjValue>,
 		new_super_obj: Option<ObjValue>,
-	) -> Context {
+	) -> Self {
 		match Rc::try_unwrap(self.0) {
 			Ok(mut ctx) => {
 				// Extended context aren't used by anything else, we can freely mutate it without cloning
@@ -101,7 +101,7 @@
 				if !new_bindings.is_empty() {
 					ctx.bindings = ctx.bindings.extend(new_bindings);
 				}
-				Context(Rc::new(ctx))
+				Self(Rc::new(ctx))
 			}
 			Err(ctx) => {
 				let dollar = new_dollar.or_else(|| ctx.dollar.clone());
@@ -112,7 +112,7 @@
 				} else {
 					ctx.bindings.clone().extend(new_bindings)
 				};
-				Context(Rc::new(ContextInternals {
+				Self(Rc::new(ContextInternals {
 					dollar,
 					this,
 					super_obj,
@@ -127,7 +127,7 @@
 		new_dollar: Option<ObjValue>,
 		new_this: Option<ObjValue>,
 		new_super_obj: Option<ObjValue>,
-	) -> Result<Context> {
+	) -> Result<Self> {
 		let this = new_this.or_else(|| self.0.this.clone());
 		let super_obj = new_super_obj.or_else(|| self.0.super_obj.clone());
 		let mut new =
modifiedcrates/jrsonnet-evaluator/src/error.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/error.rs
+++ b/crates/jrsonnet-evaluator/src/error.rs
@@ -95,10 +95,10 @@
 		Self(Box::new((e, StackTrace(vec![]))))
 	}
 
-	pub fn error(&self) -> &Error {
+	pub const fn error(&self) -> &Error {
 		&(self.0).0
 	}
-	pub fn trace(&self) -> &StackTrace {
+	pub const fn trace(&self) -> &StackTrace {
 		&(self.0).1
 	}
 	pub fn trace_mut(&mut self) -> &mut StackTrace {
modifiedcrates/jrsonnet-evaluator/src/evaluate.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/evaluate.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate.rs
@@ -82,9 +82,9 @@
 	})
 }
 
-pub(crate) fn evaluate_add_op(a: &Val, b: &Val) -> Result<Val> {
+pub fn evaluate_add_op(a: &Val, b: &Val) -> Result<Val> {
 	Ok(match (a, b) {
-		(Val::Str(v1), Val::Str(v2)) => Val::Str(((**v1).to_owned() + &v2).into()),
+		(Val::Str(v1), Val::Str(v2)) => Val::Str(((**v1).to_owned() + v2).into()),
 
 		// Can't use generic json serialization way, because it depends on number to string concatenation (std.jsonnet:890)
 		(Val::Num(n), Val::Str(o)) => Val::Str(format!("{}{}", n, o).into()),
@@ -111,7 +111,7 @@
 	b: &LocExpr,
 ) -> Result<Val> {
 	Ok(
-		match (evaluate(context.clone(), &a)?.unwrap_if_lazy()?, op, b) {
+		match (evaluate(context.clone(), a)?.unwrap_if_lazy()?, op, b) {
 			(Val::Bool(true), BinaryOpType::Or, _o) => Val::Bool(true),
 			(Val::Bool(false), BinaryOpType::And, _o) => Val::Bool(false),
 			(a, op, eb) => {
@@ -194,14 +194,14 @@
 	Ok(match specs.get(0) {
 		None => Some(vec![value(context)?]),
 		Some(CompSpec::IfSpec(IfSpecData(cond))) => {
-			if evaluate(context.clone(), &cond)?.try_cast_bool("if spec")? {
+			if evaluate(context.clone(), cond)?.try_cast_bool("if spec")? {
 				evaluate_comp(context, value, &specs[1..])?
 			} else {
 				None
 			}
 		}
 		Some(CompSpec::ForSpec(ForSpecData(var, expr))) => {
-			match evaluate(context.clone(), &expr)?.unwrap_if_lazy()? {
+			match evaluate(context.clone(), expr)?.unwrap_if_lazy()? {
 				Val::Arr(list) => {
 					let mut out = Vec::new();
 					for item in list.iter() {
@@ -258,7 +258,7 @@
 				visibility,
 				value,
 			}) => {
-				let name = evaluate_field_name(context.clone(), &name)?;
+				let name = evaluate_field_name(context.clone(), name)?;
 				if name.is_none() {
 					continue;
 				}
@@ -286,7 +286,7 @@
 				value,
 				..
 			}) => {
-				let name = evaluate_field_name(context.clone(), &name)?;
+				let name = evaluate_field_name(context.clone(), name)?;
 				if name.is_none() {
 					continue;
 				}
@@ -320,7 +320,7 @@
 
 pub fn evaluate_object(context: Context, object: &ObjBody) -> Result<ObjValue> {
 	Ok(match object {
-		ObjBody::MemberList(members) => evaluate_member_list_object(context, &members)?,
+		ObjBody::MemberList(members) => evaluate_member_list_object(context, members)?,
 		ObjBody::ObjComp(obj) => {
 			let future_this = FutureObjValue::new();
 			let mut new_members = HashMap::new();
@@ -437,7 +437,7 @@
 		Parened(e) => evaluate(context, e)?,
 		Str(v) => Val::Str(v.clone()),
 		Num(v) => Val::new_checked_num(*v)?,
-		BinaryOp(v1, o, v2) => evaluate_binary_op_special(context, &v1, *o, &v2)?,
+		BinaryOp(v1, o, v2) => evaluate_binary_op_special(context, v1, *o, v2)?,
 		UnaryOp(o, v) => evaluate_unary_op(*o, &evaluate(context, v)?)?,
 		Var(name) => push(
 			loc,
@@ -461,7 +461,7 @@
 				(Val::Obj(v), Val::Str(s)) => {
 					let sn = s.clone();
 					push(
-						&loc,
+						loc,
 						|| format!("field <{}> access", sn),
 						|| {
 							if let Some(v) = v.get(s.clone())? {
@@ -563,7 +563,7 @@
 				&value.1,
 				|| "assertion condition".to_owned(),
 				|| {
-					evaluate(context.clone(), &value)?
+					evaluate(context.clone(), value)?
 						.try_cast_bool("assertion condition should be of type `boolean`")
 				},
 			)?;
@@ -576,7 +576,7 @@
 			}
 		}
 		ErrorStmt(e) => push(
-			&loc,
+			loc,
 			|| "error statement".to_owned(),
 			|| {
 				throw!(RuntimeError(
@@ -610,7 +610,7 @@
 			push(
 				loc,
 				|| format!("import {:?}", path),
-				|| with_state(|s| s.import_file(&import_location, path)),
+				|| with_state(|s| s.import_file(import_location, path)),
 			)?
 		}
 		ImportStr(path) => {
@@ -620,7 +620,7 @@
 				.0;
 			let import_location = Rc::make_mut(&mut tmp);
 			import_location.pop();
-			Val::Str(with_state(|s| s.import_file_str(&import_location, path))?)
+			Val::Str(with_state(|s| s.import_file_str(import_location, path))?)
 		}
 		Literal(LiteralType::Super) => throw!(StandaloneSuper),
 	})
modifiedcrates/jrsonnet-evaluator/src/function.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/function.rs
+++ b/crates/jrsonnet-evaluator/src/function.rs
@@ -75,7 +75,7 @@
 		let idx = params
 			.iter()
 			.position(|p| *p.0 == **name)
-			.ok_or_else(|| UnknownFunctionParameter((&name as &str).to_owned()))?;
+			.ok_or_else(|| UnknownFunctionParameter((name as &str).to_owned()))?;
 
 		if idx >= params.len() {
 			throw!(TooManyArgsFunctionHas(params.len()));
@@ -111,7 +111,7 @@
 	Ok(body_ctx.unwrap_or(ctx).extend(out, None, None, None))
 }
 
-pub(crate) fn place_args(
+pub fn place_args(
 	ctx: Context,
 	body_ctx: Option<Context>,
 	params: &ParamsDesc,
modifiedcrates/jrsonnet-evaluator/src/import.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/import.rs
+++ b/crates/jrsonnet-evaluator/src/import.rs
@@ -41,6 +41,7 @@
 		panic!("`as_any($self)` is not supported by dummy resolver")
 	}
 }
+#[allow(clippy::use_self)]
 impl Default for Box<dyn ImportResolver> {
 	fn default() -> Self {
 		Box::new(DummyImportResolver)
modifiedcrates/jrsonnet-evaluator/src/integrations/serde.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/integrations/serde.rs
+++ b/crates/jrsonnet-evaluator/src/integrations/serde.rs
@@ -14,10 +14,10 @@
 	type Error = LocError;
 	fn try_from(v: &Val) -> Result<Self> {
 		Ok(match v {
-			Val::Bool(b) => Value::Bool(*b),
-			Val::Null => Value::Null,
-			Val::Str(s) => Value::String((&s as &str).into()),
-			Val::Num(n) => Value::Number(if n.fract() <= f64::EPSILON {
+			Val::Bool(b) => Self::Bool(*b),
+			Val::Null => Self::Null,
+			Val::Str(s) => Self::String((s as &str).into()),
+			Val::Num(n) => Self::Number(if n.fract() <= f64::EPSILON {
 				(*n as i64).into()
 			} else {
 				Number::from_f64(*n).expect("to json number")
@@ -28,7 +28,7 @@
 				for item in a.iter() {
 					out.push(item.try_into()?);
 				}
-				Value::Array(out)
+				Self::Array(out)
 			}
 			Val::Obj(o) => {
 				let mut out = Map::new();
@@ -38,7 +38,7 @@
 						(&o.get(key)?.expect("field exists")).try_into()?,
 					);
 				}
-				Value::Object(out)
+				Self::Object(out)
 			}
 			Val::Func(_) => throw!(RuntimeError("tried to manifest function".into())),
 		})
@@ -48,16 +48,16 @@
 impl From<&Value> for Val {
 	fn from(v: &Value) -> Self {
 		match v {
-			Value::Null => Val::Null,
-			Value::Bool(v) => Val::Bool(*v),
-			Value::Number(n) => Val::Num(n.as_f64().expect("as f64")),
-			Value::String(s) => Val::Str((s as &str).into()),
+			Value::Null => Self::Null,
+			Value::Bool(v) => Self::Bool(*v),
+			Value::Number(n) => Self::Num(n.as_f64().expect("as f64")),
+			Value::String(s) => Self::Str((s as &str).into()),
 			Value::Array(a) => {
 				let mut out = Vec::with_capacity(a.len());
 				for v in a {
 					out.push(v.into());
 				}
-				Val::Arr(Rc::new(out))
+				Self::Arr(Rc::new(out))
 			}
 			Value::Object(o) => {
 				let mut entries = HashMap::with_capacity(o.len());
@@ -72,7 +72,7 @@
 						},
 					);
 				}
-				Val::Obj(ObjValue::new(None, Rc::new(entries)))
+				Self::Obj(ObjValue::new(None, Rc::new(entries)))
 			}
 		}
 	}
modifiedcrates/jrsonnet-evaluator/src/lib.rsdiffbeforeafterboth
before · crates/jrsonnet-evaluator/src/lib.rs
1#![cfg_attr(feature = "unstable", feature(stmt_expr_attributes))]2#![allow(macro_expanded_macro_exports_accessed_by_absolute_paths)]34mod builtin;5mod ctx;6mod dynamic;7pub mod error;8mod evaluate;9mod function;10mod import;11mod integrations;12mod map;13pub mod native;14mod obj;15pub mod trace;16mod val;1718pub use ctx::*;19pub use dynamic::*;20use error::{Error::*, LocError, Result, StackTraceElement};21pub use evaluate::*;22pub use function::parse_function_call;23pub use import::*;24use jrsonnet_parser::*;25use native::NativeCallback;26pub use obj::*;27use std::{28	cell::{Ref, RefCell, RefMut},29	collections::HashMap,30	fmt::Debug,31	path::PathBuf,32	rc::Rc,33};34use trace::{offset_to_location, CodeLocation, CompactFormat, TraceFormat};35pub use val::*;3637type BindableFn = dyn Fn(Option<ObjValue>, Option<ObjValue>) -> Result<LazyVal>;38#[derive(Clone)]39pub enum LazyBinding {40	Bindable(Rc<BindableFn>),41	Bound(LazyVal),42}4344impl Debug for LazyBinding {45	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {46		write!(f, "LazyBinding")47	}48}49impl LazyBinding {50	pub fn evaluate(&self, this: Option<ObjValue>, super_obj: Option<ObjValue>) -> Result<LazyVal> {51		match self {52			LazyBinding::Bindable(v) => v(this, super_obj),53			LazyBinding::Bound(v) => Ok(v.clone()),54		}55	}56}5758pub struct EvaluationSettings {59	/// Limits recursion by limiting the number of stack frames60	pub max_stack: usize,61	/// Limits amount of stack trace items preserved62	pub max_trace: usize,63	/// Used for s`td.extVar`64	pub ext_vars: HashMap<Rc<str>, Val>,65	/// Used for ext.native66	pub ext_natives: HashMap<Rc<str>, Rc<NativeCallback>>,67	/// TLA vars68	pub tla_vars: HashMap<Rc<str>, Val>,69	/// Global variables are inserted in default context70	pub globals: HashMap<Rc<str>, Val>,71	/// Used to resolve file locations/contents72	pub import_resolver: Box<dyn ImportResolver>,73	/// Used in manifestification functions74	pub manifest_format: ManifestFormat,75	/// Used for bindings76	pub trace_format: Box<dyn TraceFormat>,77}78impl Default for EvaluationSettings {79	fn default() -> Self {80		EvaluationSettings {81			max_stack: 200,82			max_trace: 20,83			globals: Default::default(),84			ext_vars: Default::default(),85			ext_natives: Default::default(),86			tla_vars: Default::default(),87			import_resolver: Box::new(DummyImportResolver),88			manifest_format: ManifestFormat::Json(4),89			trace_format: Box::new(CompactFormat {90				padding: 4,91				resolver: trace::PathResolver::Absolute,92			}),93		}94	}95}9697#[derive(Default)]98struct EvaluationData {99	/// Used for stack overflow detection, stacktrace is populated on unwind100	stack_depth: usize,101	/// Contains file source codes and evaluation results for imports and pretty-printed stacktraces102	files: HashMap<Rc<PathBuf>, FileData>,103	str_files: HashMap<Rc<PathBuf>, Rc<str>>,104}105106pub struct FileData {107	source_code: Rc<str>,108	parsed: LocExpr,109	evaluated: Option<Val>,110}111#[derive(Default)]112pub struct EvaluationStateInternals {113	/// Internal state114	data: RefCell<EvaluationData>,115	/// Settings, safe to change at runtime116	settings: RefCell<EvaluationSettings>,117}118119thread_local! {120	/// Contains the state for a currently executed file.121	/// Global state is fine here.122	pub(crate) static EVAL_STATE: RefCell<Option<EvaluationState>> = RefCell::new(None)123}124pub(crate) fn with_state<T>(f: impl FnOnce(&EvaluationState) -> T) -> T {125	EVAL_STATE.with(|s| f(s.borrow().as_ref().unwrap()))126}127pub(crate) fn push<T>(128	e: &Option<ExprLocation>,129	frame_desc: impl FnOnce() -> String,130	f: impl FnOnce() -> Result<T>,131) -> Result<T> {132	if let Some(v) = e {133		with_state(|s| s.push(&v, frame_desc, f))134	} else {135		f()136	}137}138139/// Maintains stack trace and import resolution140#[derive(Default, Clone)]141pub struct EvaluationState(Rc<EvaluationStateInternals>);142143impl EvaluationState {144	/// Parses and adds file as loaded145	pub fn add_file(&self, path: Rc<PathBuf>, source_code: Rc<str>) -> Result<()> {146		self.add_parsed_file(147			path.clone(),148			source_code.clone(),149			parse(150				&source_code,151				&ParserSettings {152					file_name: path.clone(),153					loc_data: true,154				},155			)156			.map_err(|error| ImportSyntaxError {157				error: Box::new(error),158				path,159				source_code,160			})?,161		)?;162163		Ok(())164	}165166	/// Adds file by source code and parsed expr167	pub fn add_parsed_file(168		&self,169		name: Rc<PathBuf>,170		source_code: Rc<str>,171		parsed: LocExpr,172	) -> Result<()> {173		self.data_mut().files.insert(174			name,175			FileData {176				source_code,177				parsed,178				evaluated: None,179			},180		);181182		Ok(())183	}184	pub fn get_source(&self, name: &PathBuf) -> Option<Rc<str>> {185		let ro_map = &self.data().files;186		ro_map.get(name).map(|value| value.source_code.clone())187	}188	pub fn map_source_locations(&self, file: &PathBuf, locs: &[usize]) -> Vec<CodeLocation> {189		offset_to_location(&self.get_source(file).unwrap(), locs)190	}191192	pub(crate) fn import_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Val> {193		let file_path = self.resolve_file(from, path)?;194		{195			let files = &self.data().files;196			if files.contains_key(&file_path) {197				return self.evaluate_loaded_file_raw(&file_path);198			}199		}200		let contents = self.load_file_contents(&file_path)?;201		self.add_file(file_path.clone(), contents)?;202		self.evaluate_loaded_file_raw(&file_path)203	}204	pub(crate) fn import_file_str(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<str>> {205		let path = self.resolve_file(from, path)?;206		if !self.data().str_files.contains_key(&path) {207			let file_str = self.load_file_contents(&path)?;208			self.data_mut().str_files.insert(path.clone(), file_str);209		}210		Ok(self.data().str_files.get(&path).cloned().unwrap())211	}212213	fn evaluate_loaded_file_raw(&self, name: &PathBuf) -> Result<Val> {214		let expr: LocExpr = {215			let ro_map = &self.data().files;216			let value = ro_map217				.get(name)218				.unwrap_or_else(|| panic!("file not added: {:?}", name));219			if let Some(ref evaluated) = value.evaluated {220				return Ok(evaluated.clone());221			}222			value.parsed.clone()223		};224		let value = evaluate(self.create_default_context()?, &expr)?;225		{226			self.data_mut()227				.files228				.get_mut(name)229				.unwrap()230				.evaluated231				.replace(value.clone());232		}233		Ok(value)234	}235236	/// Adds standard library global variable (std) to this evaluator237	pub fn with_stdlib(&self) -> &Self {238		use jrsonnet_stdlib::STDLIB_STR;239		let std_path = Rc::new(PathBuf::from("std.jsonnet"));240		self.run_in_state(|| {241			self.add_parsed_file(242				std_path.clone(),243				STDLIB_STR.to_owned().into(),244				builtin::get_parsed_stdlib(),245			)246			.unwrap();247			let val = self.evaluate_loaded_file_raw(&std_path).unwrap();248			self.settings_mut().globals.insert("std".into(), val);249		});250		self251	}252253	/// Creates context with all passed global variables254	pub fn create_default_context(&self) -> Result<Context> {255		let globals = &self.settings().globals;256		let mut new_bindings: HashMap<Rc<str>, LazyBinding> = HashMap::new();257		for (name, value) in globals.iter() {258			new_bindings.insert(259				name.clone(),260				LazyBinding::Bound(resolved_lazy_val!(value.clone())),261			);262		}263		Context::new().extend_unbound(new_bindings, None, None, None)264	}265266	/// Executes code creating a new stack frame267	pub fn push<T>(268		&self,269		e: &ExprLocation,270		frame_desc: impl FnOnce() -> String,271		f: impl FnOnce() -> Result<T>,272	) -> Result<T> {273		{274			let mut data = self.data_mut();275			let stack_depth = &mut data.stack_depth;276			if *stack_depth > self.max_stack() {277				// Error creation uses data, so i drop guard here278				drop(data);279				throw!(StackOverflow);280			} else {281				*stack_depth += 1;282			}283		}284		let result = f();285		self.data_mut().stack_depth -= 1;286		if let Err(mut err) = result {287			err.trace_mut().0.push(StackTraceElement {288				location: e.clone(),289				desc: frame_desc(),290			});291			return Err(err);292		}293		result294	}295296	/// Runs passed function in state (required if function needs to modify stack trace)297	pub fn run_in_state<T>(&self, f: impl FnOnce() -> T) -> T {298		EVAL_STATE.with(|v| {299			let has_state = v.borrow().is_some();300			if !has_state {301				v.borrow_mut().replace(self.clone());302			}303			let result = f();304			if !has_state {305				v.borrow_mut().take();306			}307			result308		})309	}310311	pub fn stringify_err(&self, e: &LocError) -> String {312		let mut out = String::new();313		self.settings()314			.trace_format315			.write_trace(&mut out, self, e)316			.unwrap();317		out318	}319320	pub fn manifest(&self, val: Val) -> Result<Rc<str>> {321		self.run_in_state(|| val.manifest(&self.manifest_format()))322	}323	pub fn manifest_multi(&self, val: Val) -> Result<Vec<(Rc<str>, Rc<str>)>> {324		self.run_in_state(|| val.manifest_multi(&self.manifest_format()))325	}326	pub fn manifest_stream(&self, val: Val) -> Result<Vec<Rc<str>>> {327		self.run_in_state(|| val.manifest_stream(&self.manifest_format()))328	}329330	/// If passed value is function then call with set TLA331	pub fn with_tla(&self, val: Val) -> Result<Val> {332		Ok(match val {333			Val::Func(func) => func.evaluate_map(334				self.create_default_context()?,335				&self.settings().tla_vars,336				true,337			)?,338			v => v,339		})340	}341}342343/// Internals344impl EvaluationState {345	fn data(&self) -> Ref<EvaluationData> {346		self.0.data.borrow()347	}348	fn data_mut(&self) -> RefMut<EvaluationData> {349		self.0.data.borrow_mut()350	}351	pub fn settings(&self) -> Ref<EvaluationSettings> {352		self.0.settings.borrow()353	}354	pub fn settings_mut(&self) -> RefMut<EvaluationSettings> {355		self.0.settings.borrow_mut()356	}357}358359/// Raw methods evaluate passed values but don't perform TLA execution360impl EvaluationState {361	pub fn evaluate_file_raw(&self, name: &PathBuf) -> Result<Val> {362		self.run_in_state(|| self.import_file(&std::env::current_dir().expect("cwd"), &name))363	}364	pub fn evaluate_file_raw_nocwd(&self, name: &PathBuf) -> Result<Val> {365		self.run_in_state(|| self.import_file(&PathBuf::from("."), &name))366	}367	/// Parses and evaluates the given snippet368	pub fn evaluate_snippet_raw(&self, source: Rc<PathBuf>, code: Rc<str>) -> Result<Val> {369		let parsed = parse(370			&code,371			&ParserSettings {372				file_name: source.clone(),373				loc_data: true,374			},375		)376		.unwrap();377		self.add_parsed_file(source, code, parsed.clone())?;378		self.evaluate_expr_raw(parsed)379	}380	/// Evaluates the parsed expression381	pub fn evaluate_expr_raw(&self, code: LocExpr) -> Result<Val> {382		self.run_in_state(|| evaluate(self.create_default_context()?, &code))383	}384}385386/// Settings utilities387impl EvaluationState {388	pub fn add_ext_var(&self, name: Rc<str>, value: Val) {389		self.settings_mut().ext_vars.insert(name, value);390	}391	pub fn add_ext_str(&self, name: Rc<str>, value: Rc<str>) {392		self.add_ext_var(name, Val::Str(value));393	}394	pub fn add_ext_code(&self, name: Rc<str>, code: Rc<str>) -> Result<()> {395		let value =396			self.evaluate_snippet_raw(Rc::new(PathBuf::from(format!("ext_code {}", name))), code)?;397		self.add_ext_var(name, value);398		Ok(())399	}400401	pub fn add_tla(&self, name: Rc<str>, value: Val) {402		self.settings_mut().tla_vars.insert(name, value);403	}404	pub fn add_tla_str(&self, name: Rc<str>, value: Rc<str>) {405		self.add_tla(name, Val::Str(value));406	}407	pub fn add_tla_code(&self, name: Rc<str>, code: Rc<str>) -> Result<()> {408		let value =409			self.evaluate_snippet_raw(Rc::new(PathBuf::from(format!("tla_code {}", name))), code)?;410		self.add_ext_var(name, value);411		Ok(())412	}413414	pub fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>> {415		Ok(self.settings().import_resolver.resolve_file(from, path)?)416	}417	pub fn load_file_contents(&self, path: &PathBuf) -> Result<Rc<str>> {418		Ok(self.settings().import_resolver.load_file_contents(path)?)419	}420421	pub fn import_resolver(&self) -> Ref<dyn ImportResolver> {422		Ref::map(self.settings(), |s| &*s.import_resolver)423	}424	pub fn set_import_resolver(&self, resolver: Box<dyn ImportResolver>) {425		self.settings_mut().import_resolver = resolver;426	}427428	pub fn add_native(&self, name: Rc<str>, cb: Rc<NativeCallback>) {429		self.settings_mut().ext_natives.insert(name, cb);430	}431432	pub fn manifest_format(&self) -> ManifestFormat {433		self.settings().manifest_format.clone()434	}435	pub fn set_manifest_format(&self, format: ManifestFormat) {436		self.settings_mut().manifest_format = format;437	}438439	pub fn trace_format(&self) -> Ref<dyn TraceFormat> {440		Ref::map(self.settings(), |s| &*s.trace_format)441	}442	pub fn set_trace_format(&self, format: Box<dyn TraceFormat>) {443		self.settings_mut().trace_format = format;444	}445446	pub fn max_trace(&self) -> usize {447		self.settings().max_trace448	}449	pub fn set_max_trace(&self, trace: usize) {450		self.settings_mut().max_trace = trace;451	}452453	pub fn max_stack(&self) -> usize {454		self.settings().max_stack455	}456	pub fn set_max_stack(&self, trace: usize) {457		self.settings_mut().max_stack = trace;458	}459}460461#[cfg(test)]462pub mod tests {463	use super::Val;464	use crate::{error::Error::*, primitive_equals, EvaluationState};465	use jrsonnet_parser::*;466	use std::{path::PathBuf, rc::Rc};467468	#[test]469	#[should_panic]470	fn eval_state_stacktrace() {471		let state = EvaluationState::default();472		state.run_in_state(|| {473			state474				.push(475					&ExprLocation(Rc::new(PathBuf::from("test1.jsonnet")), 10, 20),476					|| "outer".to_owned(),477					|| {478						state.push(479							&ExprLocation(Rc::new(PathBuf::from("test2.jsonnet")), 30, 40),480							|| "inner".to_owned(),481							|| Err(RuntimeError("".into()).into()),482						)?;483						Ok(())484					},485				)486				.unwrap();487		});488	}489490	#[test]491	fn eval_state_standard() {492		let state = EvaluationState::default();493		state.with_stdlib();494		assert!(primitive_equals(495			&state496				.evaluate_snippet_raw(497					Rc::new(PathBuf::from("raw.jsonnet")),498					r#"std.assertEqual(std.base64("test"), "dGVzdA==")"#.into()499				)500				.unwrap(),501			&Val::Bool(true),502		)503		.unwrap());504	}505506	macro_rules! eval {507		($str: expr) => {508			EvaluationState::default()509				.with_stdlib()510				.evaluate_snippet_raw(Rc::new(PathBuf::from("raw.jsonnet")), $str.into())511				.unwrap()512		};513	}514	macro_rules! eval_json {515		($str: expr) => {{516			let evaluator = EvaluationState::default();517			evaluator.with_stdlib();518			evaluator.run_in_state(|| {519				evaluator520					.evaluate_snippet_raw(Rc::new(PathBuf::from("raw.jsonnet")), $str.into())521					.unwrap()522					.to_json(0)523					.unwrap()524					.replace("\n", "")525				})526			}};527	}528529	/// Asserts given code returns `true`530	macro_rules! assert_eval {531		($str: expr) => {532			assert!(primitive_equals(&eval!($str), &Val::Bool(true)).unwrap())533		};534	}535536	/// Asserts given code returns `false`537	macro_rules! assert_eval_neg {538		($str: expr) => {539			assert!(primitive_equals(&eval!($str), &Val::Bool(false)).unwrap())540		};541	}542	macro_rules! assert_json {543		($str: expr, $out: expr) => {544			assert_eq!(eval_json!($str), $out.replace("\t", ""))545		};546	}547548	/// Sanity checking, before trusting to another tests549	#[test]550	fn equality_operator() {551		assert_eval!("2 == 2");552		assert_eval_neg!("2 != 2");553		assert_eval!("2 != 3");554		assert_eval_neg!("2 == 3");555		assert_eval!("'Hello' == 'Hello'");556		assert_eval_neg!("'Hello' != 'Hello'");557		assert_eval!("'Hello' != 'World'");558		assert_eval_neg!("'Hello' == 'World'");559	}560561	#[test]562	fn math_evaluation() {563		assert_eval!("2 + 2 * 2 == 6");564		assert_eval!("3 + (2 + 2 * 2) == 9");565	}566567	#[test]568	fn string_concat() {569		assert_eval!("'Hello' + 'World' == 'HelloWorld'");570		assert_eval!("'Hello' * 3 == 'HelloHelloHello'");571		assert_eval!("'Hello' + 'World' * 3 == 'HelloWorldWorldWorld'");572	}573574	#[test]575	fn faster_join() {576		assert_eval!("std.join([0,0], [[1,2],[3,4],[5,6]]) == [1,2,0,0,3,4,0,0,5,6]");577		assert_eval!("std.join(',', ['1','2','3','4']) == '1,2,3,4'");578	}579580	#[test]581	fn function_contexts() {582		assert_eval!(583			r#"584				local k = {585					t(name = self.h): [self.h, name],586					h: 3,587				};588				local f = {589					t: k.t(),590					h: 4,591				};592				f.t[0] == f.t[1]593			"#594		);595	}596597	#[test]598	fn local() {599		assert_eval!("local a = 2; local b = 3; a + b == 5");600		assert_eval!("local a = 1, b = a + 1; a + b == 3");601		assert_eval!("local a = 1; local a = 2; a == 2");602	}603604	#[test]605	fn object_lazyness() {606		assert_json!("local a = {a:error 'test'}; {}", r#"{}"#);607	}608609	#[test]610	fn object_inheritance() {611		assert_json!("{a: self.b} + {b:3}", r#"{"a": 3,"b": 3}"#);612	}613614	#[test]615	fn object_assertion_success() {616		eval!("{assert \"a\" in self} + {a:2}");617	}618619	#[test]620	fn object_assertion_error() {621		eval!("{assert \"a\" in self}");622	}623624	#[test]625	fn lazy_args() {626		eval!("local test(a) = 2; test(error '3')");627	}628629	#[test]630	#[should_panic]631	fn tailstrict_args() {632		eval!("local test(a) = 2; test(error '3') tailstrict");633	}634635	#[test]636	#[should_panic]637	fn no_binding_error() {638		eval!("a");639	}640641	#[test]642	fn test_object() {643		assert_json!("{a:2}", r#"{"a": 2}"#);644		assert_json!("{a:2+2}", r#"{"a": 4}"#);645		assert_json!("{a:2}+{b:2}", r#"{"a": 2,"b": 2}"#);646		assert_json!("{b:3}+{b:2}", r#"{"b": 2}"#);647		assert_json!("{b:3}+{b+:2}", r#"{"b": 5}"#);648		assert_json!("local test='a'; {[test]:2}", r#"{"a": 2}"#);649		assert_json!(650			r#"651				{652					name: "Alice",653					welcome: "Hello " + self.name + "!",654				}655			"#,656			r#"{"name": "Alice","welcome": "Hello Alice!"}"#657		);658		assert_json!(659			r#"660				{661					name: "Alice",662					welcome: "Hello " + self.name + "!",663				} + {664					name: "Bob"665				}666			"#,667			r#"{"name": "Bob","welcome": "Hello Bob!"}"#668		);669	}670671	#[test]672	fn functions() {673		assert_json!(r#"local a = function(b, c = 2) b + c; a(2)"#, "4");674		assert_json!(675			r#"local a = function(b, c = "Dear") b + c + d, d = "World"; a("Hello")"#,676			r#""HelloDearWorld""#677		);678	}679680	#[test]681	fn local_methods() {682		assert_json!(r#"local a(b, c = 2) = b + c; a(2)"#, "4");683		assert_json!(684			r#"local a(b, c = "Dear") = b + c + d, d = "World"; a("Hello")"#,685			r#""HelloDearWorld""#686		);687	}688689	#[test]690	fn object_locals() {691		assert_json!(r#"{local a = 3, b: a}"#, r#"{"b": 3}"#);692		assert_json!(r#"{local a = 3, local c = a, b: c}"#, r#"{"b": 3}"#);693		assert_json!(694			r#"{local a = function (b) {[b]:4}, test: a("test")}"#,695			r#"{"test": {"test": 4}}"#696		);697	}698699	#[test]700	fn object_comp() {701		assert_json!(702			r#"{local t = "a", ["h"+i+"_"+z]: if "h"+(i-1)+"_"+z in self then t+1 else 0+t for i in [1,2,3] for z in [2,3,4] if z != i}"#,703			"{\"h1_2\": \"0a\",\"h1_3\": \"0a\",\"h1_4\": \"0a\",\"h2_3\": \"a1\",\"h2_4\": \"a1\",\"h3_2\": \"0a\",\"h3_4\": \"a1\"}"704		)705	}706707	#[test]708	fn direct_self() {709		println!(710			"{:#?}",711			eval!(712				r#"713					{714						local me = self,715						a: 3,716						b(): me.a,717					}718				"#719			)720		);721	}722723	#[test]724	fn indirect_self() {725		// `self` assigned to `me` was lost when being726		// referenced from field727		eval!(728			r#"{729				local me = self,730				a: 3,731				b: me.a,732			}.b"#733		);734	}735736	// We can't trust other tests (And official jsonnet testsuite), if assert is not working correctly737	#[test]738	fn std_assert_ok() {739		eval!("std.assertEqual(4.5 << 2, 16)");740	}741742	#[test]743	#[should_panic]744	fn std_assert_failure() {745		eval!("std.assertEqual(4.5 << 2, 15)");746	}747748	#[test]749	fn string_is_string() {750		assert!(primitive_equals(751			&eval!("local arr = 'hello'; (!std.isArray(arr)) && (!std.isString(arr))"),752			&Val::Bool(false),753		)754		.unwrap());755	}756757	#[test]758	fn base64_works() {759		assert_json!(r#"std.base64("test")"#, r#""dGVzdA==""#);760	}761762	#[test]763	fn utf8_chars() {764		assert_json!(765			r#"local c="😎";{c:std.codepoint(c),l:std.length(c)}"#,766			r#"{"c": 128526,"l": 1}"#767		)768	}769770	#[test]771	fn json() {772		assert_json!(773			r#"std.manifestJsonEx({a:3, b:4, c:6},"")"#,774			r#""{\n\"a\": 3,\n\"b\": 4,\n\"c\": 6\n}""#775		);776	}777778	#[test]779	fn test() {780		assert_json!(781			r#"[[a, b] for a in [1,2,3] for b in [4,5,6]]"#,782			"[[1,4],[1,5],[1,6],[2,4],[2,5],[2,6],[3,4],[3,5],[3,6]]"783		);784	}785786	#[test]787	fn sjsonnet() {788		eval!(789			r#"790			local x0 = {k: 1};791			local x1 = {k: x0.k + x0.k};792			local x2 = {k: x1.k + x1.k};793			local x3 = {k: x2.k + x2.k};794			local x4 = {k: x3.k + x3.k};795			local x5 = {k: x4.k + x4.k};796			local x6 = {k: x5.k + x5.k};797			local x7 = {k: x6.k + x6.k};798			local x8 = {k: x7.k + x7.k};799			local x9 = {k: x8.k + x8.k};800			local x10 = {k: x9.k + x9.k};801			local x11 = {k: x10.k + x10.k};802			local x12 = {k: x11.k + x11.k};803			local x13 = {k: x12.k + x12.k};804			local x14 = {k: x13.k + x13.k};805			local x15 = {k: x14.k + x14.k};806			local x16 = {k: x15.k + x15.k};807			local x17 = {k: x16.k + x16.k};808			local x18 = {k: x17.k + x17.k};809			local x19 = {k: x18.k + x18.k};810			local x20 = {k: x19.k + x19.k};811			local x21 = {k: x20.k + x20.k};812			x21.k813		"#814		);815	}816817	// This test is commented out by default, because of huge compilation slowdown818	// #[bench]819	// fn bench_codegen(b: &mut Bencher) {820	// 	b.iter(|| {821	// 		#[allow(clippy::all)]822	// 		let stdlib = {823	// 			use jrsonnet_parser::*;824	// 			include!(concat!(env!("OUT_DIR"), "/stdlib.rs"))825	// 		};826	// 		stdlib827	// 	})828	// }829830	/*831	#[bench]832	fn bench_serialize(b: &mut Bencher) {833		b.iter(|| {834			bincode::deserialize::<jrsonnet_parser::LocExpr>(include_bytes!(concat!(835				env!("OUT_DIR"),836				"/stdlib.bincode"837			)))838			.expect("deserialize stdlib")839		})840	}841842	#[bench]843	fn bench_parse(b: &mut Bencher) {844		b.iter(|| {845			jrsonnet_parser::parse(846				jrsonnet_stdlib::STDLIB_STR,847				&jrsonnet_parser::ParserSettings {848					loc_data: true,849					file_name: Rc::new(PathBuf::from("std.jsonnet")),850				},851			)852		})853	}854	*/855856	#[test]857	fn equality() {858		println!(859			"{:?}",860			jrsonnet_parser::parse(861				"{ x: 1, y: 2 } == { x: 1, y: 2 }",862				&ParserSettings::default()863			)864		);865		assert_eval!("{ x: 1, y: 2 } == { x: 1, y: 2 }")866	}867868	#[test]869	fn native_ext() -> crate::error::Result<()> {870		use super::native::NativeCallback;871		let evaluator = EvaluationState::default();872873		evaluator.with_stdlib();874		evaluator.settings_mut().ext_natives.insert(875			"native_add".into(),876			Rc::new(NativeCallback::new(877				ParamsDesc(Rc::new(vec![878					Param("a".into(), None),879					Param("b".into(), None),880				])),881				|args| match (&args[0], &args[1]) {882					(Val::Num(a), Val::Num(b)) => Ok(Val::Num(a + b)),883					(_, _) => todo!(),884				},885			)),886		);887		evaluator.evaluate_snippet_raw(888			Rc::new(PathBuf::from("test.jsonnet")),889			"std.assertEqual(std.native(\"native_add\")(1, 2), 3)".into(),890		)?;891		Ok(())892	}893}
after · crates/jrsonnet-evaluator/src/lib.rs
1#![cfg_attr(feature = "unstable", feature(stmt_expr_attributes))]2#![allow(macro_expanded_macro_exports_accessed_by_absolute_paths)]3#![warn(clippy::all, clippy::nursery)]45mod builtin;6mod ctx;7mod dynamic;8pub mod error;9mod evaluate;10mod function;11mod import;12mod integrations;13mod map;14pub mod native;15mod obj;16pub mod trace;17mod val;1819pub use ctx::*;20pub use dynamic::*;21use error::{Error::*, LocError, Result, StackTraceElement};22pub use evaluate::*;23pub use function::parse_function_call;24pub use import::*;25use jrsonnet_parser::*;26use native::NativeCallback;27pub use obj::*;28use std::{29	cell::{Ref, RefCell, RefMut},30	collections::HashMap,31	fmt::Debug,32	path::PathBuf,33	rc::Rc,34};35use trace::{offset_to_location, CodeLocation, CompactFormat, TraceFormat};36pub use val::*;3738type BindableFn = dyn Fn(Option<ObjValue>, Option<ObjValue>) -> Result<LazyVal>;39#[derive(Clone)]40pub enum LazyBinding {41	Bindable(Rc<BindableFn>),42	Bound(LazyVal),43}4445impl Debug for LazyBinding {46	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {47		write!(f, "LazyBinding")48	}49}50impl LazyBinding {51	pub fn evaluate(&self, this: Option<ObjValue>, super_obj: Option<ObjValue>) -> Result<LazyVal> {52		match self {53			Self::Bindable(v) => v(this, super_obj),54			Self::Bound(v) => Ok(v.clone()),55		}56	}57}5859pub struct EvaluationSettings {60	/// Limits recursion by limiting the number of stack frames61	pub max_stack: usize,62	/// Limits amount of stack trace items preserved63	pub max_trace: usize,64	/// Used for s`td.extVar`65	pub ext_vars: HashMap<Rc<str>, Val>,66	/// Used for ext.native67	pub ext_natives: HashMap<Rc<str>, Rc<NativeCallback>>,68	/// TLA vars69	pub tla_vars: HashMap<Rc<str>, Val>,70	/// Global variables are inserted in default context71	pub globals: HashMap<Rc<str>, Val>,72	/// Used to resolve file locations/contents73	pub import_resolver: Box<dyn ImportResolver>,74	/// Used in manifestification functions75	pub manifest_format: ManifestFormat,76	/// Used for bindings77	pub trace_format: Box<dyn TraceFormat>,78}79impl Default for EvaluationSettings {80	fn default() -> Self {81		Self {82			max_stack: 200,83			max_trace: 20,84			globals: Default::default(),85			ext_vars: Default::default(),86			ext_natives: Default::default(),87			tla_vars: Default::default(),88			import_resolver: Box::new(DummyImportResolver),89			manifest_format: ManifestFormat::Json(4),90			trace_format: Box::new(CompactFormat {91				padding: 4,92				resolver: trace::PathResolver::Absolute,93			}),94		}95	}96}9798#[derive(Default)]99struct EvaluationData {100	/// Used for stack overflow detection, stacktrace is populated on unwind101	stack_depth: usize,102	/// Contains file source codes and evaluation results for imports and pretty-printed stacktraces103	files: HashMap<Rc<PathBuf>, FileData>,104	str_files: HashMap<Rc<PathBuf>, Rc<str>>,105}106107pub struct FileData {108	source_code: Rc<str>,109	parsed: LocExpr,110	evaluated: Option<Val>,111}112#[derive(Default)]113pub struct EvaluationStateInternals {114	/// Internal state115	data: RefCell<EvaluationData>,116	/// Settings, safe to change at runtime117	settings: RefCell<EvaluationSettings>,118}119120thread_local! {121	/// Contains the state for a currently executed file.122	/// Global state is fine here.123	pub(crate) static EVAL_STATE: RefCell<Option<EvaluationState>> = RefCell::new(None)124}125pub(crate) fn with_state<T>(f: impl FnOnce(&EvaluationState) -> T) -> T {126	EVAL_STATE.with(|s| f(s.borrow().as_ref().unwrap()))127}128pub(crate) fn push<T>(129	e: &Option<ExprLocation>,130	frame_desc: impl FnOnce() -> String,131	f: impl FnOnce() -> Result<T>,132) -> Result<T> {133	if let Some(v) = e {134		with_state(|s| s.push(v, frame_desc, f))135	} else {136		f()137	}138}139140/// Maintains stack trace and import resolution141#[derive(Default, Clone)]142pub struct EvaluationState(Rc<EvaluationStateInternals>);143144impl EvaluationState {145	/// Parses and adds file as loaded146	pub fn add_file(&self, path: Rc<PathBuf>, source_code: Rc<str>) -> Result<()> {147		self.add_parsed_file(148			path.clone(),149			source_code.clone(),150			parse(151				&source_code,152				&ParserSettings {153					file_name: path.clone(),154					loc_data: true,155				},156			)157			.map_err(|error| ImportSyntaxError {158				error: Box::new(error),159				path,160				source_code,161			})?,162		)?;163164		Ok(())165	}166167	/// Adds file by source code and parsed expr168	pub fn add_parsed_file(169		&self,170		name: Rc<PathBuf>,171		source_code: Rc<str>,172		parsed: LocExpr,173	) -> Result<()> {174		self.data_mut().files.insert(175			name,176			FileData {177				source_code,178				parsed,179				evaluated: None,180			},181		);182183		Ok(())184	}185	pub fn get_source(&self, name: &PathBuf) -> Option<Rc<str>> {186		let ro_map = &self.data().files;187		ro_map.get(name).map(|value| value.source_code.clone())188	}189	pub fn map_source_locations(&self, file: &PathBuf, locs: &[usize]) -> Vec<CodeLocation> {190		offset_to_location(&self.get_source(file).unwrap(), locs)191	}192193	pub(crate) fn import_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Val> {194		let file_path = self.resolve_file(from, path)?;195		{196			let files = &self.data().files;197			if files.contains_key(&file_path) {198				return self.evaluate_loaded_file_raw(&file_path);199			}200		}201		let contents = self.load_file_contents(&file_path)?;202		self.add_file(file_path.clone(), contents)?;203		self.evaluate_loaded_file_raw(&file_path)204	}205	pub(crate) fn import_file_str(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<str>> {206		let path = self.resolve_file(from, path)?;207		if !self.data().str_files.contains_key(&path) {208			let file_str = self.load_file_contents(&path)?;209			self.data_mut().str_files.insert(path.clone(), file_str);210		}211		Ok(self.data().str_files.get(&path).cloned().unwrap())212	}213214	fn evaluate_loaded_file_raw(&self, name: &PathBuf) -> Result<Val> {215		let expr: LocExpr = {216			let ro_map = &self.data().files;217			let value = ro_map218				.get(name)219				.unwrap_or_else(|| panic!("file not added: {:?}", name));220			if let Some(ref evaluated) = value.evaluated {221				return Ok(evaluated.clone());222			}223			value.parsed.clone()224		};225		let value = evaluate(self.create_default_context()?, &expr)?;226		{227			self.data_mut()228				.files229				.get_mut(name)230				.unwrap()231				.evaluated232				.replace(value.clone());233		}234		Ok(value)235	}236237	/// Adds standard library global variable (std) to this evaluator238	pub fn with_stdlib(&self) -> &Self {239		use jrsonnet_stdlib::STDLIB_STR;240		let std_path = Rc::new(PathBuf::from("std.jsonnet"));241		self.run_in_state(|| {242			self.add_parsed_file(243				std_path.clone(),244				STDLIB_STR.to_owned().into(),245				builtin::get_parsed_stdlib(),246			)247			.unwrap();248			let val = self.evaluate_loaded_file_raw(&std_path).unwrap();249			self.settings_mut().globals.insert("std".into(), val);250		});251		self252	}253254	/// Creates context with all passed global variables255	pub fn create_default_context(&self) -> Result<Context> {256		let globals = &self.settings().globals;257		let mut new_bindings: HashMap<Rc<str>, LazyBinding> = HashMap::new();258		for (name, value) in globals.iter() {259			new_bindings.insert(260				name.clone(),261				LazyBinding::Bound(resolved_lazy_val!(value.clone())),262			);263		}264		Context::new().extend_unbound(new_bindings, None, None, None)265	}266267	/// Executes code creating a new stack frame268	pub fn push<T>(269		&self,270		e: &ExprLocation,271		frame_desc: impl FnOnce() -> String,272		f: impl FnOnce() -> Result<T>,273	) -> Result<T> {274		{275			let mut data = self.data_mut();276			let stack_depth = &mut data.stack_depth;277			if *stack_depth > self.max_stack() {278				// Error creation uses data, so i drop guard here279				drop(data);280				throw!(StackOverflow);281			} else {282				*stack_depth += 1;283			}284		}285		let result = f();286		self.data_mut().stack_depth -= 1;287		if let Err(mut err) = result {288			err.trace_mut().0.push(StackTraceElement {289				location: e.clone(),290				desc: frame_desc(),291			});292			return Err(err);293		}294		result295	}296297	/// Runs passed function in state (required if function needs to modify stack trace)298	pub fn run_in_state<T>(&self, f: impl FnOnce() -> T) -> T {299		EVAL_STATE.with(|v| {300			let has_state = v.borrow().is_some();301			if !has_state {302				v.borrow_mut().replace(self.clone());303			}304			let result = f();305			if !has_state {306				v.borrow_mut().take();307			}308			result309		})310	}311312	pub fn stringify_err(&self, e: &LocError) -> String {313		let mut out = String::new();314		self.settings()315			.trace_format316			.write_trace(&mut out, self, e)317			.unwrap();318		out319	}320321	pub fn manifest(&self, val: Val) -> Result<Rc<str>> {322		self.run_in_state(|| val.manifest(&self.manifest_format()))323	}324	pub fn manifest_multi(&self, val: Val) -> Result<Vec<(Rc<str>, Rc<str>)>> {325		self.run_in_state(|| val.manifest_multi(&self.manifest_format()))326	}327	pub fn manifest_stream(&self, val: Val) -> Result<Vec<Rc<str>>> {328		self.run_in_state(|| val.manifest_stream(&self.manifest_format()))329	}330331	/// If passed value is function then call with set TLA332	pub fn with_tla(&self, val: Val) -> Result<Val> {333		Ok(match val {334			Val::Func(func) => func.evaluate_map(335				self.create_default_context()?,336				&self.settings().tla_vars,337				true,338			)?,339			v => v,340		})341	}342}343344/// Internals345impl EvaluationState {346	fn data(&self) -> Ref<EvaluationData> {347		self.0.data.borrow()348	}349	fn data_mut(&self) -> RefMut<EvaluationData> {350		self.0.data.borrow_mut()351	}352	pub fn settings(&self) -> Ref<EvaluationSettings> {353		self.0.settings.borrow()354	}355	pub fn settings_mut(&self) -> RefMut<EvaluationSettings> {356		self.0.settings.borrow_mut()357	}358}359360/// Raw methods evaluate passed values but don't perform TLA execution361impl EvaluationState {362	pub fn evaluate_file_raw(&self, name: &PathBuf) -> Result<Val> {363		self.run_in_state(|| self.import_file(&std::env::current_dir().expect("cwd"), name))364	}365	pub fn evaluate_file_raw_nocwd(&self, name: &PathBuf) -> Result<Val> {366		self.run_in_state(|| self.import_file(&PathBuf::from("."), name))367	}368	/// Parses and evaluates the given snippet369	pub fn evaluate_snippet_raw(&self, source: Rc<PathBuf>, code: Rc<str>) -> Result<Val> {370		let parsed = parse(371			&code,372			&ParserSettings {373				file_name: source.clone(),374				loc_data: true,375			},376		)377		.unwrap();378		self.add_parsed_file(source, code, parsed.clone())?;379		self.evaluate_expr_raw(parsed)380	}381	/// Evaluates the parsed expression382	pub fn evaluate_expr_raw(&self, code: LocExpr) -> Result<Val> {383		self.run_in_state(|| evaluate(self.create_default_context()?, &code))384	}385}386387/// Settings utilities388impl EvaluationState {389	pub fn add_ext_var(&self, name: Rc<str>, value: Val) {390		self.settings_mut().ext_vars.insert(name, value);391	}392	pub fn add_ext_str(&self, name: Rc<str>, value: Rc<str>) {393		self.add_ext_var(name, Val::Str(value));394	}395	pub fn add_ext_code(&self, name: Rc<str>, code: Rc<str>) -> Result<()> {396		let value =397			self.evaluate_snippet_raw(Rc::new(PathBuf::from(format!("ext_code {}", name))), code)?;398		self.add_ext_var(name, value);399		Ok(())400	}401402	pub fn add_tla(&self, name: Rc<str>, value: Val) {403		self.settings_mut().tla_vars.insert(name, value);404	}405	pub fn add_tla_str(&self, name: Rc<str>, value: Rc<str>) {406		self.add_tla(name, Val::Str(value));407	}408	pub fn add_tla_code(&self, name: Rc<str>, code: Rc<str>) -> Result<()> {409		let value =410			self.evaluate_snippet_raw(Rc::new(PathBuf::from(format!("tla_code {}", name))), code)?;411		self.add_ext_var(name, value);412		Ok(())413	}414415	pub fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>> {416		Ok(self.settings().import_resolver.resolve_file(from, path)?)417	}418	pub fn load_file_contents(&self, path: &PathBuf) -> Result<Rc<str>> {419		Ok(self.settings().import_resolver.load_file_contents(path)?)420	}421422	pub fn import_resolver(&self) -> Ref<dyn ImportResolver> {423		Ref::map(self.settings(), |s| &*s.import_resolver)424	}425	pub fn set_import_resolver(&self, resolver: Box<dyn ImportResolver>) {426		self.settings_mut().import_resolver = resolver;427	}428429	pub fn add_native(&self, name: Rc<str>, cb: Rc<NativeCallback>) {430		self.settings_mut().ext_natives.insert(name, cb);431	}432433	pub fn manifest_format(&self) -> ManifestFormat {434		self.settings().manifest_format.clone()435	}436	pub fn set_manifest_format(&self, format: ManifestFormat) {437		self.settings_mut().manifest_format = format;438	}439440	pub fn trace_format(&self) -> Ref<dyn TraceFormat> {441		Ref::map(self.settings(), |s| &*s.trace_format)442	}443	pub fn set_trace_format(&self, format: Box<dyn TraceFormat>) {444		self.settings_mut().trace_format = format;445	}446447	pub fn max_trace(&self) -> usize {448		self.settings().max_trace449	}450	pub fn set_max_trace(&self, trace: usize) {451		self.settings_mut().max_trace = trace;452	}453454	pub fn max_stack(&self) -> usize {455		self.settings().max_stack456	}457	pub fn set_max_stack(&self, trace: usize) {458		self.settings_mut().max_stack = trace;459	}460}461462#[cfg(test)]463pub mod tests {464	use super::Val;465	use crate::{error::Error::*, primitive_equals, EvaluationState};466	use jrsonnet_parser::*;467	use std::{path::PathBuf, rc::Rc};468469	#[test]470	#[should_panic]471	fn eval_state_stacktrace() {472		let state = EvaluationState::default();473		state.run_in_state(|| {474			state475				.push(476					&ExprLocation(Rc::new(PathBuf::from("test1.jsonnet")), 10, 20),477					|| "outer".to_owned(),478					|| {479						state.push(480							&ExprLocation(Rc::new(PathBuf::from("test2.jsonnet")), 30, 40),481							|| "inner".to_owned(),482							|| Err(RuntimeError("".into()).into()),483						)?;484						Ok(())485					},486				)487				.unwrap();488		});489	}490491	#[test]492	fn eval_state_standard() {493		let state = EvaluationState::default();494		state.with_stdlib();495		assert!(primitive_equals(496			&state497				.evaluate_snippet_raw(498					Rc::new(PathBuf::from("raw.jsonnet")),499					r#"std.assertEqual(std.base64("test"), "dGVzdA==")"#.into()500				)501				.unwrap(),502			&Val::Bool(true),503		)504		.unwrap());505	}506507	macro_rules! eval {508		($str: expr) => {509			EvaluationState::default()510				.with_stdlib()511				.evaluate_snippet_raw(Rc::new(PathBuf::from("raw.jsonnet")), $str.into())512				.unwrap()513		};514	}515	macro_rules! eval_json {516		($str: expr) => {{517			let evaluator = EvaluationState::default();518			evaluator.with_stdlib();519			evaluator.run_in_state(|| {520				evaluator521					.evaluate_snippet_raw(Rc::new(PathBuf::from("raw.jsonnet")), $str.into())522					.unwrap()523					.to_json(0)524					.unwrap()525					.replace("\n", "")526				})527			}};528	}529530	/// Asserts given code returns `true`531	macro_rules! assert_eval {532		($str: expr) => {533			assert!(primitive_equals(&eval!($str), &Val::Bool(true)).unwrap())534		};535	}536537	/// Asserts given code returns `false`538	macro_rules! assert_eval_neg {539		($str: expr) => {540			assert!(primitive_equals(&eval!($str), &Val::Bool(false)).unwrap())541		};542	}543	macro_rules! assert_json {544		($str: expr, $out: expr) => {545			assert_eq!(eval_json!($str), $out.replace("\t", ""))546		};547	}548549	/// Sanity checking, before trusting to another tests550	#[test]551	fn equality_operator() {552		assert_eval!("2 == 2");553		assert_eval_neg!("2 != 2");554		assert_eval!("2 != 3");555		assert_eval_neg!("2 == 3");556		assert_eval!("'Hello' == 'Hello'");557		assert_eval_neg!("'Hello' != 'Hello'");558		assert_eval!("'Hello' != 'World'");559		assert_eval_neg!("'Hello' == 'World'");560	}561562	#[test]563	fn math_evaluation() {564		assert_eval!("2 + 2 * 2 == 6");565		assert_eval!("3 + (2 + 2 * 2) == 9");566	}567568	#[test]569	fn string_concat() {570		assert_eval!("'Hello' + 'World' == 'HelloWorld'");571		assert_eval!("'Hello' * 3 == 'HelloHelloHello'");572		assert_eval!("'Hello' + 'World' * 3 == 'HelloWorldWorldWorld'");573	}574575	#[test]576	fn faster_join() {577		assert_eval!("std.join([0,0], [[1,2],[3,4],[5,6]]) == [1,2,0,0,3,4,0,0,5,6]");578		assert_eval!("std.join(',', ['1','2','3','4']) == '1,2,3,4'");579	}580581	#[test]582	fn function_contexts() {583		assert_eval!(584			r#"585				local k = {586					t(name = self.h): [self.h, name],587					h: 3,588				};589				local f = {590					t: k.t(),591					h: 4,592				};593				f.t[0] == f.t[1]594			"#595		);596	}597598	#[test]599	fn local() {600		assert_eval!("local a = 2; local b = 3; a + b == 5");601		assert_eval!("local a = 1, b = a + 1; a + b == 3");602		assert_eval!("local a = 1; local a = 2; a == 2");603	}604605	#[test]606	fn object_lazyness() {607		assert_json!("local a = {a:error 'test'}; {}", r#"{}"#);608	}609610	#[test]611	fn object_inheritance() {612		assert_json!("{a: self.b} + {b:3}", r#"{"a": 3,"b": 3}"#);613	}614615	#[test]616	fn object_assertion_success() {617		eval!("{assert \"a\" in self} + {a:2}");618	}619620	#[test]621	fn object_assertion_error() {622		eval!("{assert \"a\" in self}");623	}624625	#[test]626	fn lazy_args() {627		eval!("local test(a) = 2; test(error '3')");628	}629630	#[test]631	#[should_panic]632	fn tailstrict_args() {633		eval!("local test(a) = 2; test(error '3') tailstrict");634	}635636	#[test]637	#[should_panic]638	fn no_binding_error() {639		eval!("a");640	}641642	#[test]643	fn test_object() {644		assert_json!("{a:2}", r#"{"a": 2}"#);645		assert_json!("{a:2+2}", r#"{"a": 4}"#);646		assert_json!("{a:2}+{b:2}", r#"{"a": 2,"b": 2}"#);647		assert_json!("{b:3}+{b:2}", r#"{"b": 2}"#);648		assert_json!("{b:3}+{b+:2}", r#"{"b": 5}"#);649		assert_json!("local test='a'; {[test]:2}", r#"{"a": 2}"#);650		assert_json!(651			r#"652				{653					name: "Alice",654					welcome: "Hello " + self.name + "!",655				}656			"#,657			r#"{"name": "Alice","welcome": "Hello Alice!"}"#658		);659		assert_json!(660			r#"661				{662					name: "Alice",663					welcome: "Hello " + self.name + "!",664				} + {665					name: "Bob"666				}667			"#,668			r#"{"name": "Bob","welcome": "Hello Bob!"}"#669		);670	}671672	#[test]673	fn functions() {674		assert_json!(r#"local a = function(b, c = 2) b + c; a(2)"#, "4");675		assert_json!(676			r#"local a = function(b, c = "Dear") b + c + d, d = "World"; a("Hello")"#,677			r#""HelloDearWorld""#678		);679	}680681	#[test]682	fn local_methods() {683		assert_json!(r#"local a(b, c = 2) = b + c; a(2)"#, "4");684		assert_json!(685			r#"local a(b, c = "Dear") = b + c + d, d = "World"; a("Hello")"#,686			r#""HelloDearWorld""#687		);688	}689690	#[test]691	fn object_locals() {692		assert_json!(r#"{local a = 3, b: a}"#, r#"{"b": 3}"#);693		assert_json!(r#"{local a = 3, local c = a, b: c}"#, r#"{"b": 3}"#);694		assert_json!(695			r#"{local a = function (b) {[b]:4}, test: a("test")}"#,696			r#"{"test": {"test": 4}}"#697		);698	}699700	#[test]701	fn object_comp() {702		assert_json!(703			r#"{local t = "a", ["h"+i+"_"+z]: if "h"+(i-1)+"_"+z in self then t+1 else 0+t for i in [1,2,3] for z in [2,3,4] if z != i}"#,704			"{\"h1_2\": \"0a\",\"h1_3\": \"0a\",\"h1_4\": \"0a\",\"h2_3\": \"a1\",\"h2_4\": \"a1\",\"h3_2\": \"0a\",\"h3_4\": \"a1\"}"705		)706	}707708	#[test]709	fn direct_self() {710		println!(711			"{:#?}",712			eval!(713				r#"714					{715						local me = self,716						a: 3,717						b(): me.a,718					}719				"#720			)721		);722	}723724	#[test]725	fn indirect_self() {726		// `self` assigned to `me` was lost when being727		// referenced from field728		eval!(729			r#"{730				local me = self,731				a: 3,732				b: me.a,733			}.b"#734		);735	}736737	// We can't trust other tests (And official jsonnet testsuite), if assert is not working correctly738	#[test]739	fn std_assert_ok() {740		eval!("std.assertEqual(4.5 << 2, 16)");741	}742743	#[test]744	#[should_panic]745	fn std_assert_failure() {746		eval!("std.assertEqual(4.5 << 2, 15)");747	}748749	#[test]750	fn string_is_string() {751		assert!(primitive_equals(752			&eval!("local arr = 'hello'; (!std.isArray(arr)) && (!std.isString(arr))"),753			&Val::Bool(false),754		)755		.unwrap());756	}757758	#[test]759	fn base64_works() {760		assert_json!(r#"std.base64("test")"#, r#""dGVzdA==""#);761	}762763	#[test]764	fn utf8_chars() {765		assert_json!(766			r#"local c="😎";{c:std.codepoint(c),l:std.length(c)}"#,767			r#"{"c": 128526,"l": 1}"#768		)769	}770771	#[test]772	fn json() {773		assert_json!(774			r#"std.manifestJsonEx({a:3, b:4, c:6},"")"#,775			r#""{\n\"a\": 3,\n\"b\": 4,\n\"c\": 6\n}""#776		);777	}778779	#[test]780	fn test() {781		assert_json!(782			r#"[[a, b] for a in [1,2,3] for b in [4,5,6]]"#,783			"[[1,4],[1,5],[1,6],[2,4],[2,5],[2,6],[3,4],[3,5],[3,6]]"784		);785	}786787	#[test]788	fn sjsonnet() {789		eval!(790			r#"791			local x0 = {k: 1};792			local x1 = {k: x0.k + x0.k};793			local x2 = {k: x1.k + x1.k};794			local x3 = {k: x2.k + x2.k};795			local x4 = {k: x3.k + x3.k};796			local x5 = {k: x4.k + x4.k};797			local x6 = {k: x5.k + x5.k};798			local x7 = {k: x6.k + x6.k};799			local x8 = {k: x7.k + x7.k};800			local x9 = {k: x8.k + x8.k};801			local x10 = {k: x9.k + x9.k};802			local x11 = {k: x10.k + x10.k};803			local x12 = {k: x11.k + x11.k};804			local x13 = {k: x12.k + x12.k};805			local x14 = {k: x13.k + x13.k};806			local x15 = {k: x14.k + x14.k};807			local x16 = {k: x15.k + x15.k};808			local x17 = {k: x16.k + x16.k};809			local x18 = {k: x17.k + x17.k};810			local x19 = {k: x18.k + x18.k};811			local x20 = {k: x19.k + x19.k};812			local x21 = {k: x20.k + x20.k};813			x21.k814		"#815		);816	}817818	// This test is commented out by default, because of huge compilation slowdown819	// #[bench]820	// fn bench_codegen(b: &mut Bencher) {821	// 	b.iter(|| {822	// 		#[allow(clippy::all)]823	// 		let stdlib = {824	// 			use jrsonnet_parser::*;825	// 			include!(concat!(env!("OUT_DIR"), "/stdlib.rs"))826	// 		};827	// 		stdlib828	// 	})829	// }830831	/*832	#[bench]833	fn bench_serialize(b: &mut Bencher) {834		b.iter(|| {835			bincode::deserialize::<jrsonnet_parser::LocExpr>(include_bytes!(concat!(836				env!("OUT_DIR"),837				"/stdlib.bincode"838			)))839			.expect("deserialize stdlib")840		})841	}842843	#[bench]844	fn bench_parse(b: &mut Bencher) {845		b.iter(|| {846			jrsonnet_parser::parse(847				jrsonnet_stdlib::STDLIB_STR,848				&jrsonnet_parser::ParserSettings {849					loc_data: true,850					file_name: Rc::new(PathBuf::from("std.jsonnet")),851				},852			)853		})854	}855	*/856857	#[test]858	fn equality() {859		println!(860			"{:?}",861			jrsonnet_parser::parse(862				"{ x: 1, y: 2 } == { x: 1, y: 2 }",863				&ParserSettings::default()864			)865		);866		assert_eval!("{ x: 1, y: 2 } == { x: 1, y: 2 }")867	}868869	#[test]870	fn native_ext() -> crate::error::Result<()> {871		use super::native::NativeCallback;872		let evaluator = EvaluationState::default();873874		evaluator.with_stdlib();875		evaluator.settings_mut().ext_natives.insert(876			"native_add".into(),877			Rc::new(NativeCallback::new(878				ParamsDesc(Rc::new(vec![879					Param("a".into(), None),880					Param("b".into(), None),881				])),882				|args| match (&args[0], &args[1]) {883					(Val::Num(a), Val::Num(b)) => Ok(Val::Num(a + b)),884					(_, _) => todo!(),885				},886			)),887		);888		evaluator.evaluate_snippet_raw(889			Rc::new(PathBuf::from("test.jsonnet")),890			"std.assertEqual(std.native(\"native_add\")(1, 2), 3)".into(),891		)?;892		Ok(())893	}894}
modifiedcrates/jrsonnet-evaluator/src/map.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/map.rs
+++ b/crates/jrsonnet-evaluator/src/map.rs
@@ -15,10 +15,10 @@
 		match Rc::try_unwrap(self.0) {
 			Ok(mut map) => {
 				map.current.extend(new_layer);
-				LayeredHashMap(Rc::new(map))
+				Self(Rc::new(map))
 			}
-			Err(this) => LayeredHashMap(Rc::new(LayeredHashMapInternals {
-				parent: Some(LayeredHashMap(this)),
+			Err(this) => Self(Rc::new(LayeredHashMapInternals {
+				parent: Some(Self(this)),
 				current: new_layer,
 			})),
 		}
@@ -31,20 +31,20 @@
 	{
 		(self.0)
 			.current
-			.get(&key)
+			.get(key)
 			.or_else(|| self.0.parent.as_ref().and_then(|p| p.get(key)))
 	}
 }
 
 impl<K: Hash, V> Clone for LayeredHashMap<K, V> {
 	fn clone(&self) -> Self {
-		LayeredHashMap(self.0.clone())
+		Self(self.0.clone())
 	}
 }
 
 impl<K: Hash + Eq, V> Default for LayeredHashMap<K, V> {
 	fn default() -> Self {
-		LayeredHashMap(Rc::new(LayeredHashMapInternals {
+		Self(Rc::new(LayeredHashMapInternals {
 			parent: None,
 			current: FxHashMap::default(),
 		}))
modifiedcrates/jrsonnet-evaluator/src/obj.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/obj.rs
+++ b/crates/jrsonnet-evaluator/src/obj.rs
@@ -47,23 +47,20 @@
 }
 
 impl ObjValue {
-	pub fn new(
-		super_obj: Option<ObjValue>,
-		this_entries: Rc<HashMap<Rc<str>, ObjMember>>,
-	) -> ObjValue {
-		ObjValue(Rc::new(ObjValueInternals {
+	pub fn new(super_obj: Option<Self>, this_entries: Rc<HashMap<Rc<str>, ObjMember>>) -> Self {
+		Self(Rc::new(ObjValueInternals {
 			super_obj,
 			this_entries,
 			value_cache: RefCell::new(HashMap::new()),
 		}))
 	}
-	pub fn new_empty() -> ObjValue {
+	pub fn new_empty() -> Self {
 		Self::new(None, Rc::new(HashMap::new()))
 	}
-	pub fn with_super(&self, super_obj: ObjValue) -> ObjValue {
+	pub fn with_super(&self, super_obj: Self) -> Self {
 		match &self.0.super_obj {
-			None => ObjValue::new(Some(super_obj), self.0.this_entries.clone()),
-			Some(v) => ObjValue::new(Some(v.with_super(super_obj)), self.0.this_entries.clone()),
+			None => Self::new(Some(super_obj), self.0.this_entries.clone()),
+			Some(v) => Self::new(Some(v.with_super(super_obj)), self.0.this_entries.clone()),
 		}
 	}
 	pub fn enum_fields(&self, handler: &impl Fn(&Rc<str>, &Visibility)) {
@@ -71,7 +68,7 @@
 			s.enum_fields(handler);
 		}
 		for (name, member) in self.0.this_entries.iter() {
-			handler(&name, &member.visibility);
+			handler(name, &member.visibility);
 		}
 	}
 	pub fn fields_visibility(&self) -> IndexMap<Rc<str>, bool> {
@@ -107,7 +104,7 @@
 	pub fn get(&self, key: Rc<str>) -> Result<Option<Val>> {
 		Ok(self.get_raw(key, self)?)
 	}
-	pub(crate) fn get_raw(&self, key: Rc<str>, real_this: &ObjValue) -> Result<Option<Val>> {
+	pub(crate) fn get_raw(&self, key: Rc<str>, real_this: &Self) -> Result<Option<Val>> {
 		let cache_key = (key.clone(), Rc::as_ptr(&real_this.0) as usize);
 
 		if let Some(v) = self.0.value_cache.borrow().get(&cache_key) {
@@ -135,7 +132,7 @@
 			.insert(cache_key, value.clone());
 		Ok(value)
 	}
-	fn evaluate_this(&self, v: &ObjMember, real_this: &ObjValue) -> Result<Val> {
+	fn evaluate_this(&self, v: &ObjMember, real_this: &Self) -> Result<Val> {
 		Ok(v.invoke
 			.evaluate(Some(real_this.clone()), self.0.super_obj.clone())?
 			.evaluate()?)
modifiedcrates/jrsonnet-evaluator/src/trace/mod.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/trace/mod.rs
+++ b/crates/jrsonnet-evaluator/src/trace/mod.rs
@@ -17,9 +17,9 @@
 impl PathResolver {
 	pub fn resolve(&self, from: &PathBuf) -> String {
 		match self {
-			PathResolver::FileName => from.file_name().unwrap().to_string_lossy().into_owned(),
-			PathResolver::Absolute => from.to_string_lossy().into_owned(),
-			PathResolver::Relative(base) => {
+			Self::FileName => from.file_name().unwrap().to_string_lossy().into_owned(),
+			Self::Absolute => from.to_string_lossy().into_owned(),
+			Self::Relative(base) => {
 				if from.is_relative() {
 					return from.to_string_lossy().into_owned();
 				}
modifiedcrates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -25,10 +25,10 @@
 pub struct LazyVal(Rc<RefCell<LazyValInternals>>);
 impl LazyVal {
 	pub fn new(f: Box<dyn Fn() -> Result<Val>>) -> Self {
-		LazyVal(Rc::new(RefCell::new(LazyValInternals::Waiting(f))))
+		Self(Rc::new(RefCell::new(LazyValInternals::Waiting(f))))
 	}
 	pub fn new_resolved(val: Val) -> Self {
-		LazyVal(Rc::new(RefCell::new(LazyValInternals::Computed(val))))
+		Self(Rc::new(RefCell::new(LazyValInternals::Computed(val))))
 	}
 	pub fn evaluate(&self) -> Result<Val> {
 		let new_value = match &*self.0.borrow() {
@@ -84,22 +84,22 @@
 impl PartialEq for FuncVal {
 	fn eq(&self, other: &Self) -> bool {
 		match (self, other) {
-			(FuncVal::Normal(a), FuncVal::Normal(b)) => a == b,
-			(FuncVal::Intrinsic(ans, an), FuncVal::Intrinsic(bns, bn)) => ans == bns && an == bn,
-			(FuncVal::NativeExt(an, _), FuncVal::NativeExt(bn, _)) => an == bn,
+			(Self::Normal(a), Self::Normal(b)) => a == b,
+			(Self::Intrinsic(ans, an), Self::Intrinsic(bns, bn)) => ans == bns && an == bn,
+			(Self::NativeExt(an, _), Self::NativeExt(bn, _)) => an == bn,
 			(..) => false,
 		}
 	}
 }
 impl FuncVal {
 	pub fn is_ident(&self) -> bool {
-		matches!(&self, FuncVal::Intrinsic(ns, n) if ns as &str == "std" && n as &str == "id")
+		matches!(&self, Self::Intrinsic(ns, n) if ns as &str == "std" && n as &str == "id")
 	}
 	pub fn name(&self) -> Rc<str> {
 		match self {
-			FuncVal::Normal(normal) => normal.name.clone(),
-			FuncVal::Intrinsic(ns, name) => format!("intrinsic.{}.{}", ns, name).into(),
-			FuncVal::NativeExt(n, _) => format!("native.{}", n).into(),
+			Self::Normal(normal) => normal.name.clone(),
+			Self::Intrinsic(ns, name) => format!("intrinsic.{}.{}", ns, name).into(),
+			Self::NativeExt(n, _) => format!("native.{}", n).into(),
 		}
 	}
 	pub fn evaluate(
@@ -110,7 +110,7 @@
 		tailstrict: bool,
 	) -> Result<Val> {
 		match self {
-			FuncVal::Normal(func) => {
+			Self::Normal(func) => {
 				let ctx = parse_function_call(
 					call_ctx,
 					Some(func.ctx.clone()),
@@ -120,8 +120,8 @@
 				)?;
 				evaluate(ctx, &func.body)
 			}
-			FuncVal::Intrinsic(ns, name) => call_builtin(call_ctx, loc, &ns, &name, args),
-			FuncVal::NativeExt(_name, handler) => {
+			Self::Intrinsic(ns, name) => call_builtin(call_ctx, loc, ns, name, args),
+			Self::NativeExt(_name, handler) => {
 				let args = parse_function_call(call_ctx, None, &handler.params, args, true)?;
 				let mut out_args = Vec::with_capacity(handler.params.len());
 				for p in handler.params.0.iter() {
@@ -139,7 +139,7 @@
 		tailstrict: bool,
 	) -> Result<Val> {
 		match self {
-			FuncVal::Normal(func) => {
+			Self::Normal(func) => {
 				let ctx = parse_function_call_map(
 					call_ctx,
 					Some(func.ctx.clone()),
@@ -149,19 +149,19 @@
 				)?;
 				evaluate(ctx, &func.body)
 			}
-			FuncVal::Intrinsic(_, _) => todo!(),
-			FuncVal::NativeExt(_, _) => todo!(),
+			Self::Intrinsic(_, _) => todo!(),
+			Self::NativeExt(_, _) => todo!(),
 		}
 	}
 
 	pub fn evaluate_values(&self, call_ctx: Context, args: &[Val]) -> Result<Val> {
 		match self {
-			FuncVal::Normal(func) => {
+			Self::Normal(func) => {
 				let ctx = place_args(call_ctx, Some(func.ctx.clone()), &func.params, args)?;
 				evaluate(ctx, &func.body)
 			}
-			FuncVal::Intrinsic(_, _) => todo!(),
-			FuncVal::NativeExt(_, _) => todo!(),
+			Self::Intrinsic(_, _) => todo!(),
+			Self::NativeExt(_, _) => todo!(),
 		}
 	}
 }
@@ -177,7 +177,7 @@
 	Func,
 }
 impl ValType {
-	pub fn name(&self) -> &'static str {
+	pub const fn name(&self) -> &'static str {
 		use ValType::*;
 		match self {
 			Bool => "boolean",
@@ -227,9 +227,9 @@
 impl Val {
 	/// Creates `Val::Num` after checking for numeric overflow.
 	/// As numbers are `f64`, we can just check for their finity.
-	pub fn new_checked_num(num: f64) -> Result<Val> {
+	pub fn new_checked_num(num: f64) -> Result<Self> {
 		if num.is_finite() {
-			Ok(Val::Num(num))
+			Ok(Self::Num(num))
 		} else {
 			throw!(RuntimeError("overflow".into()))
 		}
@@ -245,24 +245,24 @@
 	}
 	pub fn try_cast_bool(self, context: &'static str) -> Result<bool> {
 		self.assert_type(context, ValType::Bool)?;
-		Ok(matches_unwrap!(self.unwrap_if_lazy()?, Val::Bool(v), v))
+		Ok(matches_unwrap!(self.unwrap_if_lazy()?, Self::Bool(v), v))
 	}
 	pub fn try_cast_str(self, context: &'static str) -> Result<Rc<str>> {
 		self.assert_type(context, ValType::Str)?;
-		Ok(matches_unwrap!(self.unwrap_if_lazy()?, Val::Str(v), v))
+		Ok(matches_unwrap!(self.unwrap_if_lazy()?, Self::Str(v), v))
 	}
 	pub fn try_cast_num(self, context: &'static str) -> Result<f64> {
 		self.assert_type(context, ValType::Num)?;
-		Ok(matches_unwrap!(self.unwrap_if_lazy()?, Val::Num(v), v))
+		Ok(matches_unwrap!(self.unwrap_if_lazy()?, Self::Num(v), v))
 	}
 	pub fn inplace_unwrap(&mut self) -> Result<()> {
-		while let Val::Lazy(lazy) = self {
+		while let Self::Lazy(lazy) = self {
 			*self = lazy.evaluate()?;
 		}
 		Ok(())
 	}
 	pub fn unwrap_if_lazy(&self) -> Result<Self> {
-		Ok(if let Val::Lazy(v) = self {
+		Ok(if let Self::Lazy(v) = self {
 			v.evaluate()?.unwrap_if_lazy()?
 		} else {
 			self.clone()
@@ -270,27 +270,27 @@
 	}
 	pub fn value_type(&self) -> Result<ValType> {
 		Ok(match self {
-			Val::Str(..) => ValType::Str,
-			Val::Num(..) => ValType::Num,
-			Val::Arr(..) => ValType::Arr,
-			Val::Obj(..) => ValType::Obj,
-			Val::Bool(_) => ValType::Bool,
-			Val::Null => ValType::Null,
-			Val::Func(..) => ValType::Func,
-			Val::Lazy(_) => self.clone().unwrap_if_lazy()?.value_type()?,
+			Self::Str(..) => ValType::Str,
+			Self::Num(..) => ValType::Num,
+			Self::Arr(..) => ValType::Arr,
+			Self::Obj(..) => ValType::Obj,
+			Self::Bool(_) => ValType::Bool,
+			Self::Null => ValType::Null,
+			Self::Func(..) => ValType::Func,
+			Self::Lazy(_) => self.clone().unwrap_if_lazy()?.value_type()?,
 		})
 	}
 
 	pub fn to_string(&self) -> Result<Rc<str>> {
 		Ok(match self.unwrap_if_lazy()? {
-			Val::Bool(true) => "true".into(),
-			Val::Bool(false) => "false".into(),
-			Val::Null => "null".into(),
-			Val::Str(s) => s,
+			Self::Bool(true) => "true".into(),
+			Self::Bool(false) => "false".into(),
+			Self::Null => "null".into(),
+			Self::Str(s) => s,
 			v => manifest_json_ex(
 				&v,
 				&ManifestJsonOptions {
-					padding: &"",
+					padding: "",
 					mtype: ManifestType::ToString,
 				},
 			)?
@@ -301,7 +301,7 @@
 	/// Expects value to be object, outputs (key, manifested value) pairs
 	pub fn manifest_multi(&self, ty: &ManifestFormat) -> Result<Vec<(Rc<str>, Rc<str>)>> {
 		let obj = match self {
-			Val::Obj(obj) => obj,
+			Self::Obj(obj) => obj,
 			_ => throw!(MultiManifestOutputIsNotAObject),
 		};
 		let keys = obj.visible_fields();
@@ -319,7 +319,7 @@
 	/// Expects value to be array, outputs manifested values
 	pub fn manifest_stream(&self, ty: &ManifestFormat) -> Result<Vec<Rc<str>>> {
 		let arr = match self {
-			Val::Arr(a) => a,
+			Self::Arr(a) => a,
 			_ => throw!(StreamManifestOutputIsNotAArray),
 		};
 		let mut out = Vec::with_capacity(arr.len());
@@ -333,7 +333,7 @@
 		Ok(match ty {
 			ManifestFormat::YamlStream(format) => {
 				let arr = match self {
-					Val::Arr(a) => a,
+					Self::Arr(a) => a,
 					_ => throw!(StreamManifestOutputIsNotAArray),
 				};
 				let mut out = String::new();
@@ -358,7 +358,7 @@
 			ManifestFormat::Yaml(padding) => self.to_yaml(*padding)?,
 			ManifestFormat::Json(padding) => self.to_json(*padding)?,
 			ManifestFormat::String => match self {
-				Val::Str(s) => s.clone(),
+				Self::Str(s) => s.clone(),
 				_ => throw!(StringManifestOutputIsNotAString),
 			},
 		})
@@ -384,7 +384,7 @@
 	#[cfg(feature = "faster")]
 	pub fn to_std_json(&self, padding: usize) -> Result<Rc<str>> {
 		manifest_json_ex(
-			&self,
+			self,
 			&ManifestJsonOptions {
 				padding: &" ".repeat(padding),
 				mtype: ManifestType::Std,
@@ -441,7 +441,7 @@
 	}
 }
 
-fn is_function_like(val: &Val) -> bool {
+const fn is_function_like(val: &Val) -> bool {
 	matches!(val, Val::Func(_))
 }