git.delta.rocks / jrsonnet / refs/commits / 7123b5d87a7d

difftreelog

style fix clippy warnings

Yaroslav Bolyukin2022-04-20parent: #74199ce.patch.diff
in: master

2 files changed

modifiedcrates/jrsonnet-evaluator/src/builtin/mod.rsdiffbeforeafterboth
before · crates/jrsonnet-evaluator/src/builtin/mod.rs
1use crate::function::{CallLocation, StaticBuiltin};2use crate::typed::{Any, Bytes, PositiveF64, VecVal, M1};3use crate::{4	builtin::manifest::{manifest_yaml_ex, ManifestYamlOptions},5	equals,6	error::{Error::*, Result},7	operator::evaluate_mod_op,8	primitive_equals, push_frame, throw,9	typed::{Either2, Either4},10	with_state, ArrValue, FuncVal, IndexableVal, Val,11};12use crate::{Either, ObjValue};13use format::{format_arr, format_obj};14use jrsonnet_interner::IStr;15use serde::Deserialize;16use serde_yaml::DeserializingQuirks;17use std::collections::HashMap;18use std::convert::{TryFrom, TryInto};1920pub mod stdlib;21pub use stdlib::*;2223use self::manifest::{escape_string_json, manifest_json_ex, ManifestJsonOptions, ManifestType};2425pub mod format;26pub mod manifest;27pub mod sort;2829pub fn std_format(str: IStr, vals: Val) -> Result<String> {30	push_frame(31		CallLocation::native(),32		|| format!("std.format of {}", str),33		|| {34			Ok(match vals {35				Val::Arr(vals) => format_arr(&str, &vals.evaluated()?)?,36				Val::Obj(obj) => format_obj(&str, &obj)?,37				o => format_arr(&str, &[o])?,38			})39		},40	)41}4243pub fn std_slice(44	indexable: IndexableVal,45	index: Option<usize>,46	end: Option<usize>,47	step: Option<usize>,48) -> Result<Val> {49	let index = index.unwrap_or(0);50	let end = end.unwrap_or_else(|| match &indexable {51		IndexableVal::Str(_) => usize::MAX,52		IndexableVal::Arr(v) => v.len(),53	});54	let step = step.unwrap_or(1);55	match &indexable {56		IndexableVal::Str(s) => Ok(Val::Str(57			(s.chars()58				.skip(index)59				.take(end - index)60				.step_by(step)61				.collect::<String>())62			.into(),63		)),64		IndexableVal::Arr(arr) => Ok(Val::Arr(65			(arr.iter()66				.skip(index)67				.take(end - index)68				.step_by(step)69				.collect::<Result<Vec<Val>>>()?)70			.into(),71		)),72	}73}7475type BuiltinsType = HashMap<IStr, &'static dyn StaticBuiltin>;7677thread_local! {78	pub static BUILTINS: BuiltinsType = {79		[80			("length".into(), builtin_length::INST),81			("type".into(), builtin_type::INST),82			("makeArray".into(), builtin_make_array::INST),83			("codepoint".into(), builtin_codepoint::INST),84			("objectFieldsEx".into(), builtin_object_fields_ex::INST),85			("objectHasEx".into(), builtin_object_has_ex::INST),86			("slice".into(), builtin_slice::INST),87			("substr".into(), builtin_substr::INST),88			("primitiveEquals".into(), builtin_primitive_equals::INST),89			("equals".into(), builtin_equals::INST),90			("modulo".into(), builtin_modulo::INST),91			("mod".into(), builtin_mod::INST),92			("floor".into(), builtin_floor::INST),93			("ceil".into(), builtin_ceil::INST),94			("log".into(), builtin_log::INST),95			("pow".into(), builtin_pow::INST),96			("sqrt".into(), builtin_sqrt::INST),97			("sin".into(), builtin_sin::INST),98			("cos".into(), builtin_cos::INST),99			("tan".into(), builtin_tan::INST),100			("asin".into(), builtin_asin::INST),101			("acos".into(), builtin_acos::INST),102			("atan".into(), builtin_atan::INST),103			("exp".into(), builtin_exp::INST),104			("mantissa".into(), builtin_mantissa::INST),105			("exponent".into(), builtin_exponent::INST),106			("extVar".into(), builtin_ext_var::INST),107			("native".into(), builtin_native::INST),108			("filter".into(), builtin_filter::INST),109			("map".into(), builtin_map::INST),110			("flatMap".into(), builtin_flatmap::INST),111			("foldl".into(), builtin_foldl::INST),112			("foldr".into(), builtin_foldr::INST),113			("sort".into(), builtin_sort::INST),114			("format".into(), builtin_format::INST),115			("range".into(), builtin_range::INST),116			("char".into(), builtin_char::INST),117			("encodeUTF8".into(), builtin_encode_utf8::INST),118			("decodeUTF8".into(), builtin_decode_utf8::INST),119			("md5".into(), builtin_md5::INST),120			("base64".into(), builtin_base64::INST),121			("base64DecodeBytes".into(), builtin_base64_decode_bytes::INST),122			("base64Decode".into(), builtin_base64_decode::INST),123			("trace".into(), builtin_trace::INST),124			("join".into(), builtin_join::INST),125			("escapeStringJson".into(), builtin_escape_string_json::INST),126			("manifestJsonEx".into(), builtin_manifest_json_ex::INST),127			("manifestYamlDoc".into(), builtin_manifest_yaml_doc::INST),128			("reverse".into(), builtin_reverse::INST),129			("id".into(), builtin_id::INST),130			("strReplace".into(), builtin_str_replace::INST),131			("splitLimit".into(), builtin_splitlimit::INST),132			("parseJson".into(), builtin_parse_json::INST),133			("parseYaml".into(), builtin_parse_yaml::INST),134			("asciiUpper".into(), builtin_ascii_upper::INST),135			("asciiLower".into(), builtin_ascii_lower::INST),136			("member".into(), builtin_member::INST),137			("count".into(), builtin_count::INST),138		].iter().cloned().collect()139	};140}141142#[jrsonnet_macros::builtin]143fn builtin_length(x: Either![IStr, VecVal, ObjValue, FuncVal]) -> Result<usize> {144	use Either4::*;145	Ok(match x {146		A(x) => x.chars().count(),147		B(x) => x.0.len(),148		C(x) => x149			.fields_visibility()150			.into_iter()151			.filter(|(_k, v)| *v)152			.count(),153		D(f) => f.args_len(),154	})155}156157#[jrsonnet_macros::builtin]158fn builtin_type(x: Any) -> Result<IStr> {159	Ok(x.0.value_type().name().into())160}161162#[jrsonnet_macros::builtin]163fn builtin_make_array(sz: usize, func: FuncVal) -> Result<VecVal> {164	let mut out = Vec::with_capacity(sz);165	for i in 0..sz {166		out.push(func.evaluate_simple(&[i as f64].as_slice())?)167	}168	Ok(VecVal(out))169}170171#[jrsonnet_macros::builtin]172const fn builtin_codepoint(str: char) -> Result<u32> {173	Ok(str as u32)174}175176#[jrsonnet_macros::builtin]177fn builtin_object_fields_ex(obj: ObjValue, inc_hidden: bool) -> Result<VecVal> {178	let out = obj.fields_ex(inc_hidden);179	Ok(VecVal(out.into_iter().map(Val::Str).collect::<Vec<_>>()))180}181182#[jrsonnet_macros::builtin]183fn builtin_object_has_ex(obj: ObjValue, f: IStr, inc_hidden: bool) -> Result<bool> {184	Ok(obj.has_field_ex(f, inc_hidden))185}186187#[jrsonnet_macros::builtin]188fn builtin_parse_json(s: IStr) -> Result<Any> {189	let value: serde_json::Value = serde_json::from_str(&s)190		.map_err(|e| RuntimeError(format!("failed to parse json: {}", e).into()))?;191	Ok(Any(Val::try_from(&value)?))192}193194#[jrsonnet_macros::builtin]195fn builtin_parse_yaml(s: IStr) -> Result<Any> {196	let value = serde_yaml::Deserializer::from_str_with_quirks(197		&s,198		DeserializingQuirks { old_octals: true },199	);200	let mut out = vec![];201	for item in value {202		let value = serde_json::Value::deserialize(item)203			.map_err(|e| RuntimeError(format!("failed to parse yaml: {}", e).into()))?;204		let val = Val::try_from(&value)?;205		out.push(val);206	}207	Ok(Any(if out.is_empty() {208		Val::Null209	} else if out.len() == 1 {210		out.into_iter().next().unwrap()211	} else {212		Val::Arr(out.into())213	}))214}215216#[jrsonnet_macros::builtin]217fn builtin_slice(218	indexable: IndexableVal,219	index: Option<usize>,220	end: Option<usize>,221	step: Option<usize>,222) -> Result<Any> {223	std_slice(indexable, index, end, step).map(Any)224}225226#[jrsonnet_macros::builtin]227fn builtin_substr(str: IStr, from: usize, len: usize) -> Result<String> {228	Ok(str.chars().skip(from as usize).take(len as usize).collect())229}230231#[jrsonnet_macros::builtin]232fn builtin_primitive_equals(a: Any, b: Any) -> Result<bool> {233	primitive_equals(&a.0, &b.0)234}235236#[jrsonnet_macros::builtin]237fn builtin_equals(a: Any, b: Any) -> Result<bool> {238	equals(&a.0, &b.0)239}240241#[jrsonnet_macros::builtin]242fn builtin_modulo(a: f64, b: f64) -> Result<f64> {243	Ok(a % b)244}245246#[jrsonnet_macros::builtin]247fn builtin_mod(a: Either![f64, IStr], b: Any) -> Result<Any> {248	use Either2::*;249	Ok(Any(evaluate_mod_op(250		&match a {251			A(v) => Val::Num(v),252			B(s) => Val::Str(s),253		},254		&b.0,255	)?))256}257258#[jrsonnet_macros::builtin]259fn builtin_floor(x: f64) -> Result<f64> {260	Ok(x.floor())261}262263#[jrsonnet_macros::builtin]264fn builtin_ceil(x: f64) -> Result<f64> {265	Ok(x.ceil())266}267268#[jrsonnet_macros::builtin]269fn builtin_log(n: f64) -> Result<f64> {270	Ok(n.ln())271}272273#[jrsonnet_macros::builtin]274fn builtin_pow(x: f64, n: f64) -> Result<f64> {275	Ok(x.powf(n))276}277278#[jrsonnet_macros::builtin]279fn builtin_sqrt(x: PositiveF64) -> Result<f64> {280	Ok(x.0.sqrt())281}282283#[jrsonnet_macros::builtin]284fn builtin_sin(x: f64) -> Result<f64> {285	Ok(x.sin())286}287288#[jrsonnet_macros::builtin]289fn builtin_cos(x: f64) -> Result<f64> {290	Ok(x.cos())291}292293#[jrsonnet_macros::builtin]294fn builtin_tan(x: f64) -> Result<f64> {295	Ok(x.tan())296}297298#[jrsonnet_macros::builtin]299fn builtin_asin(x: f64) -> Result<f64> {300	Ok(x.asin())301}302303#[jrsonnet_macros::builtin]304fn builtin_acos(x: f64) -> Result<f64> {305	Ok(x.acos())306}307308#[jrsonnet_macros::builtin]309fn builtin_atan(x: f64) -> Result<f64> {310	Ok(x.atan())311}312313#[jrsonnet_macros::builtin]314fn builtin_exp(x: f64) -> Result<f64> {315	Ok(x.exp())316}317318fn frexp(s: f64) -> (f64, i16) {319	if 0.0 == s {320		(s, 0)321	} else {322		let lg = s.abs().log2();323		let x = (lg - lg.floor() - 1.0).exp2();324		let exp = lg.floor() + 1.0;325		(s.signum() * x, exp as i16)326	}327}328329#[jrsonnet_macros::builtin]330fn builtin_mantissa(x: f64) -> Result<f64> {331	Ok(frexp(x).0)332}333334#[jrsonnet_macros::builtin]335fn builtin_exponent(x: f64) -> Result<i16> {336	Ok(frexp(x).1)337}338339#[jrsonnet_macros::builtin]340fn builtin_ext_var(x: IStr) -> Result<Any> {341	Ok(Any(with_state(|s| s.settings().ext_vars.get(&x).cloned())342		.ok_or(UndefinedExternalVariable(x))?))343}344345#[jrsonnet_macros::builtin]346fn builtin_native(name: IStr) -> Result<FuncVal> {347	Ok(with_state(|s| s.settings().ext_natives.get(&name).cloned())348		.map(|v| FuncVal::Builtin(v.clone()))349		.ok_or(UndefinedExternalFunction(name))?)350}351352#[jrsonnet_macros::builtin]353fn builtin_filter(func: FuncVal, arr: ArrValue) -> Result<ArrValue> {354	arr.filter(|val| bool::try_from(func.evaluate_simple(&[Any(val.clone())].as_slice())?))355}356357#[jrsonnet_macros::builtin]358fn builtin_map(func: FuncVal, arr: ArrValue) -> Result<ArrValue> {359	arr.map(|val| func.evaluate_simple(&[Any(val)].as_slice()))360}361362#[jrsonnet_macros::builtin]363fn builtin_flatmap(func: FuncVal, arr: IndexableVal) -> Result<IndexableVal> {364	match arr {365		IndexableVal::Str(s) => {366			let mut out = String::new();367			for c in s.chars() {368				match func.evaluate_simple(&[c.to_string()].as_slice())? {369					Val::Str(o) => out.push_str(&o),370					_ => throw!(RuntimeError(371						"in std.join all items should be strings".into()372					)),373				};374			}375			Ok(IndexableVal::Str(out.into()))376		}377		IndexableVal::Arr(a) => {378			let mut out = Vec::new();379			for el in a.iter() {380				let el = el?;381				match func.evaluate_simple(&[Any(el)].as_slice())? {382					Val::Arr(o) => {383						for oe in o.iter() {384							out.push(oe?)385						}386					}387					_ => throw!(RuntimeError(388						"in std.join all items should be arrays".into()389					)),390				};391			}392			Ok(IndexableVal::Arr(out.into()))393		}394	}395}396397#[jrsonnet_macros::builtin]398fn builtin_foldl(func: FuncVal, arr: ArrValue, init: Any) -> Result<Any> {399	let mut acc = init.0;400	for i in arr.iter() {401		acc = func.evaluate_simple(&[Any(acc), Any(i?)].as_slice())?;402	}403	Ok(Any(acc))404}405406#[jrsonnet_macros::builtin]407fn builtin_foldr(func: FuncVal, arr: ArrValue, init: Any) -> Result<Any> {408	let mut acc = init.0;409	for i in arr.iter().rev() {410		acc = func.evaluate_simple(&[Any(i?), Any(acc)].as_slice())?;411	}412	Ok(Any(acc))413}414415#[jrsonnet_macros::builtin]416#[allow(non_snake_case)]417fn builtin_sort(arr: ArrValue, keyF: Option<FuncVal>) -> Result<ArrValue> {418	if arr.len() <= 1 {419		return Ok(arr);420	}421	Ok(ArrValue::Eager(sort::sort(422		arr.evaluated()?,423		keyF.as_ref(),424	)?))425}426427#[jrsonnet_macros::builtin]428fn builtin_format(str: IStr, vals: Any) -> Result<String> {429	std_format(str, vals.0)430}431432#[jrsonnet_macros::builtin]433fn builtin_range(from: i32, to: i32) -> Result<VecVal> {434	if to < from {435		return Ok(VecVal(Vec::new()));436	}437	let mut out = Vec::with_capacity((1 + to as usize - from as usize).max(0));438	for i in from as usize..=to as usize {439		out.push(Val::Num(i as f64));440	}441	Ok(VecVal(out))442}443444#[jrsonnet_macros::builtin]445fn builtin_char(n: u32) -> Result<char> {446	Ok(std::char::from_u32(n as u32).ok_or(InvalidUnicodeCodepointGot(n as u32))?)447}448449#[jrsonnet_macros::builtin]450fn builtin_encode_utf8(str: IStr) -> Result<Bytes> {451	Ok(Bytes(str.bytes().map(|b| b).collect::<Vec<u8>>().into()))452}453454#[jrsonnet_macros::builtin]455fn builtin_decode_utf8(arr: Bytes) -> Result<IStr> {456	Ok(std::str::from_utf8(&arr.0)457		.map_err(|_| RuntimeError("bad utf8".into()))?458		.into())459}460461#[jrsonnet_macros::builtin]462fn builtin_md5(str: IStr) -> Result<String> {463	Ok(format!("{:x}", md5::compute(&str.as_bytes())))464}465466#[jrsonnet_macros::builtin]467fn builtin_trace(loc: CallLocation, str: IStr, rest: Any) -> Result<Any> {468	eprint!("TRACE:");469	if let Some(loc) = loc.0 {470		with_state(|s| {471			let locs = s.map_source_locations(&loc.0, &[loc.1]);472			eprint!(473				" {}:{}",474				loc.0.file_name().unwrap().to_str().unwrap(),475				locs[0].line476			);477		});478	}479	eprintln!(" {}", str);480	Ok(rest) as Result<Any>481}482483#[jrsonnet_macros::builtin]484fn builtin_base64(input: Either![Bytes, IStr]) -> Result<String> {485	use Either2::*;486	Ok(match input {487		A(a) => base64::encode(a.0),488		B(l) => base64::encode(l.bytes().collect::<Vec<_>>()),489	})490}491492#[jrsonnet_macros::builtin]493fn builtin_base64_decode_bytes(input: IStr) -> Result<Bytes> {494	Ok(Bytes(495		base64::decode(&input.as_bytes())496			.map_err(|_| RuntimeError("bad base64".into()))?497			.into(),498	))499}500501#[jrsonnet_macros::builtin]502fn builtin_base64_decode(input: IStr) -> Result<String> {503	let bytes = base64::decode(&input.as_bytes()).map_err(|_| RuntimeError("bad base64".into()))?;504	Ok(String::from_utf8(bytes).map_err(|_| RuntimeError("bad utf8".into()))?)505}506507#[jrsonnet_macros::builtin]508fn builtin_join(sep: IndexableVal, arr: ArrValue) -> Result<IndexableVal> {509	Ok(match sep {510		IndexableVal::Arr(joiner_items) => {511			let mut out = Vec::new();512513			let mut first = true;514			for item in arr.iter() {515				let item = item?.clone();516				if let Val::Arr(items) = item {517					if !first {518						out.reserve(joiner_items.len());519						// TODO: extend520						for item in joiner_items.iter() {521							out.push(item?);522						}523					}524					first = false;525					out.reserve(items.len());526					// TODO: extend527					for item in items.iter() {528						out.push(item?);529					}530				} else {531					throw!(RuntimeError(532						"in std.join all items should be arrays".into()533					));534				}535			}536537			IndexableVal::Arr(out.into())538		}539		IndexableVal::Str(sep) => {540			let mut out = String::new();541542			let mut first = true;543			for item in arr.iter() {544				let item = item?.clone();545				if let Val::Str(item) = item {546					if !first {547						out += &sep;548					}549					first = false;550					out += &item;551				} else {552					throw!(RuntimeError(553						"in std.join all items should be strings".into()554					));555				}556			}557558			IndexableVal::Str(out.into())559		}560	})561}562563#[jrsonnet_macros::builtin]564fn builtin_escape_string_json(str_: IStr) -> Result<String> {565	Ok(escape_string_json(&str_))566}567568#[jrsonnet_macros::builtin]569fn builtin_manifest_json_ex(570	value: Any,571	indent: IStr,572	newline: Option<IStr>,573	key_val_sep: Option<IStr>,574) -> Result<String> {575	let newline = newline.as_deref().unwrap_or("\n");576	let key_val_sep = key_val_sep.as_deref().unwrap_or(": ");577	manifest_json_ex(578		&value.0,579		&ManifestJsonOptions {580			padding: &indent,581			mtype: ManifestType::Std,582			newline,583			key_val_sep,584		},585	)586}587588#[jrsonnet_macros::builtin]589fn builtin_manifest_yaml_doc(590	value: Any,591	indent_array_in_object: Option<bool>,592	quote_keys: Option<bool>,593) -> Result<String> {594	manifest_yaml_ex(595		&value.0,596		&ManifestYamlOptions {597			padding: "  ",598			arr_element_padding: if indent_array_in_object.unwrap_or(false) {599				"  "600			} else {601				""602			},603			quote_keys: quote_keys.unwrap_or(true),604		},605	)606}607608#[jrsonnet_macros::builtin]609fn builtin_reverse(value: ArrValue) -> Result<ArrValue> {610	Ok(value.reversed())611}612613#[jrsonnet_macros::builtin]614const fn builtin_id(v: Any) -> Result<Any> {615	Ok(v)616}617618#[jrsonnet_macros::builtin]619fn builtin_str_replace(str: String, from: IStr, to: IStr) -> Result<String> {620	Ok(str.replace(&from as &str, &to as &str))621}622623#[jrsonnet_macros::builtin]624fn builtin_splitlimit(str: IStr, c: char, maxsplits: Either![usize, M1]) -> Result<VecVal> {625	use Either2::*;626	Ok(VecVal(match maxsplits {627		A(n) => str.splitn(n + 1, c).map(|s| Val::Str(s.into())).collect(),628		B(_) => str.split(c).map(|s| Val::Str(s.into())).collect(),629	}))630}631632#[jrsonnet_macros::builtin]633fn builtin_ascii_upper(str: IStr) -> Result<String> {634	Ok(str.to_ascii_uppercase())635}636637#[jrsonnet_macros::builtin]638fn builtin_ascii_lower(str: IStr) -> Result<String> {639	Ok(str.to_ascii_lowercase())640}641642#[jrsonnet_macros::builtin]643fn builtin_member(arr: IndexableVal, x: Any) -> Result<bool> {644	match arr {645		IndexableVal::Str(s) => {646			let x: IStr = IStr::try_from(x.0)?;647			Ok(!x.is_empty() && s.contains(&*x))648		}649		IndexableVal::Arr(a) => {650			for item in a.iter() {651				let item = item?;652				if equals(&item, &x.0)? {653					return Ok(true);654				}655			}656			Ok(false)657		}658	}659}660661#[jrsonnet_macros::builtin]662fn builtin_count(arr: Vec<Any>, v: Any) -> Result<usize> {663	let mut count = 0;664	for item in arr.iter() {665		if equals(&item.0, &v.0)? {666			count += 1;667		}668	}669	Ok(count)670}
after · crates/jrsonnet-evaluator/src/builtin/mod.rs
1use crate::function::{CallLocation, StaticBuiltin};2use crate::typed::{Any, Bytes, PositiveF64, VecVal, M1};3use crate::{4	builtin::manifest::{manifest_yaml_ex, ManifestYamlOptions},5	equals,6	error::{Error::*, Result},7	operator::evaluate_mod_op,8	primitive_equals, push_frame, throw,9	typed::{Either2, Either4},10	with_state, ArrValue, FuncVal, IndexableVal, Val,11};12use crate::{Either, ObjValue};13use format::{format_arr, format_obj};14use jrsonnet_interner::IStr;15use serde::Deserialize;16use serde_yaml::DeserializingQuirks;17use std::collections::HashMap;18use std::convert::{TryFrom, TryInto};1920pub mod stdlib;21pub use stdlib::*;2223use self::manifest::{escape_string_json, manifest_json_ex, ManifestJsonOptions, ManifestType};2425pub mod format;26pub mod manifest;27pub mod sort;2829pub fn std_format(str: IStr, vals: Val) -> Result<String> {30	push_frame(31		CallLocation::native(),32		|| format!("std.format of {}", str),33		|| {34			Ok(match vals {35				Val::Arr(vals) => format_arr(&str, &vals.evaluated()?)?,36				Val::Obj(obj) => format_obj(&str, &obj)?,37				o => format_arr(&str, &[o])?,38			})39		},40	)41}4243pub fn std_slice(44	indexable: IndexableVal,45	index: Option<usize>,46	end: Option<usize>,47	step: Option<usize>,48) -> Result<Val> {49	let index = index.unwrap_or(0);50	let end = end.unwrap_or_else(|| match &indexable {51		IndexableVal::Str(_) => usize::MAX,52		IndexableVal::Arr(v) => v.len(),53	});54	let step = step.unwrap_or(1);55	match &indexable {56		IndexableVal::Str(s) => Ok(Val::Str(57			(s.chars()58				.skip(index)59				.take(end - index)60				.step_by(step)61				.collect::<String>())62			.into(),63		)),64		IndexableVal::Arr(arr) => Ok(Val::Arr(65			(arr.iter()66				.skip(index)67				.take(end - index)68				.step_by(step)69				.collect::<Result<Vec<Val>>>()?)70			.into(),71		)),72	}73}7475type BuiltinsType = HashMap<IStr, &'static dyn StaticBuiltin>;7677thread_local! {78	pub static BUILTINS: BuiltinsType = {79		[80			("length".into(), builtin_length::INST),81			("type".into(), builtin_type::INST),82			("makeArray".into(), builtin_make_array::INST),83			("codepoint".into(), builtin_codepoint::INST),84			("objectFieldsEx".into(), builtin_object_fields_ex::INST),85			("objectHasEx".into(), builtin_object_has_ex::INST),86			("slice".into(), builtin_slice::INST),87			("substr".into(), builtin_substr::INST),88			("primitiveEquals".into(), builtin_primitive_equals::INST),89			("equals".into(), builtin_equals::INST),90			("modulo".into(), builtin_modulo::INST),91			("mod".into(), builtin_mod::INST),92			("floor".into(), builtin_floor::INST),93			("ceil".into(), builtin_ceil::INST),94			("log".into(), builtin_log::INST),95			("pow".into(), builtin_pow::INST),96			("sqrt".into(), builtin_sqrt::INST),97			("sin".into(), builtin_sin::INST),98			("cos".into(), builtin_cos::INST),99			("tan".into(), builtin_tan::INST),100			("asin".into(), builtin_asin::INST),101			("acos".into(), builtin_acos::INST),102			("atan".into(), builtin_atan::INST),103			("exp".into(), builtin_exp::INST),104			("mantissa".into(), builtin_mantissa::INST),105			("exponent".into(), builtin_exponent::INST),106			("extVar".into(), builtin_ext_var::INST),107			("native".into(), builtin_native::INST),108			("filter".into(), builtin_filter::INST),109			("map".into(), builtin_map::INST),110			("flatMap".into(), builtin_flatmap::INST),111			("foldl".into(), builtin_foldl::INST),112			("foldr".into(), builtin_foldr::INST),113			("sort".into(), builtin_sort::INST),114			("format".into(), builtin_format::INST),115			("range".into(), builtin_range::INST),116			("char".into(), builtin_char::INST),117			("encodeUTF8".into(), builtin_encode_utf8::INST),118			("decodeUTF8".into(), builtin_decode_utf8::INST),119			("md5".into(), builtin_md5::INST),120			("base64".into(), builtin_base64::INST),121			("base64DecodeBytes".into(), builtin_base64_decode_bytes::INST),122			("base64Decode".into(), builtin_base64_decode::INST),123			("trace".into(), builtin_trace::INST),124			("join".into(), builtin_join::INST),125			("escapeStringJson".into(), builtin_escape_string_json::INST),126			("manifestJsonEx".into(), builtin_manifest_json_ex::INST),127			("manifestYamlDoc".into(), builtin_manifest_yaml_doc::INST),128			("reverse".into(), builtin_reverse::INST),129			("id".into(), builtin_id::INST),130			("strReplace".into(), builtin_str_replace::INST),131			("splitLimit".into(), builtin_splitlimit::INST),132			("parseJson".into(), builtin_parse_json::INST),133			("parseYaml".into(), builtin_parse_yaml::INST),134			("asciiUpper".into(), builtin_ascii_upper::INST),135			("asciiLower".into(), builtin_ascii_lower::INST),136			("member".into(), builtin_member::INST),137			("count".into(), builtin_count::INST),138		].iter().cloned().collect()139	};140}141142#[jrsonnet_macros::builtin]143fn builtin_length(x: Either![IStr, VecVal, ObjValue, FuncVal]) -> Result<usize> {144	use Either4::*;145	Ok(match x {146		A(x) => x.chars().count(),147		B(x) => x.0.len(),148		C(x) => x149			.fields_visibility()150			.into_iter()151			.filter(|(_k, v)| *v)152			.count(),153		D(f) => f.args_len(),154	})155}156157#[jrsonnet_macros::builtin]158fn builtin_type(x: Any) -> Result<IStr> {159	Ok(x.0.value_type().name().into())160}161162#[jrsonnet_macros::builtin]163fn builtin_make_array(sz: usize, func: FuncVal) -> Result<VecVal> {164	let mut out = Vec::with_capacity(sz);165	for i in 0..sz {166		out.push(func.evaluate_simple(&[i as f64].as_slice())?)167	}168	Ok(VecVal(out))169}170171#[jrsonnet_macros::builtin]172const fn builtin_codepoint(str: char) -> Result<u32> {173	Ok(str as u32)174}175176#[jrsonnet_macros::builtin]177fn builtin_object_fields_ex(obj: ObjValue, inc_hidden: bool) -> Result<VecVal> {178	let out = obj.fields_ex(inc_hidden);179	Ok(VecVal(out.into_iter().map(Val::Str).collect::<Vec<_>>()))180}181182#[jrsonnet_macros::builtin]183fn builtin_object_has_ex(obj: ObjValue, f: IStr, inc_hidden: bool) -> Result<bool> {184	Ok(obj.has_field_ex(f, inc_hidden))185}186187#[jrsonnet_macros::builtin]188fn builtin_parse_json(s: IStr) -> Result<Any> {189	let value: serde_json::Value = serde_json::from_str(&s)190		.map_err(|e| RuntimeError(format!("failed to parse json: {}", e).into()))?;191	Ok(Any(Val::try_from(&value)?))192}193194#[jrsonnet_macros::builtin]195fn builtin_parse_yaml(s: IStr) -> Result<Any> {196	let value = serde_yaml::Deserializer::from_str_with_quirks(197		&s,198		DeserializingQuirks { old_octals: true },199	);200	let mut out = vec![];201	for item in value {202		let value = serde_json::Value::deserialize(item)203			.map_err(|e| RuntimeError(format!("failed to parse yaml: {}", e).into()))?;204		let val = Val::try_from(&value)?;205		out.push(val);206	}207	Ok(Any(if out.is_empty() {208		Val::Null209	} else if out.len() == 1 {210		out.into_iter().next().unwrap()211	} else {212		Val::Arr(out.into())213	}))214}215216#[jrsonnet_macros::builtin]217fn builtin_slice(218	indexable: IndexableVal,219	index: Option<usize>,220	end: Option<usize>,221	step: Option<usize>,222) -> Result<Any> {223	std_slice(indexable, index, end, step).map(Any)224}225226#[jrsonnet_macros::builtin]227fn builtin_substr(str: IStr, from: usize, len: usize) -> Result<String> {228	Ok(str.chars().skip(from as usize).take(len as usize).collect())229}230231#[jrsonnet_macros::builtin]232fn builtin_primitive_equals(a: Any, b: Any) -> Result<bool> {233	primitive_equals(&a.0, &b.0)234}235236#[jrsonnet_macros::builtin]237fn builtin_equals(a: Any, b: Any) -> Result<bool> {238	equals(&a.0, &b.0)239}240241#[jrsonnet_macros::builtin]242fn builtin_modulo(a: f64, b: f64) -> Result<f64> {243	Ok(a % b)244}245246#[jrsonnet_macros::builtin]247fn builtin_mod(a: Either![f64, IStr], b: Any) -> Result<Any> {248	use Either2::*;249	Ok(Any(evaluate_mod_op(250		&match a {251			A(v) => Val::Num(v),252			B(s) => Val::Str(s),253		},254		&b.0,255	)?))256}257258#[jrsonnet_macros::builtin]259fn builtin_floor(x: f64) -> Result<f64> {260	Ok(x.floor())261}262263#[jrsonnet_macros::builtin]264fn builtin_ceil(x: f64) -> Result<f64> {265	Ok(x.ceil())266}267268#[jrsonnet_macros::builtin]269fn builtin_log(n: f64) -> Result<f64> {270	Ok(n.ln())271}272273#[jrsonnet_macros::builtin]274fn builtin_pow(x: f64, n: f64) -> Result<f64> {275	Ok(x.powf(n))276}277278#[jrsonnet_macros::builtin]279fn builtin_sqrt(x: PositiveF64) -> Result<f64> {280	Ok(x.0.sqrt())281}282283#[jrsonnet_macros::builtin]284fn builtin_sin(x: f64) -> Result<f64> {285	Ok(x.sin())286}287288#[jrsonnet_macros::builtin]289fn builtin_cos(x: f64) -> Result<f64> {290	Ok(x.cos())291}292293#[jrsonnet_macros::builtin]294fn builtin_tan(x: f64) -> Result<f64> {295	Ok(x.tan())296}297298#[jrsonnet_macros::builtin]299fn builtin_asin(x: f64) -> Result<f64> {300	Ok(x.asin())301}302303#[jrsonnet_macros::builtin]304fn builtin_acos(x: f64) -> Result<f64> {305	Ok(x.acos())306}307308#[jrsonnet_macros::builtin]309fn builtin_atan(x: f64) -> Result<f64> {310	Ok(x.atan())311}312313#[jrsonnet_macros::builtin]314fn builtin_exp(x: f64) -> Result<f64> {315	Ok(x.exp())316}317318fn frexp(s: f64) -> (f64, i16) {319	if 0.0 == s {320		(s, 0)321	} else {322		let lg = s.abs().log2();323		let x = (lg - lg.floor() - 1.0).exp2();324		let exp = lg.floor() + 1.0;325		(s.signum() * x, exp as i16)326	}327}328329#[jrsonnet_macros::builtin]330fn builtin_mantissa(x: f64) -> Result<f64> {331	Ok(frexp(x).0)332}333334#[jrsonnet_macros::builtin]335fn builtin_exponent(x: f64) -> Result<i16> {336	Ok(frexp(x).1)337}338339#[jrsonnet_macros::builtin]340fn builtin_ext_var(x: IStr) -> Result<Any> {341	Ok(Any(with_state(|s| s.settings().ext_vars.get(&x).cloned())342		.ok_or(UndefinedExternalVariable(x))?))343}344345#[jrsonnet_macros::builtin]346fn builtin_native(name: IStr) -> Result<FuncVal> {347	Ok(with_state(|s| s.settings().ext_natives.get(&name).cloned())348		.map(|v| FuncVal::Builtin(v.clone()))349		.ok_or(UndefinedExternalFunction(name))?)350}351352#[jrsonnet_macros::builtin]353fn builtin_filter(func: FuncVal, arr: ArrValue) -> Result<ArrValue> {354	arr.filter(|val| bool::try_from(func.evaluate_simple(&[Any(val.clone())].as_slice())?))355}356357#[jrsonnet_macros::builtin]358fn builtin_map(func: FuncVal, arr: ArrValue) -> Result<ArrValue> {359	arr.map(|val| func.evaluate_simple(&[Any(val)].as_slice()))360}361362#[jrsonnet_macros::builtin]363fn builtin_flatmap(func: FuncVal, arr: IndexableVal) -> Result<IndexableVal> {364	match arr {365		IndexableVal::Str(s) => {366			let mut out = String::new();367			for c in s.chars() {368				match func.evaluate_simple(&[c.to_string()].as_slice())? {369					Val::Str(o) => out.push_str(&o),370					_ => throw!(RuntimeError(371						"in std.join all items should be strings".into()372					)),373				};374			}375			Ok(IndexableVal::Str(out.into()))376		}377		IndexableVal::Arr(a) => {378			let mut out = Vec::new();379			for el in a.iter() {380				let el = el?;381				match func.evaluate_simple(&[Any(el)].as_slice())? {382					Val::Arr(o) => {383						for oe in o.iter() {384							out.push(oe?)385						}386					}387					_ => throw!(RuntimeError(388						"in std.join all items should be arrays".into()389					)),390				};391			}392			Ok(IndexableVal::Arr(out.into()))393		}394	}395}396397#[jrsonnet_macros::builtin]398fn builtin_foldl(func: FuncVal, arr: ArrValue, init: Any) -> Result<Any> {399	let mut acc = init.0;400	for i in arr.iter() {401		acc = func.evaluate_simple(&[Any(acc), Any(i?)].as_slice())?;402	}403	Ok(Any(acc))404}405406#[jrsonnet_macros::builtin]407fn builtin_foldr(func: FuncVal, arr: ArrValue, init: Any) -> Result<Any> {408	let mut acc = init.0;409	for i in arr.iter().rev() {410		acc = func.evaluate_simple(&[Any(i?), Any(acc)].as_slice())?;411	}412	Ok(Any(acc))413}414415#[jrsonnet_macros::builtin]416#[allow(non_snake_case)]417fn builtin_sort(arr: ArrValue, keyF: Option<FuncVal>) -> Result<ArrValue> {418	if arr.len() <= 1 {419		return Ok(arr);420	}421	Ok(ArrValue::Eager(sort::sort(422		arr.evaluated()?,423		keyF.as_ref(),424	)?))425}426427#[jrsonnet_macros::builtin]428fn builtin_format(str: IStr, vals: Any) -> Result<String> {429	std_format(str, vals.0)430}431432#[jrsonnet_macros::builtin]433fn builtin_range(from: i32, to: i32) -> Result<VecVal> {434	if to < from {435		return Ok(VecVal(Vec::new()));436	}437	let mut out = Vec::with_capacity((1 + to as usize - from as usize).max(0));438	for i in from as usize..=to as usize {439		out.push(Val::Num(i as f64));440	}441	Ok(VecVal(out))442}443444#[jrsonnet_macros::builtin]445fn builtin_char(n: u32) -> Result<char> {446	Ok(std::char::from_u32(n as u32).ok_or(InvalidUnicodeCodepointGot(n as u32))?)447}448449#[jrsonnet_macros::builtin]450fn builtin_encode_utf8(str: IStr) -> Result<Bytes> {451	Ok(Bytes(str.bytes().collect::<Vec<u8>>().into()))452}453454#[jrsonnet_macros::builtin]455fn builtin_decode_utf8(arr: Bytes) -> Result<IStr> {456	Ok(std::str::from_utf8(&arr.0)457		.map_err(|_| RuntimeError("bad utf8".into()))?458		.into())459}460461#[jrsonnet_macros::builtin]462fn builtin_md5(str: IStr) -> Result<String> {463	Ok(format!("{:x}", md5::compute(&str.as_bytes())))464}465466#[jrsonnet_macros::builtin]467fn builtin_trace(loc: CallLocation, str: IStr, rest: Any) -> Result<Any> {468	eprint!("TRACE:");469	if let Some(loc) = loc.0 {470		with_state(|s| {471			let locs = s.map_source_locations(&loc.0, &[loc.1]);472			eprint!(473				" {}:{}",474				loc.0.file_name().unwrap().to_str().unwrap(),475				locs[0].line476			);477		});478	}479	eprintln!(" {}", str);480	Ok(rest) as Result<Any>481}482483#[jrsonnet_macros::builtin]484fn builtin_base64(input: Either![Bytes, IStr]) -> Result<String> {485	use Either2::*;486	Ok(match input {487		A(a) => base64::encode(a.0),488		B(l) => base64::encode(l.bytes().collect::<Vec<_>>()),489	})490}491492#[jrsonnet_macros::builtin]493fn builtin_base64_decode_bytes(input: IStr) -> Result<Bytes> {494	Ok(Bytes(495		base64::decode(&input.as_bytes())496			.map_err(|_| RuntimeError("bad base64".into()))?497			.into(),498	))499}500501#[jrsonnet_macros::builtin]502fn builtin_base64_decode(input: IStr) -> Result<String> {503	let bytes = base64::decode(&input.as_bytes()).map_err(|_| RuntimeError("bad base64".into()))?;504	Ok(String::from_utf8(bytes).map_err(|_| RuntimeError("bad utf8".into()))?)505}506507#[jrsonnet_macros::builtin]508fn builtin_join(sep: IndexableVal, arr: ArrValue) -> Result<IndexableVal> {509	Ok(match sep {510		IndexableVal::Arr(joiner_items) => {511			let mut out = Vec::new();512513			let mut first = true;514			for item in arr.iter() {515				let item = item?.clone();516				if let Val::Arr(items) = item {517					if !first {518						out.reserve(joiner_items.len());519						// TODO: extend520						for item in joiner_items.iter() {521							out.push(item?);522						}523					}524					first = false;525					out.reserve(items.len());526					// TODO: extend527					for item in items.iter() {528						out.push(item?);529					}530				} else {531					throw!(RuntimeError(532						"in std.join all items should be arrays".into()533					));534				}535			}536537			IndexableVal::Arr(out.into())538		}539		IndexableVal::Str(sep) => {540			let mut out = String::new();541542			let mut first = true;543			for item in arr.iter() {544				let item = item?.clone();545				if let Val::Str(item) = item {546					if !first {547						out += &sep;548					}549					first = false;550					out += &item;551				} else {552					throw!(RuntimeError(553						"in std.join all items should be strings".into()554					));555				}556			}557558			IndexableVal::Str(out.into())559		}560	})561}562563#[jrsonnet_macros::builtin]564fn builtin_escape_string_json(str_: IStr) -> Result<String> {565	Ok(escape_string_json(&str_))566}567568#[jrsonnet_macros::builtin]569fn builtin_manifest_json_ex(570	value: Any,571	indent: IStr,572	newline: Option<IStr>,573	key_val_sep: Option<IStr>,574) -> Result<String> {575	let newline = newline.as_deref().unwrap_or("\n");576	let key_val_sep = key_val_sep.as_deref().unwrap_or(": ");577	manifest_json_ex(578		&value.0,579		&ManifestJsonOptions {580			padding: &indent,581			mtype: ManifestType::Std,582			newline,583			key_val_sep,584		},585	)586}587588#[jrsonnet_macros::builtin]589fn builtin_manifest_yaml_doc(590	value: Any,591	indent_array_in_object: Option<bool>,592	quote_keys: Option<bool>,593) -> Result<String> {594	manifest_yaml_ex(595		&value.0,596		&ManifestYamlOptions {597			padding: "  ",598			arr_element_padding: if indent_array_in_object.unwrap_or(false) {599				"  "600			} else {601				""602			},603			quote_keys: quote_keys.unwrap_or(true),604		},605	)606}607608#[jrsonnet_macros::builtin]609fn builtin_reverse(value: ArrValue) -> Result<ArrValue> {610	Ok(value.reversed())611}612613#[jrsonnet_macros::builtin]614const fn builtin_id(v: Any) -> Result<Any> {615	Ok(v)616}617618#[jrsonnet_macros::builtin]619fn builtin_str_replace(str: String, from: IStr, to: IStr) -> Result<String> {620	Ok(str.replace(&from as &str, &to as &str))621}622623#[jrsonnet_macros::builtin]624fn builtin_splitlimit(str: IStr, c: char, maxsplits: Either![usize, M1]) -> Result<VecVal> {625	use Either2::*;626	Ok(VecVal(match maxsplits {627		A(n) => str.splitn(n + 1, c).map(|s| Val::Str(s.into())).collect(),628		B(_) => str.split(c).map(|s| Val::Str(s.into())).collect(),629	}))630}631632#[jrsonnet_macros::builtin]633fn builtin_ascii_upper(str: IStr) -> Result<String> {634	Ok(str.to_ascii_uppercase())635}636637#[jrsonnet_macros::builtin]638fn builtin_ascii_lower(str: IStr) -> Result<String> {639	Ok(str.to_ascii_lowercase())640}641642#[jrsonnet_macros::builtin]643fn builtin_member(arr: IndexableVal, x: Any) -> Result<bool> {644	match arr {645		IndexableVal::Str(s) => {646			let x: IStr = IStr::try_from(x.0)?;647			Ok(!x.is_empty() && s.contains(&*x))648		}649		IndexableVal::Arr(a) => {650			for item in a.iter() {651				let item = item?;652				if equals(&item, &x.0)? {653					return Ok(true);654				}655			}656			Ok(false)657		}658	}659}660661#[jrsonnet_macros::builtin]662fn builtin_count(arr: Vec<Any>, v: Any) -> Result<usize> {663	let mut count = 0;664	for item in arr.iter() {665		if equals(&item.0, &v.0)? {666			count += 1;667		}668	}669	Ok(count)670}
modifiedcrates/jrsonnet-evaluator/src/typed/conversions.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/typed/conversions.rs
+++ b/crates/jrsonnet-evaluator/src/typed/conversions.rs
@@ -343,7 +343,7 @@
 	type Error = LocError;
 
 	fn try_from(value: Bytes) -> Result<Self> {
-		Ok(Val::Arr(ArrValue::Bytes(value.0)))
+		Ok(Self::Arr(ArrValue::Bytes(value.0)))
 	}
 }