git.delta.rocks / jrsonnet / refs/commits / 8766467a8ebe

difftreelog

style fix clippy warnings

Yaroslav Bolyukin2021-06-12parent: #e71a0d8.patch.diff
in: master

5 files changed

modifiedcrates/jrsonnet-evaluator/src/builtin/mod.rsdiffbeforeafterboth
before · crates/jrsonnet-evaluator/src/builtin/mod.rs
1use crate::{2	equals,3	error::{Error::*, Result},4	parse_args, primitive_equals, push, throw, with_state, ArrValue, Context, DebugGcTraceValue,5	EvaluationState, FuncVal, LazyVal, Val,6};7use format::{format_arr, format_obj};8use gc::Gc;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			("map".into(), builtin_map),62			("foldl".into(), builtin_foldl),63			("foldr".into(), builtin_foldr),64			("sortImpl".into(), builtin_sort_impl),65			("format".into(), builtin_format),66			("range".into(), builtin_range),67			("char".into(), builtin_char),68			("encodeUTF8".into(), builtin_encode_utf8),69			("md5".into(), builtin_md5),70			("base64".into(), builtin_base64),71			("trace".into(), builtin_trace),72			("gc".into(), builtin_gc),73			("gcTrace".into(), builtin_gc_trace),74			("join".into(), builtin_join),75			("escapeStringJson".into(), builtin_escape_string_json),76			("manifestJsonEx".into(), builtin_manifest_json_ex),77			("reverse".into(), builtin_reverse),78			("id".into(), builtin_id),79			("strReplace".into(), builtin_str_replace),80			("parseJson".into(), builtin_parse_json),81		].iter().cloned().collect()82	};83}8485fn builtin_length(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {86	parse_args!(context, "length", args, 1, [87		0, x: ty!((string | object | array));88	], {89		Ok(match x {90			Val::Str(n) => Val::Num(n.chars().count() as f64),91			Val::Arr(a) => Val::Num(a.len() as f64),92			Val::Obj(o) => Val::Num(93				o.fields_visibility()94					.into_iter()95					.filter(|(_k, v)| *v)96					.count() as f64,97			),98			_ => unreachable!(),99		})100	})101}102103fn builtin_type(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {104	parse_args!(context, "type", args, 1, [105		0, x: ty!(any);106	], {107		Ok(Val::Str(x.value_type().name().into()))108	})109}110111fn builtin_make_array(112	context: Context,113	_loc: Option<&ExprLocation>,114	args: &ArgsDesc,115) -> Result<Val> {116	parse_args!(context, "makeArray", args, 2, [117		0, sz: ty!(BoundedNumber<(Some(0.0)), (None)>) => Val::Num;118		1, func: ty!(function) => Val::Func;119	], {120		let mut out = Vec::with_capacity(sz as usize);121		for i in 0..sz as usize {122			out.push(LazyVal::new_resolved(func.evaluate_values(123				context.clone(),124				&[Val::Num(i as f64)]125			)?))126		}127		Ok(Val::Arr(out.into()))128	})129}130131fn builtin_codepoint(132	context: Context,133	_loc: Option<&ExprLocation>,134	args: &ArgsDesc,135) -> Result<Val> {136	parse_args!(context, "codepoint", args, 1, [137		0, str: ty!(char) => Val::Str;138	], {139		Ok(Val::Num(str.chars().next().unwrap() as u32 as f64))140	})141}142143fn builtin_object_fields_ex(144	context: Context,145	_loc: Option<&ExprLocation>,146	args: &ArgsDesc,147) -> Result<Val> {148	parse_args!(context, "objectFieldsEx", args, 2, [149		0, obj: ty!(object) => Val::Obj;150		1, inc_hidden: ty!(boolean) => Val::Bool;151	], {152		let out = obj.fields_ex(inc_hidden);153		Ok(Val::Arr(out.into_iter().map(Val::Str).collect::<Vec<_>>().into()))154	})155}156157fn builtin_object_has_ex(158	context: Context,159	_loc: Option<&ExprLocation>,160	args: &ArgsDesc,161) -> Result<Val> {162	parse_args!(context, "objectHasEx", args, 3, [163		0, obj: ty!(object) => Val::Obj;164		1, f: ty!(string) => Val::Str;165		2, inc_hidden: ty!(boolean) => Val::Bool;166	], {167		Ok(Val::Bool(obj.has_field_ex(f, inc_hidden)))168	})169}170171fn builtin_parse_json(172	context: Context,173	_loc: Option<&ExprLocation>,174	args: &ArgsDesc,175) -> Result<Val> {176	parse_args!(context, "parseJson", args, 1, [177		0, s: ty!(string) => Val::Str;178	], {179		let state = EvaluationState::default();180		let path = Rc::new(PathBuf::from("std.parseJson"));181		state.evaluate_snippet_raw(path ,s)182	})183}184185// faster186fn builtin_slice(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {187	parse_args!(context, "slice", args, 4, [188		0, indexable: ty!((string | array));189		1, index: ty!((number | null));190		2, end: ty!((number | null));191		3, step: ty!((number | null));192	], {193		let index = match index {194			Val::Num(v) => v as usize,195			Val::Null => 0,196			_ => unreachable!(),197		};198		let end = match end {199			Val::Num(v) => v as usize,200			Val::Null => match &indexable {201				Val::Str(s) => s.chars().count(),202				Val::Arr(v) => v.len(),203				_ => unreachable!()204			},205			_ => unreachable!()206		};207		let step = match step {208			Val::Num(v) => v as usize,209			Val::Null => 1,210			_ => unreachable!()211		};212		match &indexable {213			Val::Str(s) => {214				Ok(Val::Str((s.chars().skip(index).take(end-index).step_by(step).collect::<String>()).into()))215			}216			Val::Arr(arr) => {217				Ok(Val::Arr((arr.iter().skip(index).take(end-index).step_by(step).collect::<Result<Vec<Val>>>()?).into()))218			}219			_ => unreachable!()220		}221	})222}223224// faster225fn builtin_primitive_equals(226	context: Context,227	_loc: Option<&ExprLocation>,228	args: &ArgsDesc,229) -> Result<Val> {230	parse_args!(context, "primitiveEquals", args, 2, [231		0, a: ty!(any);232		1, b: ty!(any);233	], {234		Ok(Val::Bool(primitive_equals(&a, &b)?))235	})236}237238// faster239fn builtin_equals(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {240	parse_args!(context, "equals", args, 2, [241		0, a: ty!(any);242		1, b: ty!(any);243	], {244		Ok(Val::Bool(equals(&a, &b)?))245	})246}247248fn builtin_modulo(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {249	parse_args!(context, "modulo", args, 2, [250		0, a: ty!(number) => Val::Num;251		1, b: ty!(number) => Val::Num;252	], {253		Ok(Val::Num(a % b))254	})255}256257fn builtin_mod(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {258	parse_args!(context, "mod", args, 2, [259		0, a: ty!((number | string));260		1, b: ty!(any);261	], {262		match (a, b) {263			(Val::Num(a), Val::Num(b)) => Ok(Val::Num(a % b)),264			(Val::Str(str), vals) => std_format(str, vals),265			(a, b) => throw!(BinaryOperatorDoesNotOperateOnValues(BinaryOpType::Mod, a.value_type(), b.value_type()))266		}267	})268}269270fn builtin_floor(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {271	parse_args!(context, "floor", args, 1, [272		0, x: ty!(number) => Val::Num;273	], {274		Ok(Val::Num(x.floor()))275	})276}277278fn builtin_log(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {279	parse_args!(context, "log", args, 1, [280		0, n: ty!(number) => Val::Num;281	], {282		Ok(Val::Num(n.ln()))283	})284}285286fn builtin_pow(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {287	parse_args!(context, "pow", args, 2, [288		0, x: ty!(number) => Val::Num;289		1, n: ty!(number) => Val::Num;290	], {291		Ok(Val::Num(x.powf(n)))292	})293}294295fn builtin_ext_var(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {296	parse_args!(context, "extVar", args, 1, [297		0, x: ty!(string) => Val::Str;298	], {299		Ok(with_state(|s| s.settings().ext_vars.get(&x).cloned()).ok_or(UndefinedExternalVariable(x))?)300	})301}302303fn builtin_native(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {304	parse_args!(context, "native", args, 1, [305		0, x: ty!(string) => Val::Str;306	], {307		Ok(with_state(|s| s.settings().ext_natives.get(&x).cloned()).map(|v| Val::Func(Gc::new(FuncVal::NativeExt(x.clone(), v)))).ok_or(UndefinedExternalFunction(x))?)308	})309}310311fn builtin_filter(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {312	parse_args!(context, "filter", args, 2, [313		0, func: ty!(function) => Val::Func;314		1, arr: ty!(array) => Val::Arr;315	], {316		Ok(Val::Arr(arr.filter(|val| func317			.evaluate_values(context.clone(), &[val.clone()])?318			.try_cast_bool("filter predicate"))?))319	})320}321322fn builtin_map(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {323	parse_args!(context, "map", args, 2, [324		0, func: ty!(function) => Val::Func;325		1, arr: ty!(array) => Val::Arr;326	], {327		Ok(Val::Arr(arr.map(|val| func328			.evaluate_values(context.clone(), &[val]))?))329	})330}331332fn builtin_foldl(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {333	parse_args!(context, "foldl", args, 3, [334		0, func: ty!(function) => Val::Func;335		1, arr: ty!(array) => Val::Arr;336		2, init: ty!(any);337	], {338		let mut acc = init;339		for i in arr.iter() {340			acc = func.evaluate_values(context.clone(), &[acc, i?])?;341		}342		Ok(acc)343	})344}345346fn builtin_foldr(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {347	parse_args!(context, "foldr", args, 3, [348		0, func: ty!(function) => Val::Func;349		1, arr: ty!(array) => Val::Arr;350		2, init: ty!(any);351	], {352		let mut acc = init;353		for i in arr.iter().rev() {354			acc = func.evaluate_values(context.clone(), &[acc, i?])?;355		}356		Ok(acc)357	})358}359360#[allow(non_snake_case)]361fn builtin_sort_impl(362	context: Context,363	_loc: Option<&ExprLocation>,364	args: &ArgsDesc,365) -> Result<Val> {366	parse_args!(context, "sort", args, 2, [367		0, arr: ty!(array) => Val::Arr;368		1, keyF: ty!(function) => Val::Func;369	], {370		if arr.len() <= 1 {371			return Ok(Val::Arr(arr))372		}373		Ok(Val::Arr(ArrValue::Eager(sort::sort(context, arr.evaluated()?, &keyF)?)))374	})375}376377// faster378fn builtin_format(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {379	parse_args!(context, "format", args, 2, [380		0, str: ty!(string) => Val::Str;381		1, vals: ty!(any)382	], {383		std_format(str, vals)384	})385}386387fn builtin_range(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {388	parse_args!(context, "range", args, 2, [389		0, from: ty!(number) => Val::Num;390		1, to: ty!(number) => Val::Num;391	], {392		if to < from {393			return Ok(Val::Arr(ArrValue::new_eager()))394		}395		let mut out = Vec::with_capacity((1+to as usize-from as usize).max(0));396		for i in from as usize..=to as usize {397			out.push(Val::Num(i as f64));398		}399		Ok(Val::Arr(out.into()))400	})401}402403fn builtin_char(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {404	parse_args!(context, "char", args, 1, [405		0, n: ty!(number) => Val::Num;406	], {407		let mut out = String::new();408		out.push(std::char::from_u32(n as u32).ok_or_else(||409			InvalidUnicodeCodepointGot(n as u32)410		)?);411		Ok(Val::Str(out.into()))412	})413}414415fn builtin_encode_utf8(416	context: Context,417	_loc: Option<&ExprLocation>,418	args: &ArgsDesc,419) -> Result<Val> {420	parse_args!(context, "encodeUTF8", args, 1, [421		0, str: ty!(string) => Val::Str;422	], {423		Ok(Val::Arr((str.bytes().map(|b| Val::Num(b as f64)).collect::<Vec<Val>>()).into()))424	})425}426427fn builtin_md5(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {428	parse_args!(context, "md5", args, 1, [429		0, str: ty!(string) => Val::Str;430	], {431		Ok(Val::Str(format!("{:x}", md5::compute(&str.as_bytes())).into()))432	})433}434435fn builtin_trace(context: Context, loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {436	parse_args!(context, "trace", args, 2, [437		0, str: ty!(string) => Val::Str;438		1, rest: ty!(any);439	], {440		eprint!("TRACE:");441		if let Some(loc) = loc {442			with_state(|s|{443				let locs = s.map_source_locations(&loc.0, &[loc.1]);444				eprint!(" {}:{}", loc.0.file_name().unwrap().to_str().unwrap(), locs[0].line);445			});446		}447		eprintln!(" {}", str);448		Ok(rest)449	})450}451452fn builtin_gc(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {453	parse_args!(context, "gc", args, 1, [454		0, rest: ty!(any);455	], {456		println!("GC start");457		gc::force_collect();458		println!("GC done");459460		Ok(rest)461	})462}463464fn builtin_gc_trace(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {465	parse_args!(context, "gcTrace", args, 2, [466		0, name: ty!(string) => Val::Str;467		1, rest: ty!(any);468	], {469470		Ok(DebugGcTraceValue::new(name, rest))471	})472}473474fn builtin_base64(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {475	parse_args!(context, "base64", args, 1, [476		0, input: ty!((string | (Array<number>)));477	], {478		Ok(Val::Str(match input {479			Val::Str(s) => {480				base64::encode(s.bytes().collect::<Vec<_>>()).into()481			},482			Val::Arr(a) => {483				base64::encode(a.iter().map(|v| {484					Ok(v?.unwrap_num()? as u8)485				}).collect::<Result<Vec<_>>>()?).into()486			},487			_ => unreachable!()488		}))489	})490}491492fn builtin_join(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {493	parse_args!(context, "join", args, 2, [494		0, sep: ty!((string | array));495		1, arr: ty!(array) => Val::Arr;496	], {497		Ok(match sep {498			Val::Arr(joiner_items) => {499				let mut out = Vec::new();500501				let mut first = true;502				for item in arr.iter() {503					let item = item?.clone();504					if let Val::Arr(items) = item {505						if !first {506							out.reserve(joiner_items.len());507							// TODO: extend508							for item in joiner_items.iter() {509								out.push(item?);510							}511						}512						first = false;513						out.reserve(items.len());514						// TODO: extend515						for item in items.iter() {516							out.push(item?);517						}518					} else {519						throw!(RuntimeError("in std.join all items should be arrays".into()));520					}521				}522523				Val::Arr(out.into())524			},525			Val::Str(sep) => {526				let mut out = String::new();527528				let mut first = true;529				for item in arr.iter() {530					let item = item?.clone();531					if let Val::Str(item) = item {532						if !first {533							out += &sep;534						}535						first = false;536						out += &item;537					} else {538						throw!(RuntimeError("in std.join all items should be strings".into()));539					}540				}541542				Val::Str(out.into())543			},544			_ => unreachable!()545		})546	})547}548549// faster550fn builtin_escape_string_json(551	context: Context,552	_loc: Option<&ExprLocation>,553	args: &ArgsDesc,554) -> Result<Val> {555	parse_args!(context, "escapeStringJson", args, 1, [556		0, str_: ty!(string) => Val::Str;557	], {558		Ok(Val::Str(escape_string_json(&str_).into()))559	})560}561562// faster563fn builtin_manifest_json_ex(564	context: Context,565	_loc: Option<&ExprLocation>,566	args: &ArgsDesc,567) -> Result<Val> {568	parse_args!(context, "manifestJsonEx", args, 2, [569		0, value: ty!(any);570		1, indent: ty!(string) => Val::Str;571	], {572		Ok(Val::Str(manifest_json_ex(&value, &ManifestJsonOptions {573			padding: &indent,574			mtype: ManifestType::Std,575		})?.into()))576	})577}578579// faster580fn builtin_reverse(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {581	parse_args!(context, "reverse", args, 1, [582		0, value: ty!(array) => Val::Arr;583	], {584		Ok(Val::Arr(value.reversed()))585	})586}587588fn builtin_id(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {589	parse_args!(context, "id", args, 1, [590		0, v: ty!(any);591	], {592		Ok(v)593	})594}595596// faster597fn builtin_str_replace(598	context: Context,599	_loc: Option<&ExprLocation>,600	args: &ArgsDesc,601) -> Result<Val> {602	parse_args!(context, "strReplace", args, 3, [603		0, str: ty!(string) => Val::Str;604		1, from: ty!(string) => Val::Str;605		2, to: ty!(string) => Val::Str;606	], {607		let mut out = String::new();608		let mut last_idx = 0;609		while let Some(idx) = (&str[last_idx..]).find(&from as &str) {610			out.push_str(&str[last_idx..last_idx+idx]);611			out.push_str(&to);612			last_idx += idx + from.len();613		}614		if last_idx == 0 {615			return Ok(Val::Str(str))616		}617		out.push_str(&str[last_idx..]);618		Ok(Val::Str(out.into()))619	})620}621622pub fn call_builtin(623	context: Context,624	loc: Option<&ExprLocation>,625	name: &str,626	args: &ArgsDesc,627) -> Result<Val> {628	BUILTINS629		.with(|builtins| builtins.get(name).copied())630		.ok_or_else(|| IntrinsicNotFound(name.into()))?(context, loc, args)631}
after · crates/jrsonnet-evaluator/src/builtin/mod.rs
1use crate::{2	equals,3	error::{Error::*, Result},4	parse_args, primitive_equals, push, throw, with_state, ArrValue, Context, DebugGcTraceValue,5	EvaluationState, FuncVal, LazyVal, Val,6};7use format::{format_arr, format_obj};8use gc::Gc;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			("map".into(), builtin_map),62			("foldl".into(), builtin_foldl),63			("foldr".into(), builtin_foldr),64			("sortImpl".into(), builtin_sort_impl),65			("format".into(), builtin_format),66			("range".into(), builtin_range),67			("char".into(), builtin_char),68			("encodeUTF8".into(), builtin_encode_utf8),69			("md5".into(), builtin_md5),70			("base64".into(), builtin_base64),71			("trace".into(), builtin_trace),72			("gc".into(), builtin_gc),73			("gcTrace".into(), builtin_gc_trace),74			("join".into(), builtin_join),75			("escapeStringJson".into(), builtin_escape_string_json),76			("manifestJsonEx".into(), builtin_manifest_json_ex),77			("reverse".into(), builtin_reverse),78			("id".into(), builtin_id),79			("strReplace".into(), builtin_str_replace),80			("parseJson".into(), builtin_parse_json),81		].iter().cloned().collect()82	};83}8485fn builtin_length(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {86	parse_args!(context, "length", args, 1, [87		0, x: ty!((string | object | array));88	], {89		Ok(match x {90			Val::Str(n) => Val::Num(n.chars().count() as f64),91			Val::Arr(a) => Val::Num(a.len() as f64),92			Val::Obj(o) => Val::Num(93				o.fields_visibility()94					.into_iter()95					.filter(|(_k, v)| *v)96					.count() as f64,97			),98			_ => unreachable!(),99		})100	})101}102103fn builtin_type(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {104	parse_args!(context, "type", args, 1, [105		0, x: ty!(any);106	], {107		Ok(Val::Str(x.value_type().name().into()))108	})109}110111fn builtin_make_array(112	context: Context,113	_loc: Option<&ExprLocation>,114	args: &ArgsDesc,115) -> Result<Val> {116	parse_args!(context, "makeArray", args, 2, [117		0, sz: ty!(BoundedNumber<(Some(0.0)), (None)>) => Val::Num;118		1, func: ty!(function) => Val::Func;119	], {120		let mut out = Vec::with_capacity(sz as usize);121		for i in 0..sz as usize {122			out.push(LazyVal::new_resolved(func.evaluate_values(123				context.clone(),124				&[Val::Num(i as f64)]125			)?))126		}127		Ok(Val::Arr(out.into()))128	})129}130131fn builtin_codepoint(132	context: Context,133	_loc: Option<&ExprLocation>,134	args: &ArgsDesc,135) -> Result<Val> {136	parse_args!(context, "codepoint", args, 1, [137		0, str: ty!(char) => Val::Str;138	], {139		Ok(Val::Num(str.chars().next().unwrap() as u32 as f64))140	})141}142143fn builtin_object_fields_ex(144	context: Context,145	_loc: Option<&ExprLocation>,146	args: &ArgsDesc,147) -> Result<Val> {148	parse_args!(context, "objectFieldsEx", args, 2, [149		0, obj: ty!(object) => Val::Obj;150		1, inc_hidden: ty!(boolean) => Val::Bool;151	], {152		let out = obj.fields_ex(inc_hidden);153		Ok(Val::Arr(out.into_iter().map(Val::Str).collect::<Vec<_>>().into()))154	})155}156157fn builtin_object_has_ex(158	context: Context,159	_loc: Option<&ExprLocation>,160	args: &ArgsDesc,161) -> Result<Val> {162	parse_args!(context, "objectHasEx", args, 3, [163		0, obj: ty!(object) => Val::Obj;164		1, f: ty!(string) => Val::Str;165		2, inc_hidden: ty!(boolean) => Val::Bool;166	], {167		Ok(Val::Bool(obj.has_field_ex(f, inc_hidden)))168	})169}170171fn builtin_parse_json(172	context: Context,173	_loc: Option<&ExprLocation>,174	args: &ArgsDesc,175) -> Result<Val> {176	parse_args!(context, "parseJson", args, 1, [177		0, s: ty!(string) => Val::Str;178	], {179		let state = EvaluationState::default();180		let path = Rc::new(PathBuf::from("std.parseJson"));181		state.evaluate_snippet_raw(path ,s)182	})183}184185// faster186fn builtin_slice(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {187	parse_args!(context, "slice", args, 4, [188		0, indexable: ty!((string | array));189		1, index: ty!((number | null));190		2, end: ty!((number | null));191		3, step: ty!((number | null));192	], {193		let index = match index {194			Val::Num(v) => v as usize,195			Val::Null => 0,196			_ => unreachable!(),197		};198		let end = match end {199			Val::Num(v) => v as usize,200			Val::Null => match &indexable {201				Val::Str(s) => s.chars().count(),202				Val::Arr(v) => v.len(),203				_ => unreachable!()204			},205			_ => unreachable!()206		};207		let step = match step {208			Val::Num(v) => v as usize,209			Val::Null => 1,210			_ => unreachable!()211		};212		match &indexable {213			Val::Str(s) => {214				Ok(Val::Str((s.chars().skip(index).take(end-index).step_by(step).collect::<String>()).into()))215			}216			Val::Arr(arr) => {217				Ok(Val::Arr((arr.iter().skip(index).take(end-index).step_by(step).collect::<Result<Vec<Val>>>()?).into()))218			}219			_ => unreachable!()220		}221	})222}223224// faster225fn builtin_primitive_equals(226	context: Context,227	_loc: Option<&ExprLocation>,228	args: &ArgsDesc,229) -> Result<Val> {230	parse_args!(context, "primitiveEquals", args, 2, [231		0, a: ty!(any);232		1, b: ty!(any);233	], {234		Ok(Val::Bool(primitive_equals(&a, &b)?))235	})236}237238// faster239fn builtin_equals(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {240	parse_args!(context, "equals", args, 2, [241		0, a: ty!(any);242		1, b: ty!(any);243	], {244		Ok(Val::Bool(equals(&a, &b)?))245	})246}247248fn builtin_modulo(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {249	parse_args!(context, "modulo", args, 2, [250		0, a: ty!(number) => Val::Num;251		1, b: ty!(number) => Val::Num;252	], {253		Ok(Val::Num(a % b))254	})255}256257fn builtin_mod(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {258	parse_args!(context, "mod", args, 2, [259		0, a: ty!((number | string));260		1, b: ty!(any);261	], {262		match (a, b) {263			(Val::Num(a), Val::Num(b)) => Ok(Val::Num(a % b)),264			(Val::Str(str), vals) => std_format(str, vals),265			(a, b) => throw!(BinaryOperatorDoesNotOperateOnValues(BinaryOpType::Mod, a.value_type(), b.value_type()))266		}267	})268}269270fn builtin_floor(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {271	parse_args!(context, "floor", args, 1, [272		0, x: ty!(number) => Val::Num;273	], {274		Ok(Val::Num(x.floor()))275	})276}277278fn builtin_log(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {279	parse_args!(context, "log", args, 1, [280		0, n: ty!(number) => Val::Num;281	], {282		Ok(Val::Num(n.ln()))283	})284}285286fn builtin_pow(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {287	parse_args!(context, "pow", args, 2, [288		0, x: ty!(number) => Val::Num;289		1, n: ty!(number) => Val::Num;290	], {291		Ok(Val::Num(x.powf(n)))292	})293}294295fn builtin_ext_var(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {296	parse_args!(context, "extVar", args, 1, [297		0, x: ty!(string) => Val::Str;298	], {299		Ok(with_state(|s| s.settings().ext_vars.get(&x).cloned()).ok_or(UndefinedExternalVariable(x))?)300	})301}302303fn builtin_native(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {304	parse_args!(context, "native", args, 1, [305		0, x: ty!(string) => Val::Str;306	], {307		Ok(with_state(|s| s.settings().ext_natives.get(&x).cloned()).map(|v| Val::Func(Gc::new(FuncVal::NativeExt(x.clone(), v)))).ok_or(UndefinedExternalFunction(x))?)308	})309}310311fn builtin_filter(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {312	parse_args!(context, "filter", args, 2, [313		0, func: ty!(function) => Val::Func;314		1, arr: ty!(array) => Val::Arr;315	], {316		Ok(Val::Arr(arr.filter(|val| func317			.evaluate_values(context.clone(), &[val.clone()])?318			.try_cast_bool("filter predicate"))?))319	})320}321322fn builtin_map(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {323	parse_args!(context, "map", args, 2, [324		0, func: ty!(function) => Val::Func;325		1, arr: ty!(array) => Val::Arr;326	], {327		Ok(Val::Arr(arr.map(|val| func328			.evaluate_values(context.clone(), &[val]))?))329	})330}331332fn builtin_foldl(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {333	parse_args!(context, "foldl", args, 3, [334		0, func: ty!(function) => Val::Func;335		1, arr: ty!(array) => Val::Arr;336		2, init: ty!(any);337	], {338		let mut acc = init;339		for i in arr.iter() {340			acc = func.evaluate_values(context.clone(), &[acc, i?])?;341		}342		Ok(acc)343	})344}345346fn builtin_foldr(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {347	parse_args!(context, "foldr", args, 3, [348		0, func: ty!(function) => Val::Func;349		1, arr: ty!(array) => Val::Arr;350		2, init: ty!(any);351	], {352		let mut acc = init;353		for i in arr.iter().rev() {354			acc = func.evaluate_values(context.clone(), &[acc, i?])?;355		}356		Ok(acc)357	})358}359360#[allow(non_snake_case)]361fn builtin_sort_impl(362	context: Context,363	_loc: Option<&ExprLocation>,364	args: &ArgsDesc,365) -> Result<Val> {366	parse_args!(context, "sort", args, 2, [367		0, arr: ty!(array) => Val::Arr;368		1, keyF: ty!(function) => Val::Func;369	], {370		if arr.len() <= 1 {371			return Ok(Val::Arr(arr))372		}373		Ok(Val::Arr(ArrValue::Eager(sort::sort(context, arr.evaluated()?, &keyF)?)))374	})375}376377// faster378fn builtin_format(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {379	parse_args!(context, "format", args, 2, [380		0, str: ty!(string) => Val::Str;381		1, vals: ty!(any)382	], {383		std_format(str, vals)384	})385}386387fn builtin_range(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {388	parse_args!(context, "range", args, 2, [389		0, from: ty!(number) => Val::Num;390		1, to: ty!(number) => Val::Num;391	], {392		if to < from {393			return Ok(Val::Arr(ArrValue::new_eager()))394		}395		let mut out = Vec::with_capacity((1+to as usize-from as usize).max(0));396		for i in from as usize..=to as usize {397			out.push(Val::Num(i as f64));398		}399		Ok(Val::Arr(out.into()))400	})401}402403fn builtin_char(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {404	parse_args!(context, "char", args, 1, [405		0, n: ty!(number) => Val::Num;406	], {407		let mut out = String::new();408		out.push(std::char::from_u32(n as u32).ok_or_else(||409			InvalidUnicodeCodepointGot(n as u32)410		)?);411		Ok(Val::Str(out.into()))412	})413}414415fn builtin_encode_utf8(416	context: Context,417	_loc: Option<&ExprLocation>,418	args: &ArgsDesc,419) -> Result<Val> {420	parse_args!(context, "encodeUTF8", args, 1, [421		0, str: ty!(string) => Val::Str;422	], {423		Ok(Val::Arr((str.bytes().map(|b| Val::Num(b as f64)).collect::<Vec<Val>>()).into()))424	})425}426427fn builtin_md5(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {428	parse_args!(context, "md5", args, 1, [429		0, str: ty!(string) => Val::Str;430	], {431		Ok(Val::Str(format!("{:x}", md5::compute(&str.as_bytes())).into()))432	})433}434435fn builtin_trace(context: Context, loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {436	parse_args!(context, "trace", args, 2, [437		0, str: ty!(string) => Val::Str;438		1, rest: ty!(any);439	], {440		eprint!("TRACE:");441		if let Some(loc) = loc {442			with_state(|s|{443				let locs = s.map_source_locations(&loc.0, &[loc.1]);444				eprint!(" {}:{}", loc.0.file_name().unwrap().to_str().unwrap(), locs[0].line);445			});446		}447		eprintln!(" {}", str);448		Ok(rest)449	})450}451452fn builtin_gc(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {453	parse_args!(context, "gc", args, 1, [454		0, rest: ty!(any);455	], {456		println!("GC start");457		gc::force_collect();458		println!("GC done");459460		Ok(rest)461	})462}463464fn builtin_gc_trace(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {465	parse_args!(context, "gcTrace", args, 2, [466		0, name: ty!(string) => Val::Str;467		1, rest: ty!(any);468	], {469		Ok(DebugGcTraceValue::create(name, rest))470	})471}472473fn builtin_base64(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {474	parse_args!(context, "base64", args, 1, [475		0, input: ty!((string | (Array<number>)));476	], {477		Ok(Val::Str(match input {478			Val::Str(s) => {479				base64::encode(s.bytes().collect::<Vec<_>>()).into()480			},481			Val::Arr(a) => {482				base64::encode(a.iter().map(|v| {483					Ok(v?.unwrap_num()? as u8)484				}).collect::<Result<Vec<_>>>()?).into()485			},486			_ => unreachable!()487		}))488	})489}490491fn builtin_join(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {492	parse_args!(context, "join", args, 2, [493		0, sep: ty!((string | array));494		1, arr: ty!(array) => Val::Arr;495	], {496		Ok(match sep {497			Val::Arr(joiner_items) => {498				let mut out = Vec::new();499500				let mut first = true;501				for item in arr.iter() {502					let item = item?.clone();503					if let Val::Arr(items) = item {504						if !first {505							out.reserve(joiner_items.len());506							// TODO: extend507							for item in joiner_items.iter() {508								out.push(item?);509							}510						}511						first = false;512						out.reserve(items.len());513						// TODO: extend514						for item in items.iter() {515							out.push(item?);516						}517					} else {518						throw!(RuntimeError("in std.join all items should be arrays".into()));519					}520				}521522				Val::Arr(out.into())523			},524			Val::Str(sep) => {525				let mut out = String::new();526527				let mut first = true;528				for item in arr.iter() {529					let item = item?.clone();530					if let Val::Str(item) = item {531						if !first {532							out += &sep;533						}534						first = false;535						out += &item;536					} else {537						throw!(RuntimeError("in std.join all items should be strings".into()));538					}539				}540541				Val::Str(out.into())542			},543			_ => unreachable!()544		})545	})546}547548// faster549fn builtin_escape_string_json(550	context: Context,551	_loc: Option<&ExprLocation>,552	args: &ArgsDesc,553) -> Result<Val> {554	parse_args!(context, "escapeStringJson", args, 1, [555		0, str_: ty!(string) => Val::Str;556	], {557		Ok(Val::Str(escape_string_json(&str_).into()))558	})559}560561// faster562fn builtin_manifest_json_ex(563	context: Context,564	_loc: Option<&ExprLocation>,565	args: &ArgsDesc,566) -> Result<Val> {567	parse_args!(context, "manifestJsonEx", args, 2, [568		0, value: ty!(any);569		1, indent: ty!(string) => Val::Str;570	], {571		Ok(Val::Str(manifest_json_ex(&value, &ManifestJsonOptions {572			padding: &indent,573			mtype: ManifestType::Std,574		})?.into()))575	})576}577578// faster579fn builtin_reverse(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {580	parse_args!(context, "reverse", args, 1, [581		0, value: ty!(array) => Val::Arr;582	], {583		Ok(Val::Arr(value.reversed()))584	})585}586587fn builtin_id(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {588	parse_args!(context, "id", args, 1, [589		0, v: ty!(any);590	], {591		Ok(v)592	})593}594595// faster596fn builtin_str_replace(597	context: Context,598	_loc: Option<&ExprLocation>,599	args: &ArgsDesc,600) -> Result<Val> {601	parse_args!(context, "strReplace", args, 3, [602		0, str: ty!(string) => Val::Str;603		1, from: ty!(string) => Val::Str;604		2, to: ty!(string) => Val::Str;605	], {606		let mut out = String::new();607		let mut last_idx = 0;608		while let Some(idx) = (&str[last_idx..]).find(&from as &str) {609			out.push_str(&str[last_idx..last_idx+idx]);610			out.push_str(&to);611			last_idx += idx + from.len();612		}613		if last_idx == 0 {614			return Ok(Val::Str(str))615		}616		out.push_str(&str[last_idx..]);617		Ok(Val::Str(out.into()))618	})619}620621pub fn call_builtin(622	context: Context,623	loc: Option<&ExprLocation>,624	name: &str,625	args: &ArgsDesc,626) -> Result<Val> {627	BUILTINS628		.with(|builtins| builtins.get(name).copied())629		.ok_or_else(|| IntrinsicNotFound(name.into()))?(context, loc, args)630}
modifiedcrates/jrsonnet-evaluator/src/evaluate.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/evaluate.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate.rs
@@ -127,8 +127,8 @@
 		impl Bindable for BindableMethod {
 			fn bind(&self, this: Option<ObjValue>, super_obj: Option<ObjValue>) -> Result<LazyVal> {
 				Ok(LazyVal::new(Box::new(BindableMethodLazyVal {
-					this: this.clone(),
-					super_obj: super_obj.clone(),
+					this,
+					super_obj,
 
 					context_creator: self.context_creator.clone(),
 					name: self.name.clone(),
@@ -586,7 +586,7 @@
 								add: false,
 								visibility: Visibility::Normal,
 								invoke: LazyBinding::Bindable(Gc::new(Box::new(ObjCompBinding {
-									context: ctx.clone(),
+									context: ctx,
 									value: obj.value.clone(),
 								}))),
 								location: obj.value.1.clone(),
modifiedcrates/jrsonnet-evaluator/src/integrations/serde.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/integrations/serde.rs
+++ b/crates/jrsonnet-evaluator/src/integrations/serde.rs
@@ -1,6 +1,6 @@
 use crate::{
 	error::{Error::*, LocError, Result},
-	throw, Context, LazyBinding, LazyVal, ObjMember, ObjValue, Val,
+	throw, LazyBinding, LazyVal, ObjMember, ObjValue, Val,
 };
 use gc::Gc;
 use jrsonnet_parser::Visibility;
@@ -42,7 +42,7 @@
 				Self::Object(out)
 			}
 			Val::Func(_) => throw!(RuntimeError("tried to manifest function".into())),
-			Val::DebugGcTraceValue(v) => Value::try_from(&*v.value as &Val)?,
+			Val::DebugGcTraceValue(v) => Self::try_from(&*v.value as &Val)?,
 		})
 	}
 }
modifiedcrates/jrsonnet-evaluator/src/obj.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/obj.rs
+++ b/crates/jrsonnet-evaluator/src/obj.rs
@@ -1,7 +1,7 @@
-use crate::{evaluate_add_op, evaluate_assert, Context, LazyBinding, Result, Val};
+use crate::{evaluate_add_op, LazyBinding, Result, Val};
 use gc::{Finalize, Gc, GcCell, Trace};
 use jrsonnet_interner::IStr;
-use jrsonnet_parser::{AssertStmt, ExprLocation, Visibility};
+use jrsonnet_parser::{ExprLocation, Visibility};
 use rustc_hash::{FxHashMap, FxHashSet};
 use std::hash::{Hash, Hasher};
 use std::{fmt::Debug, hash::BuildHasherDefault};
modifiedcrates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -49,7 +49,7 @@
 	pub fn evaluate(&self) -> Result<Val> {
 		match &*self.0.borrow() {
 			LazyValInternals::Computed(v) => return Ok(v.clone()),
-			LazyValInternals::Errored(e) => return Err(e.clone().into()),
+			LazyValInternals::Errored(e) => return Err(e.clone()),
 			LazyValInternals::Pending => return Err(RecursiveLazyValueEvaluation.into()),
 			_ => (),
 		};
@@ -400,7 +400,7 @@
 impl Clone for DebugGcTraceValue {
 	fn clone(&self) -> Self {
 		self.print("Cloned");
-		let value = DebugGcTraceValue {
+		let value = Self {
 			name: self.name.clone(),
 			value: self.value.clone(),
 		};
@@ -409,7 +409,7 @@
 	}
 }
 impl DebugGcTraceValue {
-	pub fn new(name: IStr, value: Val) -> Val {
+	pub fn create(name: IStr, value: Val) -> Val {
 		let value = Self {
 			name,
 			value: Box::new(value),