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

difftreelog

style fix clippy warnings

Yaroslav Bolyukin2021-01-24parent: #2634495.patch.diff
in: master

9 files changed

modifiedcrates/jrsonnet-evaluator/src/builtin/manifest.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/builtin/manifest.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/manifest.rs
@@ -42,7 +42,7 @@
 			}
 		}
 		Val::Null => buf.push_str("null"),
-		Val::Str(s) => buf.push_str(&escape_string_json(&s)),
+		Val::Str(s) => buf.push_str(&escape_string_json(s)),
 		Val::Num(n) => write!(buf, "{}", n).unwrap(),
 		Val::Arr(items) => {
 			buf.push('[');
modifiedcrates/jrsonnet-evaluator/src/builtin/mod.rsdiffbeforeafterboth
before · crates/jrsonnet-evaluator/src/builtin/mod.rs
1use crate::{2	equals,3	error::{Error::*, Result},4	evaluate, parse_args, primitive_equals, push, throw,5	typed::CheckType,6	with_state, ArrValue, Context, FuncVal, LazyVal, Val,7};8use format::{format_arr, format_obj};9use jrsonnet_interner::IStr;10use jrsonnet_parser::{ArgsDesc, BinaryOpType, ExprLocation};11use jrsonnet_types::ty;12use std::{collections::HashMap, path::PathBuf, rc::Rc};1314pub mod stdlib;15pub use stdlib::*;1617use self::manifest::{escape_string_json, manifest_json_ex, ManifestJsonOptions, ManifestType};1819pub mod format;20pub mod manifest;21pub mod sort;2223fn std_format(str: IStr, vals: Val) -> Result<Val> {24	push(25		Some(&ExprLocation(Rc::from(PathBuf::from("std.jsonnet")), 0, 0)),26		|| format!("std.format of {}", str),27		|| {28			Ok(match vals {29				Val::Arr(vals) => Val::Str(format_arr(&str, &vals.evaluated()?)?.into()),30				Val::Obj(obj) => Val::Str(format_obj(&str, &obj)?.into()),31				o => Val::Str(format_arr(&str, &[o])?.into()),32			})33		},34	)35}3637type Builtin = fn(context: Context, loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val>;3839type BuiltinsType = HashMap<Box<str>, Builtin>;4041thread_local! {42	static BUILTINS: BuiltinsType = {43		[44			("length".into(), builtin_length as Builtin),45			("type".into(), builtin_type),46			("makeArray".into(), builtin_make_array),47			("codepoint".into(), builtin_codepoint),48			("objectFieldsEx".into(), builtin_object_fields_ex),49			("objectHasEx".into(), builtin_object_has_ex),50			("slice".into(), builtin_slice),51			("primitiveEquals".into(), builtin_primitive_equals),52			("equals".into(), builtin_equals),53			("modulo".into(), builtin_modulo),54			("mod".into(), builtin_mod),55			("floor".into(), builtin_floor),56			("log".into(), builtin_log),57			("pow".into(), builtin_pow),58			("extVar".into(), builtin_ext_var),59			("native".into(), builtin_native),60			("filter".into(), builtin_filter),61			("foldl".into(), builtin_foldl),62			("foldr".into(), builtin_foldr),63			("sortImpl".into(), builtin_sort_impl),64			("format".into(), builtin_format),65			("range".into(), builtin_range),66			("char".into(), builtin_char),67			("encodeUTF8".into(), builtin_encode_utf8),68			("md5".into(), builtin_md5),69			("base64".into(), builtin_base64),70			("trace".into(), builtin_trace),71			("join".into(), builtin_join),72			("escapeStringJson".into(), builtin_escape_string_json),73			("manifestJsonEx".into(), builtin_manifest_json_ex),74			("reverse".into(), builtin_reverse),75			("id".into(), builtin_id),76			("strReplace".into(), builtin_str_replace),77		].iter().cloned().collect()78	};79}8081fn builtin_length(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {82	parse_args!(context, "length", args, 1, [83		0, x: ty!((string | object | array));84	], {85		Ok(match x {86			Val::Str(n) => Val::Num(n.chars().count() as f64),87			Val::Arr(a) => Val::Num(a.len() as f64),88			Val::Obj(o) => Val::Num(89				o.fields_visibility()90					.into_iter()91					.filter(|(_k, v)| *v)92					.count() as f64,93			),94			_ => unreachable!(),95		})96	})97}9899fn builtin_type(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {100	parse_args!(context, "type", args, 1, [101		0, x: ty!(any);102	], {103		Ok(Val::Str(x.value_type().name().into()))104	})105}106107fn builtin_make_array(108	context: Context,109	_loc: Option<&ExprLocation>,110	args: &ArgsDesc,111) -> Result<Val> {112	parse_args!(context, "makeArray", args, 2, [113		0, sz: ty!(BoundedNumber<(Some(0.0)), (None)>) => Val::Num;114		1, func: ty!(function) => Val::Func;115	], {116		let mut out = Vec::with_capacity(sz as usize);117		for i in 0..sz as usize {118			out.push(LazyVal::new_resolved(func.evaluate_values(119				Context::new(),120				&[Val::Num(i as f64)]121			)?))122		}123		Ok(Val::Arr(out.into()))124	})125}126127fn builtin_codepoint(128	context: Context,129	_loc: Option<&ExprLocation>,130	args: &ArgsDesc,131) -> Result<Val> {132	parse_args!(context, "codepoint", args, 1, [133		0, str: ty!(char) => Val::Str;134	], {135		Ok(Val::Num(str.chars().next().unwrap() as u32 as f64))136	})137}138139fn builtin_object_fields_ex(140	context: Context,141	_loc: Option<&ExprLocation>,142	args: &ArgsDesc,143) -> Result<Val> {144	parse_args!(context, "objectFieldsEx", args, 2, [145		0, obj: ty!(object) => Val::Obj;146		1, inc_hidden: ty!(boolean) => Val::Bool;147	], {148		let mut out = obj.fields_visibility()149			.into_iter()150			.filter(|(_k, v)| *v || inc_hidden)151			.map(|(k, _v)|k)152			.collect::<Vec<_>>();153		out.sort();154		Ok(Val::Arr(out.into_iter().map(Val::Str).collect::<Vec<_>>().into()))155	})156}157158fn builtin_object_has_ex(159	context: Context,160	_loc: Option<&ExprLocation>,161	args: &ArgsDesc,162) -> Result<Val> {163	parse_args!(context, "objectHasEx", args, 3, [164		0, obj: ty!(object) => Val::Obj;165		1, f: ty!(string) => Val::Str;166		2, inc_hidden: ty!(boolean) => Val::Bool;167	], {168		Ok(Val::Bool(169			obj.fields_visibility()170				.into_iter()171				.filter(|(_k, v)| *v || inc_hidden)172				.any(|(k, _v)| *k == *f),173		))174	})175}176177// faster178fn builtin_slice(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {179	parse_args!(context, "slice", args, 4, [180		0, indexable: ty!((string | array));181		1, index: ty!((number | null));182		2, end: ty!((number | null));183		3, step: ty!((number | null));184	], {185		let index = match index {186			Val::Num(v) => v as usize,187			Val::Null => 0,188			_ => unreachable!(),189		};190		let end = match end {191			Val::Num(v) => v as usize,192			Val::Null => match &indexable {193				Val::Str(s) => s.chars().count(),194				Val::Arr(v) => v.len(),195				_ => unreachable!()196			},197			_ => unreachable!()198		};199		let step = match step {200			Val::Num(v) => v as usize,201			Val::Null => 1,202			_ => unreachable!()203		};204		match &indexable {205			Val::Str(s) => {206				Ok(Val::Str((s.chars().skip(index).take(end-index).step_by(step).collect::<String>()).into()))207			}208			Val::Arr(arr) => {209				Ok(Val::Arr((arr.iter().skip(index).take(end-index).step_by(step).collect::<Result<Vec<Val>>>()?).into()))210			}211			_ => unreachable!()212		}213	})214}215216// faster217fn builtin_primitive_equals(218	context: Context,219	_loc: Option<&ExprLocation>,220	args: &ArgsDesc,221) -> Result<Val> {222	parse_args!(context, "primitiveEquals", args, 2, [223		0, a: ty!(any);224		1, b: ty!(any);225	], {226		Ok(Val::Bool(primitive_equals(&a, &b)?))227	})228}229230// faster231fn builtin_equals(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {232	parse_args!(context, "equals", args, 2, [233		0, a: ty!(any);234		1, b: ty!(any);235	], {236		Ok(Val::Bool(equals(&a, &b)?))237	})238}239240fn builtin_modulo(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {241	parse_args!(context, "modulo", args, 2, [242		0, a: ty!(number) => Val::Num;243		1, b: ty!(number) => Val::Num;244	], {245		Ok(Val::Num(a % b))246	})247}248249fn builtin_mod(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {250	parse_args!(context, "mod", args, 2, [251		0, a: ty!((number | string));252		1, b: ty!(any);253	], {254		match (a, b) {255			(Val::Num(a), Val::Num(b)) => Ok(Val::Num(a % b)),256			(Val::Str(str), vals) => std_format(str, vals),257			(a, b) => throw!(BinaryOperatorDoesNotOperateOnValues(BinaryOpType::Mod, a.value_type(), b.value_type()))258		}259	})260}261262fn builtin_floor(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {263	parse_args!(context, "floor", args, 1, [264		0, x: ty!(number) => Val::Num;265	], {266		Ok(Val::Num(x.floor()))267	})268}269270fn builtin_log(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {271	parse_args!(context, "log", args, 1, [272		0, n: ty!(number) => Val::Num;273	], {274		Ok(Val::Num(n.ln()))275	})276}277278fn builtin_pow(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {279	parse_args!(context, "pow", args, 2, [280		0, x: ty!(number) => Val::Num;281		1, n: ty!(number) => Val::Num;282	], {283		Ok(Val::Num(x.powf(n)))284	})285}286287fn builtin_ext_var(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {288	parse_args!(context, "extVar", args, 1, [289		0, x: ty!(string) => Val::Str;290	], {291		Ok(with_state(|s| s.settings().ext_vars.get(&x).cloned()).ok_or(UndefinedExternalVariable(x))?)292	})293}294295fn builtin_native(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {296	parse_args!(context, "native", args, 1, [297		0, x: ty!(string) => Val::Str;298	], {299		Ok(with_state(|s| s.settings().ext_natives.get(&x).cloned()).map(|v| Val::Func(Rc::new(FuncVal::NativeExt(x.clone(), v)))).ok_or(UndefinedExternalFunction(x))?)300	})301}302303fn builtin_filter(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {304	parse_args!(context, "filter", args, 2, [305		0, func: ty!(function) => Val::Func;306		1, arr: ty!(array) => Val::Arr;307	], {308		let mut out = Vec::new();309		for item in arr.iter() {310			let item = item?;311			if func312						.evaluate_values(context.clone(), &[item.clone()])?313						.try_cast_bool("filter predicate")? {314							out.push(item);315						}316		}317		Ok(Val::Arr(out.into()))318	})319}320321fn builtin_foldl(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {322	parse_args!(context, "foldl", args, 3, [323		0, func: ty!(function) => Val::Func;324		1, arr: ty!(array) => Val::Arr;325		2, init: ty!(any);326	], {327		let mut acc = init;328		for i in arr.iter() {329			acc = func.evaluate_values(context.clone(), &[acc, i?])?;330		}331		Ok(acc)332	})333}334335fn builtin_foldr(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {336	parse_args!(context, "foldr", args, 3, [337		0, func: ty!(function) => Val::Func;338		1, arr: ty!(array) => Val::Arr;339		2, init: ty!(any);340	], {341		let mut acc = init;342		for i in arr.iter().rev() {343			acc = func.evaluate_values(context.clone(), &[acc, i?])?;344		}345		Ok(acc)346	})347}348349#[allow(non_snake_case)]350fn builtin_sort_impl(351	context: Context,352	_loc: Option<&ExprLocation>,353	args: &ArgsDesc,354) -> Result<Val> {355	parse_args!(context, "sort", args, 2, [356		0, arr: ty!(array) => Val::Arr;357		1, keyF: ty!(function) => Val::Func;358	], {359		if arr.len() <= 1 {360			return Ok(Val::Arr(arr))361		}362		Ok(Val::Arr(ArrValue::Eager(sort::sort(context, arr.evaluated()?, &keyF)?)))363	})364}365366// faster367fn builtin_format(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {368	parse_args!(context, "format", args, 2, [369		0, str: ty!(string) => Val::Str;370		1, vals: ty!(any)371	], {372		std_format(str, vals)373	})374}375376fn builtin_range(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {377	parse_args!(context, "range", args, 2, [378		0, from: ty!(number) => Val::Num;379		1, to: ty!(number) => Val::Num;380	], {381		let mut out = Vec::with_capacity((1+to as usize-from as usize).max(0));382		for i in from as usize..=to as usize {383			out.push(Val::Num(i as f64));384		}385		Ok(Val::Arr(out.into()))386	})387}388389fn builtin_char(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {390	parse_args!(context, "char", args, 1, [391		0, n: ty!(number) => Val::Num;392	], {393		let mut out = String::new();394		out.push(std::char::from_u32(n as u32).ok_or_else(||395			InvalidUnicodeCodepointGot(n as u32)396		)?);397		Ok(Val::Str(out.into()))398	})399}400401fn builtin_encode_utf8(402	context: Context,403	_loc: Option<&ExprLocation>,404	args: &ArgsDesc,405) -> Result<Val> {406	parse_args!(context, "encodeUTF8", args, 1, [407		0, str: ty!(string) => Val::Str;408	], {409		Ok(Val::Arr((str.bytes().map(|b| Val::Num(b as f64)).collect::<Vec<Val>>()).into()))410	})411}412413fn builtin_md5(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {414	parse_args!(context, "md5", args, 1, [415		0, str: ty!(string) => Val::Str;416	], {417		Ok(Val::Str(format!("{:x}", md5::compute(&str.as_bytes())).into()))418	})419}420421fn builtin_trace(context: Context, loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {422	parse_args!(context, "trace", args, 2, [423		0, str: ty!(string) => Val::Str;424		1, rest: ty!(any);425	], {426		eprint!("TRACE:");427		if let Some(loc) = loc {428			with_state(|s|{429				let locs = s.map_source_locations(&loc.0, &[loc.1]);430				eprint!(" {}:{}", loc.0.file_name().unwrap().to_str().unwrap(), locs[0].line);431			});432		}433		eprintln!(" {}", str);434		Ok(rest)435	})436}437438fn builtin_base64(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {439	parse_args!(context, "base64", args, 1, [440		0, input: ty!((string | (Array<number>)));441	], {442		Ok(Val::Str(match input {443			Val::Str(s) => {444				base64::encode(s.bytes().collect::<Vec<_>>()).into()445			},446			Val::Arr(a) => {447				base64::encode(a.iter().map(|v| {448					Ok(v?.clone().unwrap_num()? as u8)449				}).collect::<Result<Vec<_>>>()?).into()450			},451			_ => unreachable!()452		}))453	})454}455456fn builtin_join(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {457	parse_args!(context, "join", args, 2, [458		0, sep: ty!((string | array));459		1, arr: ty!(array) => Val::Arr;460	], {461		Ok(match sep {462			Val::Arr(joiner_items) => {463				let mut out = Vec::new();464465				let mut first = true;466				for item in arr.iter() {467					let item = item?.clone();468					if let Val::Arr(items) = item {469						if !first {470							out.reserve(joiner_items.len());471							// TODO: extend472							for item in joiner_items.iter() {473								out.push(item?);474							}475						}476						first = false;477						out.reserve(items.len());478						// TODO: extend479						for item in items.iter() {480							out.push(item?);481						}482					} else {483						throw!(RuntimeError("in std.join all items should be arrays".into()));484					}485				}486487				Val::Arr(out.into())488			},489			Val::Str(sep) => {490				let mut out = String::new();491492				let mut first = true;493				for item in arr.iter() {494					let item = item?.clone();495					if let Val::Str(item) = item {496						if !first {497							out += &sep;498						}499						first = false;500						out += &item;501					} else {502						throw!(RuntimeError("in std.join all items should be strings".into()));503					}504				}505506				Val::Str(out.into())507			},508			_ => unreachable!()509		})510	})511}512513// faster514fn builtin_escape_string_json(515	context: Context,516	_loc: Option<&ExprLocation>,517	args: &ArgsDesc,518) -> Result<Val> {519	parse_args!(context, "escapeStringJson", args, 1, [520		0, str_: ty!(string) => Val::Str;521	], {522		Ok(Val::Str(escape_string_json(&str_).into()))523	})524}525526// faster527fn builtin_manifest_json_ex(528	context: Context,529	_loc: Option<&ExprLocation>,530	args: &ArgsDesc,531) -> Result<Val> {532	parse_args!(context, "manifestJsonEx", args, 2, [533		0, value: ty!(any);534		1, indent: ty!(string) => Val::Str;535	], {536		Ok(Val::Str(manifest_json_ex(&value, &ManifestJsonOptions {537			padding: &indent,538			mtype: ManifestType::Std,539		})?.into()))540	})541}542543// faster544fn builtin_reverse(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {545	parse_args!(context, "reverse", args, 1, [546		0, value: ty!(array) => Val::Arr;547	], {548		Ok(Val::Arr(value.reversed()))549	})550}551552fn builtin_id(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {553	parse_args!(context, "id", args, 1, [554		0, v: ty!(any);555	], {556		Ok(v)557	})558}559560// faster561fn builtin_str_replace(562	context: Context,563	_loc: Option<&ExprLocation>,564	args: &ArgsDesc,565) -> Result<Val> {566	parse_args!(context, "strReplace", args, 3, [567		0, str: ty!(string) => Val::Str;568		1, from: ty!(string) => Val::Str;569		2, to: ty!(string) => Val::Str;570	], {571		let mut out = String::new();572		let mut last_idx = 0;573		while let Some(idx) = (&str[last_idx..]).find(&from as &str) {574			out.push_str(&str[last_idx..last_idx+idx]);575			out.push_str(&to);576			last_idx += idx + from.len();577		}578		if last_idx == 0 {579			return Ok(Val::Str(str))580		}581		out.push_str(&str[last_idx..]);582		Ok(Val::Str(out.into()))583	})584}585586pub fn call_builtin(587	context: Context,588	loc: Option<&ExprLocation>,589	name: &str,590	args: &ArgsDesc,591) -> Result<Val> {592	if let Some(f) = BUILTINS.with(|builtins| builtins.get(name).map(|f| *f)) {593		return Ok(f(context, loc, args)?);594	}595	throw!(IntrinsicNotFound(name.into()))596}
modifiedcrates/jrsonnet-evaluator/src/evaluate.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/evaluate.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate.rs
@@ -473,7 +473,6 @@
 					}
 					v.get(n as usize)?
 						.ok_or_else(|| ArrayBoundsError(n as usize, v.len()))?
-						.clone()
 				}
 				(Val::Arr(_), Val::Str(n)) => throw!(AttemptedIndexAnArrayWithString(n)),
 				(Val::Arr(_), n) => throw!(ValueIndexMustBeTypeGot(
modifiedcrates/jrsonnet-evaluator/src/native.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/native.rs
+++ b/crates/jrsonnet-evaluator/src/native.rs
@@ -1,3 +1,5 @@
+#![allow(clippy::type_complexity)]
+
 use crate::{error::Result, Val};
 use jrsonnet_parser::ParamsDesc;
 use std::fmt::Debug;
modifiedcrates/jrsonnet-evaluator/src/obj.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/obj.rs
+++ b/crates/jrsonnet-evaluator/src/obj.rs
@@ -34,7 +34,7 @@
 		}
 		let mut debug = f.debug_struct("ObjValue");
 		for (name, member) in self.0.this_entries.iter() {
-			debug.field(&name, member);
+			debug.field(name, member);
 		}
 		#[cfg(feature = "unstable")]
 		{
@@ -140,7 +140,7 @@
 			.evaluate()?)
 	}
 
-	pub fn ptr_eq(a: &ObjValue, b: &ObjValue) -> bool {
+	pub fn ptr_eq(a: &Self, b: &Self) -> bool {
 		Rc::ptr_eq(&a.0, &b.0)
 	}
 }
modifiedcrates/jrsonnet-evaluator/src/typed.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/typed.rs
+++ b/crates/jrsonnet-evaluator/src/typed.rs
@@ -29,7 +29,7 @@
 pub struct TypeLocError(Box<TypeError>, ValuePathStack);
 impl From<TypeError> for TypeLocError {
 	fn from(e: TypeError) -> Self {
-		TypeLocError(Box::new(e), ValuePathStack(Vec::new()))
+		Self(Box::new(e), ValuePathStack(Vec::new()))
 	}
 }
 impl From<TypeLocError> for LocError {
@@ -61,7 +61,7 @@
 			write!(out, "{}", err)?;
 
 			for (i, line) in out.lines().enumerate() {
-				if line.trim().len() == 0 {
+				if line.trim().is_empty() {
 					continue;
 				}
 				if i != 0 {
@@ -118,8 +118,8 @@
 impl Display for ValuePathItem {
 	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
 		match self {
-			ValuePathItem::Field(name) => write!(f, ".{}", name)?,
-			ValuePathItem::Index(idx) => write!(f, "[{}]", idx)?,
+			Self::Field(name) => write!(f, ".{}", name)?,
+			Self::Index(idx) => write!(f, "[{}]", idx)?,
 		}
 		Ok(())
 	}
@@ -140,25 +140,25 @@
 impl CheckType for ComplexValType {
 	fn check(&self, value: &Val) -> Result<()> {
 		match self {
-			ComplexValType::Any => Ok(()),
-			ComplexValType::Simple(s) => s.check(value),
-			ComplexValType::Char => match value {
+			Self::Any => Ok(()),
+			Self::Simple(s) => s.check(value),
+			Self::Char => match value {
 				Val::Str(s) if s.len() == 1 || s.chars().count() == 1 => Ok(()),
 				v => Err(TypeError::ExpectedGot(self.clone(), v.value_type()).into()),
 			},
-			ComplexValType::BoundedNumber(from, to) => {
+			Self::BoundedNumber(from, to) => {
 				if let Val::Num(n) = value {
 					if from.map(|from| from > *n).unwrap_or(false)
 						|| to.map(|to| to <= *n).unwrap_or(false)
 					{
-						return Err(TypeError::BoundsFailed(*n, from.clone(), to.clone()).into());
+						return Err(TypeError::BoundsFailed(*n, *from, *to).into());
 					}
 					Ok(())
 				} else {
 					Err(TypeError::ExpectedGot(self.clone(), value.value_type()).into())
 				}
 			}
-			ComplexValType::Array(elem_type) => match value {
+			Self::Array(elem_type) => match value {
 				Val::Arr(a) => {
 					for (i, item) in a.iter().enumerate() {
 						push_type(
@@ -170,9 +170,9 @@
 					}
 					Ok(())
 				}
-				v => return Err(TypeError::ExpectedGot(self.clone(), v.value_type()).into()),
+				v => Err(TypeError::ExpectedGot(self.clone(), v.value_type()).into()),
 			},
-			ComplexValType::ArrayRef(elem_type) => match value {
+			Self::ArrayRef(elem_type) => match value {
 				Val::Arr(a) => {
 					for (i, item) in a.iter().enumerate() {
 						push_type(
@@ -184,9 +184,9 @@
 					}
 					Ok(())
 				}
-				v => return Err(TypeError::ExpectedGot(self.clone(), v.value_type()).into()),
+				v => Err(TypeError::ExpectedGot(self.clone(), v.value_type()).into()),
 			},
-			ComplexValType::ObjectRef(elems) => match value {
+			Self::ObjectRef(elems) => match value {
 				Val::Obj(obj) => {
 					for (k, v) in elems.iter() {
 						if let Some(got_v) = obj.get((*k).into())? {
@@ -202,11 +202,11 @@
 							);
 						}
 					}
-					return Ok(());
+					Ok(())
 				}
-				v => return Err(TypeError::ExpectedGot(self.clone(), v.value_type()).into()),
+				v => Err(TypeError::ExpectedGot(self.clone(), v.value_type()).into()),
 			},
-			ComplexValType::Union(types) => {
+			Self::Union(types) => {
 				let mut errors = Vec::new();
 				for ty in types.iter() {
 					match ty.check(value) {
@@ -219,9 +219,9 @@
 						},
 					}
 				}
-				return Err(TypeError::UnionFailed(self.clone(), TypeLocErrorList(errors)).into());
+				Err(TypeError::UnionFailed(self.clone(), TypeLocErrorList(errors)).into())
 			}
-			ComplexValType::UnionRef(types) => {
+			Self::UnionRef(types) => {
 				let mut errors = Vec::new();
 				for ty in types.iter() {
 					match ty.check(value) {
@@ -234,15 +234,15 @@
 						},
 					}
 				}
-				return Err(TypeError::UnionFailed(self.clone(), TypeLocErrorList(errors)).into());
+				Err(TypeError::UnionFailed(self.clone(), TypeLocErrorList(errors)).into())
 			}
-			ComplexValType::Sum(types) => {
+			Self::Sum(types) => {
 				for ty in types.iter() {
 					ty.check(value)?
 				}
 				Ok(())
 			}
-			ComplexValType::SumRef(types) => {
+			Self::SumRef(types) => {
 				for ty in types.iter() {
 					ty.check(value)?
 				}
modifiedcrates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -176,14 +176,14 @@
 pub enum ArrValue {
 	Lazy(Rc<Vec<LazyVal>>),
 	Eager(Rc<Vec<Val>>),
-	Extended(Box<(ArrValue, ArrValue)>),
+	Extended(Box<(Self, Self)>),
 }
 impl ArrValue {
 	pub fn len(&self) -> usize {
 		match self {
-			ArrValue::Lazy(l) => l.len(),
-			ArrValue::Eager(e) => e.len(),
-			ArrValue::Extended(v) => v.0.len() + v.1.len(),
+			Self::Lazy(l) => l.len(),
+			Self::Eager(e) => e.len(),
+			Self::Extended(v) => v.0.len() + v.1.len(),
 		}
 	}
 
@@ -193,15 +193,15 @@
 
 	pub fn get(&self, index: usize) -> Result<Option<Val>> {
 		match self {
-			ArrValue::Lazy(vec) => {
+			Self::Lazy(vec) => {
 				if let Some(v) = vec.get(index) {
 					Ok(Some(v.evaluate()?))
 				} else {
 					Ok(None)
 				}
 			}
-			ArrValue::Eager(vec) => Ok(vec.get(index).cloned()),
-			ArrValue::Extended(v) => {
+			Self::Eager(vec) => Ok(vec.get(index).cloned()),
+			Self::Extended(v) => {
 				let a_len = v.0.len();
 				if a_len > index {
 					v.0.get(index)
@@ -214,12 +214,9 @@
 
 	pub fn get_lazy(&self, index: usize) -> Option<LazyVal> {
 		match self {
-			ArrValue::Lazy(vec) => vec.get(index).cloned(),
-			ArrValue::Eager(vec) => vec
-				.get(index)
-				.cloned()
-				.map(|val| LazyVal::new_resolved(val)),
-			ArrValue::Extended(v) => {
+			Self::Lazy(vec) => vec.get(index).cloned(),
+			Self::Eager(vec) => vec.get(index).cloned().map(LazyVal::new_resolved),
+			Self::Extended(v) => {
 				let a_len = v.0.len();
 				if a_len > index {
 					v.0.get_lazy(index)
@@ -232,15 +229,15 @@
 
 	pub fn evaluated(&self) -> Result<Rc<Vec<Val>>> {
 		Ok(match self {
-			ArrValue::Lazy(vec) => {
+			Self::Lazy(vec) => {
 				let mut out = Vec::with_capacity(vec.len());
 				for item in vec.iter() {
 					out.push(item.evaluate()?);
 				}
 				Rc::new(out)
 			}
-			ArrValue::Eager(vec) => vec.clone(),
-			ArrValue::Extended(v) => {
+			Self::Eager(vec) => vec.clone(),
+			Self::Extended(_v) => {
 				let mut out = Vec::with_capacity(self.len());
 				for item in self.iter() {
 					out.push(item?);
@@ -252,40 +249,40 @@
 
 	pub fn iter(&self) -> impl DoubleEndedIterator<Item = Result<Val>> + '_ {
 		(0..self.len()).map(move |idx| match self {
-			ArrValue::Lazy(l) => l[idx].evaluate(),
-			ArrValue::Eager(e) => Ok(e[idx].clone()),
-			ArrValue::Extended(_) => self.get(idx).map(|e| e.unwrap()),
+			Self::Lazy(l) => l[idx].evaluate(),
+			Self::Eager(e) => Ok(e[idx].clone()),
+			Self::Extended(_) => self.get(idx).map(|e| e.unwrap()),
 		})
 	}
 
 	pub fn iter_lazy(&self) -> impl DoubleEndedIterator<Item = LazyVal> + '_ {
 		(0..self.len()).map(move |idx| match self {
-			ArrValue::Lazy(l) => l[idx].clone(),
-			ArrValue::Eager(e) => LazyVal::new_resolved(e[idx].clone()),
-			ArrValue::Extended(_) => self.get_lazy(idx).unwrap(),
+			Self::Lazy(l) => l[idx].clone(),
+			Self::Eager(e) => LazyVal::new_resolved(e[idx].clone()),
+			Self::Extended(_) => self.get_lazy(idx).unwrap(),
 		})
 	}
 
 	pub fn reversed(self) -> Self {
 		match self {
-			ArrValue::Lazy(vec) => {
+			Self::Lazy(vec) => {
 				let mut out = (&vec as &Vec<_>).clone();
 				out.reverse();
 				Self::Lazy(Rc::new(out))
 			}
-			ArrValue::Eager(vec) => {
+			Self::Eager(vec) => {
 				let mut out = (&vec as &Vec<_>).clone();
 				out.reverse();
 				Self::Eager(Rc::new(out))
 			}
-			ArrValue::Extended(b) => ArrValue::Extended(Box::new((b.1.reversed(), b.0.reversed()))),
+			Self::Extended(b) => Self::Extended(Box::new((b.1.reversed(), b.0.reversed()))),
 		}
 	}
 
-	pub fn ptr_eq(a: &ArrValue, b: &ArrValue) -> bool {
+	pub fn ptr_eq(a: &Self, b: &Self) -> bool {
 		match (a, b) {
-			(ArrValue::Lazy(a), ArrValue::Lazy(b)) => Rc::ptr_eq(a, b),
-			(ArrValue::Eager(a), ArrValue::Eager(b)) => Rc::ptr_eq(a, b),
+			(Self::Lazy(a), Self::Lazy(b)) => Rc::ptr_eq(a, b),
+			(Self::Eager(a), Self::Eager(b)) => Rc::ptr_eq(a, b),
 			_ => false,
 		}
 	}
@@ -359,7 +356,7 @@
 		self.assert_type(context, ValType::Num)?;
 		self.unwrap_num()
 	}
-	pub fn value_type(&self) -> ValType {
+	pub const fn value_type(&self) -> ValType {
 		match self {
 			Self::Str(..) => ValType::Str,
 			Self::Num(..) => ValType::Num,
@@ -378,7 +375,7 @@
 			Self::Null => "null".into(),
 			Self::Str(s) => s.clone(),
 			v => manifest_json_ex(
-				&v,
+				v,
 				&ManifestJsonOptions {
 					padding: "",
 					mtype: ManifestType::ToString,
@@ -556,7 +553,7 @@
 		(Val::Obj(_), Val::Obj(_)) => throw!(RuntimeError(
 			"primitiveEquals operates on primitive types, got object".into(),
 		)),
-		(a, b) if is_function_like(&a) && is_function_like(&b) => {
+		(a, b) if is_function_like(a) && is_function_like(b) => {
 			throw!(RuntimeError("cannot test equality of functions".into()))
 		}
 		(_, _) => false,
@@ -598,6 +595,6 @@
 			}
 			Ok(true)
 		}
-		(a, b) => Ok(primitive_equals(&a, &b)?),
+		(a, b) => Ok(primitive_equals(a, b)?),
 	}
 }
modifiedcrates/jrsonnet-interner/src/lib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-interner/src/lib.rs
+++ b/crates/jrsonnet-interner/src/lib.rs
@@ -68,7 +68,7 @@
 		IStr(STR_POOL.with(|pool| {
 			let mut pool = pool.borrow_mut();
 			if let Some((k, _)) = pool.get_key_value(str) {
-				return k.clone();
+				k.clone()
 			} else {
 				let rc: Rc<str> = str.into();
 				pool.insert(rc.clone(), ());
modifiedcrates/jrsonnet-types/src/lib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-types/src/lib.rs
+++ b/crates/jrsonnet-types/src/lib.rs
@@ -133,10 +133,8 @@
 	union: &[ComplexValType],
 ) -> std::fmt::Result {
 	for (i, v) in union.iter().enumerate() {
-		let should_add_braces = match v {
-			ComplexValType::UnionRef(_) | ComplexValType::Union(_) if !is_union => true,
-			_ => false,
-		};
+		let should_add_braces =
+			matches!(v, ComplexValType::UnionRef(_) | ComplexValType::Union(_) if !is_union);
 		if i != 0 {
 			write!(f, " {} ", if is_union { '|' } else { '&' })?;
 		}