git.delta.rocks / jrsonnet / refs/commits / 80f37a416bf7

difftreelog

style enforce import style

Yaroslav Bolyukin2022-04-20parent: #4c00868.patch.diff
in: master

38 files changed

modified.rustfmt.tomldiffbeforeafterboth
--- a/.rustfmt.toml
+++ b/.rustfmt.toml
@@ -1 +1,3 @@
 hard_tabs = true
+imports_granularity = "crate"
+group_imports = "stdexternalcrate"
modifiedbindings/jsonnet/src/import.rsdiffbeforeafterboth
--- a/bindings/jsonnet/src/import.rs
+++ b/bindings/jsonnet/src/import.rs
@@ -1,9 +1,5 @@
 //! Import resolution manipulation utilities
 
-use jrsonnet_evaluator::{
-	error::{Error::*, Result},
-	throw, EvaluationState, ImportResolver,
-};
 use std::{
 	any::Any,
 	cell::RefCell,
@@ -17,6 +13,11 @@
 	rc::Rc,
 };
 
+use jrsonnet_evaluator::{
+	error::{Error::*, Result},
+	throw, EvaluationState, ImportResolver,
+};
+
 pub type JsonnetImportCallback = unsafe extern "C" fn(
 	ctx: *mut c_void,
 	base: *const c_char,
modifiedbindings/jsonnet/src/interop.rsdiffbeforeafterboth
--- a/bindings/jsonnet/src/interop.rs
+++ b/bindings/jsonnet/src/interop.rs
@@ -1,12 +1,14 @@
 //! Jrsonnet specific additional binding helpers
 
-use crate::{import::jsonnet_import_callback, native::jsonnet_native_callback};
-use jrsonnet_evaluator::{EvaluationState, Val};
 use std::{
 	ffi::c_void,
 	os::raw::{c_char, c_int},
 };
 
+use jrsonnet_evaluator::{EvaluationState, Val};
+
+use crate::{import::jsonnet_import_callback, native::jsonnet_native_callback};
+
 extern "C" {
 	pub fn _jrsonnet_static_import_callback(
 		ctx: *mut c_void,
modifiedbindings/jsonnet/src/lib.rsdiffbeforeafterboth
--- a/bindings/jsonnet/src/lib.rs
+++ b/bindings/jsonnet/src/lib.rs
@@ -8,8 +8,6 @@
 pub mod val_modify;
 pub mod vars_tlas;
 
-use import::NativeImportResolver;
-use jrsonnet_evaluator::{EvaluationState, IStr, ManifestFormat, Val};
 use std::{
 	alloc::Layout,
 	ffi::{CStr, CString},
@@ -17,6 +15,9 @@
 	path::PathBuf,
 };
 
+use import::NativeImportResolver;
+use jrsonnet_evaluator::{EvaluationState, IStr, ManifestFormat, Val};
+
 /// WASM stub
 #[cfg(target_arch = "wasm32")]
 #[no_mangle]
modifiedbindings/jsonnet/src/native.rsdiffbeforeafterboth
--- a/bindings/jsonnet/src/native.rs
+++ b/bindings/jsonnet/src/native.rs
@@ -1,3 +1,11 @@
+use std::{
+	convert::TryFrom,
+	ffi::{c_void, CStr},
+	os::raw::{c_char, c_int},
+	path::Path,
+	rc::Rc,
+};
+
 use gcmodule::Cc;
 use jrsonnet_evaluator::{
 	error::{Error, LocError},
@@ -5,13 +13,6 @@
 	gc::TraceBox,
 	native::{NativeCallback, NativeCallbackHandler},
 	EvaluationState, IStr, Val,
-};
-use std::{
-	convert::TryFrom,
-	ffi::{c_void, CStr},
-	os::raw::{c_char, c_int},
-	path::Path,
-	rc::Rc,
 };
 
 type JsonnetNativeCallback = unsafe extern "C" fn(
modifiedbindings/jsonnet/src/val_extract.rsdiffbeforeafterboth
--- a/bindings/jsonnet/src/val_extract.rs
+++ b/bindings/jsonnet/src/val_extract.rs
@@ -1,12 +1,12 @@
 //! Extract values from VM
 
-use jrsonnet_evaluator::{EvaluationState, Val};
-
 use std::{
 	ffi::CString,
 	os::raw::{c_char, c_double, c_int},
 };
 
+use jrsonnet_evaluator::{EvaluationState, Val};
+
 #[no_mangle]
 pub extern "C" fn jsonnet_json_extract_string(_vm: &EvaluationState, v: &Val) -> *mut c_char {
 	match v {
modifiedbindings/jsonnet/src/val_make.rsdiffbeforeafterboth
--- a/bindings/jsonnet/src/val_make.rs
+++ b/bindings/jsonnet/src/val_make.rs
@@ -1,12 +1,13 @@
 //! Create values in VM
 
-use gcmodule::Cc;
-use jrsonnet_evaluator::{ArrValue, EvaluationState, ObjValue, Val};
 use std::{
 	ffi::CStr,
 	os::raw::{c_char, c_double, c_int},
 };
 
+use gcmodule::Cc;
+use jrsonnet_evaluator::{val::ArrValue, EvaluationState, ObjValue, Val};
+
 /// # Safety
 ///
 /// This function is safe, if received v is a pointer to normal C string
modifiedbindings/jsonnet/src/val_modify.rsdiffbeforeafterboth
--- a/bindings/jsonnet/src/val_modify.rs
+++ b/bindings/jsonnet/src/val_modify.rs
@@ -2,10 +2,11 @@
 //! Only tested with variables, which haven't altered by code before appearing here
 //! In jrsonnet every value is immutable, and this code is probally broken
 
+use std::{ffi::CStr, os::raw::c_char};
+
 use gcmodule::Cc;
-use jrsonnet_evaluator::{ArrValue, EvaluationState, LazyBinding, LazyVal, ObjMember, Val};
+use jrsonnet_evaluator::{val::ArrValue, EvaluationState, LazyBinding, LazyVal, ObjMember, Val};
 use jrsonnet_parser::Visibility;
-use std::{ffi::CStr, os::raw::c_char};
 
 /// # Safety
 ///
modifiedbindings/jsonnet/src/vars_tlas.rsdiffbeforeafterboth
--- a/bindings/jsonnet/src/vars_tlas.rs
+++ b/bindings/jsonnet/src/vars_tlas.rs
@@ -1,8 +1,9 @@
 //! Manipulate external variables and top level arguments
 
-use jrsonnet_evaluator::EvaluationState;
 use std::{ffi::CStr, os::raw::c_char};
 
+use jrsonnet_evaluator::EvaluationState;
+
 /// # Safety
 #[no_mangle]
 pub unsafe extern "C" fn jsonnet_ext_var(
modifiedcmds/jrsonnet/src/main.rsdiffbeforeafterboth
--- a/cmds/jrsonnet/src/main.rs
+++ b/cmds/jrsonnet/src/main.rs
@@ -1,13 +1,13 @@
+use std::{
+	fs::{create_dir_all, File},
+	io::{Read, Write},
+	path::PathBuf,
+};
+
 use clap::{AppSettings, IntoApp, Parser};
 use clap_complete::Shell;
 use jrsonnet_cli::{ConfigureState, GcOpts, GeneralOpts, InputOpts, ManifestOpts, OutputOpts};
 use jrsonnet_evaluator::{error::LocError, EvaluationState};
-use std::{
-	fs::{create_dir_all, File},
-	io::Read,
-	io::Write,
-	path::PathBuf,
-};
 
 #[cfg(feature = "mimalloc")]
 #[global_allocator]
modifiedcrates/jrsonnet-cli/src/ext.rsdiffbeforeafterboth
--- a/crates/jrsonnet-cli/src/ext.rs
+++ b/crates/jrsonnet-cli/src/ext.rs
@@ -1,8 +1,10 @@
-use crate::ConfigureState;
+use std::{fs::read_to_string, str::FromStr};
+
 use clap::Parser;
 use jrsonnet_evaluator::{error::Result, EvaluationState};
-use std::{fs::read_to_string, str::FromStr};
 
+use crate::ConfigureState;
+
 #[derive(Clone)]
 pub struct ExtStr {
 	pub name: String,
modifiedcrates/jrsonnet-cli/src/lib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-cli/src/lib.rs
+++ b/crates/jrsonnet-cli/src/lib.rs
@@ -3,14 +3,14 @@
 mod tla;
 mod trace;
 
+use std::{env, path::PathBuf};
+
+use clap::Parser;
 pub use ext::*;
+use jrsonnet_evaluator::{error::Result, EvaluationState, FileImportResolver};
 pub use manifest::*;
 pub use tla::*;
 pub use trace::*;
-
-use clap::Parser;
-use jrsonnet_evaluator::{error::Result, EvaluationState, FileImportResolver};
-use std::{env, path::PathBuf};
 
 pub trait ConfigureState {
 	fn configure(&self, state: &EvaluationState) -> Result<()>;
modifiedcrates/jrsonnet-cli/src/manifest.rsdiffbeforeafterboth
--- a/crates/jrsonnet-cli/src/manifest.rs
+++ b/crates/jrsonnet-cli/src/manifest.rs
@@ -1,8 +1,10 @@
-use crate::ConfigureState;
+use std::{path::PathBuf, str::FromStr};
+
 use clap::Parser;
 use jrsonnet_evaluator::{error::Result, EvaluationState, ManifestFormat};
-use std::{path::PathBuf, str::FromStr};
 
+use crate::ConfigureState;
+
 pub enum ManifestFormatName {
 	/// Expect string as output, and write them directly
 	String,
modifiedcrates/jrsonnet-cli/src/tla.rsdiffbeforeafterboth
--- a/crates/jrsonnet-cli/src/tla.rs
+++ b/crates/jrsonnet-cli/src/tla.rs
@@ -1,7 +1,8 @@
-use crate::{ConfigureState, ExtFile, ExtStr};
 use clap::Parser;
 use jrsonnet_evaluator::{error::Result, EvaluationState};
 
+use crate::{ConfigureState, ExtFile, ExtStr};
+
 #[derive(Parser)]
 #[clap(next_help_heading = "TOP LEVEL ARGUMENTS")]
 pub struct TLAOpts {
modifiedcrates/jrsonnet-cli/src/trace.rsdiffbeforeafterboth
--- a/crates/jrsonnet-cli/src/trace.rs
+++ b/crates/jrsonnet-cli/src/trace.rs
@@ -1,12 +1,14 @@
-use crate::ConfigureState;
+use std::str::FromStr;
+
 use clap::Parser;
 use jrsonnet_evaluator::{
 	error::Result,
 	trace::{CompactFormat, ExplainingFormat, PathResolver},
 	EvaluationState,
 };
-use std::str::FromStr;
 
+use crate::ConfigureState;
+
 #[derive(PartialEq)]
 pub enum TraceFormatName {
 	Compact,
modifiedcrates/jrsonnet-evaluator/build.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/build.rs
+++ b/crates/jrsonnet-evaluator/build.rs
@@ -1,6 +1,3 @@
-use bincode::serialize;
-use jrsonnet_parser::{parse, ParserSettings};
-use jrsonnet_stdlib::STDLIB_STR;
 use std::{
 	env,
 	fs::File,
@@ -8,6 +5,10 @@
 	path::{Path, PathBuf},
 };
 
+use bincode::serialize;
+use jrsonnet_parser::{parse, ParserSettings};
+use jrsonnet_stdlib::STDLIB_STR;
+
 fn main() {
 	let parsed = parse(
 		STDLIB_STR,
modifiedcrates/jrsonnet-evaluator/src/builtin/format.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/builtin/format.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/format.rs
@@ -1,13 +1,15 @@
 //! faster std.format impl
 #![allow(clippy::too_many_arguments)]
 
-use crate::{error::Error::*, throw, LocError, ObjValue, Result, Val};
+use std::convert::TryFrom;
+
 use gcmodule::Trace;
 use jrsonnet_interner::IStr;
 use jrsonnet_types::ValType;
-use std::convert::TryFrom;
 use thiserror::Error;
 
+use crate::{error::Error::*, throw, LocError, ObjValue, Result, Val};
+
 #[derive(Debug, Clone, Error, Trace)]
 pub enum FormatError {
 	#[error("truncated format code")]
modifiedcrates/jrsonnet-evaluator/src/builtin/manifest.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/builtin/manifest.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/manifest.rs
@@ -1,7 +1,7 @@
-use crate::error::Error::*;
-use crate::error::Result;
-use crate::push_description_frame;
-use crate::{throw, Val};
+use crate::{
+	error::{Error::*, Result},
+	push_description_frame, throw, Val,
+};
 
 #[derive(PartialEq, Clone, Copy)]
 pub enum ManifestType {
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 gcmodule::Cc;15use jrsonnet_interner::IStr;16use serde::Deserialize;17use serde_yaml::DeserializingQuirks;18use std::collections::HashMap;19use std::convert::{TryFrom, TryInto};2021pub mod stdlib;22pub use stdlib::*;2324use self::manifest::{escape_string_json, manifest_json_ex, ManifestJsonOptions, ManifestType};2526pub mod format;27pub mod manifest;28pub mod sort;2930pub fn std_format(str: IStr, vals: Val) -> Result<String> {31	push_frame(32		CallLocation::native(),33		|| format!("std.format of {}", str),34		|| {35			Ok(match vals {36				Val::Arr(vals) => format_arr(&str, &vals.evaluated()?)?,37				Val::Obj(obj) => format_obj(&str, &obj)?,38				o => format_arr(&str, &[o])?,39			})40		},41	)42}4344pub fn std_slice(45	indexable: IndexableVal,46	index: Option<BoundedUsize<0, { i32::MAX as usize }>>,47	end: Option<BoundedUsize<0, { i32::MAX as usize }>>,48	step: Option<BoundedUsize<1, { i32::MAX as usize }>>,49) -> Result<Val> {50	match &indexable {51		IndexableVal::Str(s) => {52			let index = index.as_deref().copied().unwrap_or(0);53			let end = end.as_deref().copied().unwrap_or(usize::MAX);54			let step = step.as_deref().copied().unwrap_or(1);5556			if index >= end {57				return Ok(Val::Str("".into()));58			}5960			Ok(Val::Str(61			(s.chars()62				.skip(index)63				.take(end - index)64				.step_by(step)65				.collect::<String>())66			.into(),67			))68		}69		IndexableVal::Arr(arr) => {70			let index = index.as_deref().copied().unwrap_or(0);71			let end = end.as_deref().copied().unwrap_or(usize::MAX).min(arr.len());72			let step = step.as_deref().copied().unwrap_or(1);7374			if index >= end {75				return Ok(Val::Arr(ArrValue::new_eager()));76			}7778			Ok(Val::Arr(ArrValue::Slice(Box::new(Slice {79				inner: arr.clone(),80				from: index as u32,81				to: end as u32,82				step: step as u32,83			}))))84		}85	}86}8788type BuiltinsType = HashMap<IStr, &'static dyn StaticBuiltin>;8990thread_local! {91	pub static BUILTINS: BuiltinsType = {92		[93			("length".into(), builtin_length::INST),94			("type".into(), builtin_type::INST),95			("makeArray".into(), builtin_make_array::INST),96			("codepoint".into(), builtin_codepoint::INST),97			("objectFieldsEx".into(), builtin_object_fields_ex::INST),98			("objectHasEx".into(), builtin_object_has_ex::INST),99			("slice".into(), builtin_slice::INST),100			("substr".into(), builtin_substr::INST),101			("primitiveEquals".into(), builtin_primitive_equals::INST),102			("equals".into(), builtin_equals::INST),103			("modulo".into(), builtin_modulo::INST),104			("mod".into(), builtin_mod::INST),105			("floor".into(), builtin_floor::INST),106			("ceil".into(), builtin_ceil::INST),107			("log".into(), builtin_log::INST),108			("pow".into(), builtin_pow::INST),109			("sqrt".into(), builtin_sqrt::INST),110			("sin".into(), builtin_sin::INST),111			("cos".into(), builtin_cos::INST),112			("tan".into(), builtin_tan::INST),113			("asin".into(), builtin_asin::INST),114			("acos".into(), builtin_acos::INST),115			("atan".into(), builtin_atan::INST),116			("exp".into(), builtin_exp::INST),117			("mantissa".into(), builtin_mantissa::INST),118			("exponent".into(), builtin_exponent::INST),119			("extVar".into(), builtin_ext_var::INST),120			("native".into(), builtin_native::INST),121			("filter".into(), builtin_filter::INST),122			("map".into(), builtin_map::INST),123			("flatMap".into(), builtin_flatmap::INST),124			("foldl".into(), builtin_foldl::INST),125			("foldr".into(), builtin_foldr::INST),126			("sort".into(), builtin_sort::INST),127			("format".into(), builtin_format::INST),128			("range".into(), builtin_range::INST),129			("char".into(), builtin_char::INST),130			("encodeUTF8".into(), builtin_encode_utf8::INST),131			("decodeUTF8".into(), builtin_decode_utf8::INST),132			("md5".into(), builtin_md5::INST),133			("base64".into(), builtin_base64::INST),134			("base64DecodeBytes".into(), builtin_base64_decode_bytes::INST),135			("base64Decode".into(), builtin_base64_decode::INST),136			("trace".into(), builtin_trace::INST),137			("join".into(), builtin_join::INST),138			("escapeStringJson".into(), builtin_escape_string_json::INST),139			("manifestJsonEx".into(), builtin_manifest_json_ex::INST),140			("manifestYamlDoc".into(), builtin_manifest_yaml_doc::INST),141			("reverse".into(), builtin_reverse::INST),142			("id".into(), builtin_id::INST),143			("strReplace".into(), builtin_str_replace::INST),144			("splitLimit".into(), builtin_splitlimit::INST),145			("parseJson".into(), builtin_parse_json::INST),146			("parseYaml".into(), builtin_parse_yaml::INST),147			("asciiUpper".into(), builtin_ascii_upper::INST),148			("asciiLower".into(), builtin_ascii_lower::INST),149			("member".into(), builtin_member::INST),150			("count".into(), builtin_count::INST),151			("any".into(), builtin_any::INST),152			("all".into(), builtin_all::INST),153		].iter().cloned().collect()154	};155}156157#[jrsonnet_macros::builtin]158fn builtin_length(x: Either![IStr, ArrValue, ObjValue, FuncVal]) -> Result<usize> {159	use Either4::*;160	Ok(match x {161		A(x) => x.chars().count(),162		B(x) => x.len(),163		C(x) => x164			.fields_visibility()165			.into_iter()166			.filter(|(_k, v)| *v)167			.count(),168		D(f) => f.args_len(),169	})170}171172#[jrsonnet_macros::builtin]173fn builtin_type(x: Any) -> Result<IStr> {174	Ok(x.0.value_type().name().into())175}176177#[jrsonnet_macros::builtin]178fn builtin_make_array(sz: usize, func: FuncVal) -> Result<VecVal> {179	let mut out = Vec::with_capacity(sz);180	for i in 0..sz {181		out.push(func.evaluate_simple(&[i as f64].as_slice())?)182	}183	Ok(VecVal(Cc::new(out)))184}185186#[jrsonnet_macros::builtin]187const fn builtin_codepoint(str: char) -> Result<u32> {188	Ok(str as u32)189}190191#[jrsonnet_macros::builtin]192fn builtin_object_fields_ex(obj: ObjValue, inc_hidden: bool) -> Result<VecVal> {193	let out = obj.fields_ex(inc_hidden);194	Ok(VecVal(Cc::new(195		out.into_iter().map(Val::Str).collect::<Vec<_>>(),196	)))197}198199#[jrsonnet_macros::builtin]200fn builtin_object_has_ex(obj: ObjValue, f: IStr, inc_hidden: bool) -> Result<bool> {201	Ok(obj.has_field_ex(f, inc_hidden))202}203204#[jrsonnet_macros::builtin]205fn builtin_parse_json(s: IStr) -> Result<Any> {206	let value: serde_json::Value = serde_json::from_str(&s)207		.map_err(|e| RuntimeError(format!("failed to parse json: {}", e).into()))?;208	Ok(Any(Val::try_from(&value)?))209}210211#[jrsonnet_macros::builtin]212fn builtin_parse_yaml(s: IStr) -> Result<Any> {213	let value = serde_yaml::Deserializer::from_str_with_quirks(214		&s,215		DeserializingQuirks { old_octals: true },216	);217	let mut out = vec![];218	for item in value {219		let value = serde_json::Value::deserialize(item)220			.map_err(|e| RuntimeError(format!("failed to parse yaml: {}", e).into()))?;221		let val = Val::try_from(&value)?;222		out.push(val);223	}224	Ok(Any(if out.is_empty() {225		Val::Null226	} else if out.len() == 1 {227		out.into_iter().next().unwrap()228	} else {229		Val::Arr(out.into())230	}))231}232233#[jrsonnet_macros::builtin]234fn builtin_slice(235	indexable: IndexableVal,236	index: Option<BoundedUsize<0, { i32::MAX as usize }>>,237	end: Option<BoundedUsize<0, { i32::MAX as usize }>>,238	step: Option<BoundedUsize<1, { i32::MAX as usize }>>,239) -> Result<Any> {240	std_slice(indexable, index, end, step).map(Any)241}242243#[jrsonnet_macros::builtin]244fn builtin_substr(str: IStr, from: usize, len: usize) -> Result<String> {245	Ok(str.chars().skip(from as usize).take(len as usize).collect())246}247248#[jrsonnet_macros::builtin]249fn builtin_primitive_equals(a: Any, b: Any) -> Result<bool> {250	primitive_equals(&a.0, &b.0)251}252253#[jrsonnet_macros::builtin]254fn builtin_equals(a: Any, b: Any) -> Result<bool> {255	equals(&a.0, &b.0)256}257258#[jrsonnet_macros::builtin]259fn builtin_modulo(a: f64, b: f64) -> Result<f64> {260	Ok(a % b)261}262263#[jrsonnet_macros::builtin]264fn builtin_mod(a: Either![f64, IStr], b: Any) -> Result<Any> {265	use Either2::*;266	Ok(Any(evaluate_mod_op(267		&match a {268			A(v) => Val::Num(v),269			B(s) => Val::Str(s),270		},271		&b.0,272	)?))273}274275#[jrsonnet_macros::builtin]276fn builtin_floor(x: f64) -> Result<f64> {277	Ok(x.floor())278}279280#[jrsonnet_macros::builtin]281fn builtin_ceil(x: f64) -> Result<f64> {282	Ok(x.ceil())283}284285#[jrsonnet_macros::builtin]286fn builtin_log(n: f64) -> Result<f64> {287	Ok(n.ln())288}289290#[jrsonnet_macros::builtin]291fn builtin_pow(x: f64, n: f64) -> Result<f64> {292	Ok(x.powf(n))293}294295#[jrsonnet_macros::builtin]296fn builtin_sqrt(x: PositiveF64) -> Result<f64> {297	Ok(x.0.sqrt())298}299300#[jrsonnet_macros::builtin]301fn builtin_sin(x: f64) -> Result<f64> {302	Ok(x.sin())303}304305#[jrsonnet_macros::builtin]306fn builtin_cos(x: f64) -> Result<f64> {307	Ok(x.cos())308}309310#[jrsonnet_macros::builtin]311fn builtin_tan(x: f64) -> Result<f64> {312	Ok(x.tan())313}314315#[jrsonnet_macros::builtin]316fn builtin_asin(x: f64) -> Result<f64> {317	Ok(x.asin())318}319320#[jrsonnet_macros::builtin]321fn builtin_acos(x: f64) -> Result<f64> {322	Ok(x.acos())323}324325#[jrsonnet_macros::builtin]326fn builtin_atan(x: f64) -> Result<f64> {327	Ok(x.atan())328}329330#[jrsonnet_macros::builtin]331fn builtin_exp(x: f64) -> Result<f64> {332	Ok(x.exp())333}334335fn frexp(s: f64) -> (f64, i16) {336	if 0.0 == s {337		(s, 0)338	} else {339		let lg = s.abs().log2();340		let x = (lg - lg.floor() - 1.0).exp2();341		let exp = lg.floor() + 1.0;342		(s.signum() * x, exp as i16)343	}344}345346#[jrsonnet_macros::builtin]347fn builtin_mantissa(x: f64) -> Result<f64> {348	Ok(frexp(x).0)349}350351#[jrsonnet_macros::builtin]352fn builtin_exponent(x: f64) -> Result<i16> {353	Ok(frexp(x).1)354}355356#[jrsonnet_macros::builtin]357fn builtin_ext_var(x: IStr) -> Result<Any> {358	Ok(Any(with_state(|s| s.settings().ext_vars.get(&x).cloned())359		.ok_or(UndefinedExternalVariable(x))?))360}361362#[jrsonnet_macros::builtin]363fn builtin_native(name: IStr) -> Result<FuncVal> {364	Ok(with_state(|s| s.settings().ext_natives.get(&name).cloned())365		.map(|v| FuncVal::Builtin(v.clone()))366		.ok_or(UndefinedExternalFunction(name))?)367}368369#[jrsonnet_macros::builtin]370fn builtin_filter(func: FuncVal, arr: ArrValue) -> Result<ArrValue> {371	arr.filter(|val| bool::try_from(func.evaluate_simple(&[Any(val.clone())].as_slice())?))372}373374#[jrsonnet_macros::builtin]375fn builtin_map(func: FuncVal, arr: ArrValue) -> Result<ArrValue> {376	arr.map(|val| func.evaluate_simple(&[Any(val)].as_slice()))377}378379#[jrsonnet_macros::builtin]380fn builtin_flatmap(func: FuncVal, arr: IndexableVal) -> Result<IndexableVal> {381	match arr {382		IndexableVal::Str(s) => {383			let mut out = String::new();384			for c in s.chars() {385				match func.evaluate_simple(&[c.to_string()].as_slice())? {386					Val::Str(o) => out.push_str(&o),387					_ => throw!(RuntimeError(388						"in std.join all items should be strings".into()389					)),390				};391			}392			Ok(IndexableVal::Str(out.into()))393		}394		IndexableVal::Arr(a) => {395			let mut out = Vec::new();396			for el in a.iter() {397				let el = el?;398				match func.evaluate_simple(&[Any(el)].as_slice())? {399					Val::Arr(o) => {400						for oe in o.iter() {401							out.push(oe?)402						}403					}404					_ => throw!(RuntimeError(405						"in std.join all items should be arrays".into()406					)),407				};408			}409			Ok(IndexableVal::Arr(out.into()))410		}411	}412}413414#[jrsonnet_macros::builtin]415fn builtin_foldl(func: FuncVal, arr: ArrValue, init: Any) -> Result<Any> {416	let mut acc = init.0;417	for i in arr.iter() {418		acc = func.evaluate_simple(&[Any(acc), Any(i?)].as_slice())?;419	}420	Ok(Any(acc))421}422423#[jrsonnet_macros::builtin]424fn builtin_foldr(func: FuncVal, arr: ArrValue, init: Any) -> Result<Any> {425	let mut acc = init.0;426	for i in arr.iter().rev() {427		acc = func.evaluate_simple(&[Any(i?), Any(acc)].as_slice())?;428	}429	Ok(Any(acc))430}431432#[jrsonnet_macros::builtin]433#[allow(non_snake_case)]434fn builtin_sort(arr: ArrValue, keyF: Option<FuncVal>) -> Result<ArrValue> {435	if arr.len() <= 1 {436		return Ok(arr);437	}438	Ok(ArrValue::Eager(sort::sort(439		arr.evaluated()?,440		keyF.as_ref(),441	)?))442}443444#[jrsonnet_macros::builtin]445fn builtin_format(str: IStr, vals: Any) -> Result<String> {446	std_format(str, vals.0)447}448449#[jrsonnet_macros::builtin]450fn builtin_range(from: i32, to: i32) -> Result<ArrValue> {451	if to < from {452		return Ok(ArrValue::new_eager());453	}454	Ok(ArrValue::new_range(from, to))455}456457#[jrsonnet_macros::builtin]458fn builtin_char(n: u32) -> Result<char> {459	Ok(std::char::from_u32(n as u32).ok_or(InvalidUnicodeCodepointGot(n as u32))?)460}461462#[jrsonnet_macros::builtin]463fn builtin_encode_utf8(str: IStr) -> Result<Bytes> {464	Ok(Bytes(str.bytes().collect::<Vec<u8>>().into()))465}466467#[jrsonnet_macros::builtin]468fn builtin_decode_utf8(arr: Bytes) -> Result<IStr> {469	Ok(std::str::from_utf8(&arr.0)470		.map_err(|_| RuntimeError("bad utf8".into()))?471		.into())472}473474#[jrsonnet_macros::builtin]475fn builtin_md5(str: IStr) -> Result<String> {476	Ok(format!("{:x}", md5::compute(&str.as_bytes())))477}478479#[jrsonnet_macros::builtin]480fn builtin_trace(loc: CallLocation, str: IStr, rest: Any) -> Result<Any> {481	eprint!("TRACE:");482	if let Some(loc) = loc.0 {483		with_state(|s| {484			let locs = s.map_source_locations(&loc.0, &[loc.1]);485			eprint!(486				" {}:{}",487				loc.0.file_name().unwrap().to_str().unwrap(),488				locs[0].line489			);490		});491	}492	eprintln!(" {}", str);493	Ok(rest) as Result<Any>494}495496#[jrsonnet_macros::builtin]497fn builtin_base64(input: Either![Bytes, IStr]) -> Result<String> {498	use Either2::*;499	Ok(match input {500		A(a) => base64::encode(a.0),501		B(l) => base64::encode(l.bytes().collect::<Vec<_>>()),502	})503}504505#[jrsonnet_macros::builtin]506fn builtin_base64_decode_bytes(input: IStr) -> Result<Bytes> {507	Ok(Bytes(508		base64::decode(&input.as_bytes())509			.map_err(|_| RuntimeError("bad base64".into()))?510			.into(),511	))512}513514#[jrsonnet_macros::builtin]515fn builtin_base64_decode(input: IStr) -> Result<String> {516	let bytes = base64::decode(&input.as_bytes()).map_err(|_| RuntimeError("bad base64".into()))?;517	Ok(String::from_utf8(bytes).map_err(|_| RuntimeError("bad utf8".into()))?)518}519520#[jrsonnet_macros::builtin]521fn builtin_join(sep: IndexableVal, arr: ArrValue) -> Result<IndexableVal> {522	Ok(match sep {523		IndexableVal::Arr(joiner_items) => {524			let mut out = Vec::new();525526			let mut first = true;527			for item in arr.iter() {528				let item = item?.clone();529				if let Val::Arr(items) = item {530					if !first {531						out.reserve(joiner_items.len());532						// TODO: extend533						for item in joiner_items.iter() {534							out.push(item?);535						}536					}537					first = false;538					out.reserve(items.len());539					// TODO: extend540					for item in items.iter() {541						out.push(item?);542					}543				} else {544					throw!(RuntimeError(545						"in std.join all items should be arrays".into()546					));547				}548			}549550			IndexableVal::Arr(out.into())551		}552		IndexableVal::Str(sep) => {553			let mut out = String::new();554555			let mut first = true;556			for item in arr.iter() {557				let item = item?.clone();558				if let Val::Str(item) = item {559					if !first {560						out += &sep;561					}562					first = false;563					out += &item;564				} else {565					throw!(RuntimeError(566						"in std.join all items should be strings".into()567					));568				}569			}570571			IndexableVal::Str(out.into())572		}573	})574}575576#[jrsonnet_macros::builtin]577fn builtin_escape_string_json(str_: IStr) -> Result<String> {578	Ok(escape_string_json(&str_))579}580581#[jrsonnet_macros::builtin]582fn builtin_manifest_json_ex(583	value: Any,584	indent: IStr,585	newline: Option<IStr>,586	key_val_sep: Option<IStr>,587) -> Result<String> {588	let newline = newline.as_deref().unwrap_or("\n");589	let key_val_sep = key_val_sep.as_deref().unwrap_or(": ");590	manifest_json_ex(591		&value.0,592		&ManifestJsonOptions {593			padding: &indent,594			mtype: ManifestType::Std,595			newline,596			key_val_sep,597		},598	)599}600601#[jrsonnet_macros::builtin]602fn builtin_manifest_yaml_doc(603	value: Any,604	indent_array_in_object: Option<bool>,605	quote_keys: Option<bool>,606) -> Result<String> {607	manifest_yaml_ex(608		&value.0,609		&ManifestYamlOptions {610			padding: "  ",611			arr_element_padding: if indent_array_in_object.unwrap_or(false) {612				"  "613			} else {614				""615			},616			quote_keys: quote_keys.unwrap_or(true),617		},618	)619}620621#[jrsonnet_macros::builtin]622fn builtin_reverse(value: ArrValue) -> Result<ArrValue> {623	Ok(value.reversed())624}625626#[jrsonnet_macros::builtin]627const fn builtin_id(v: Any) -> Result<Any> {628	Ok(v)629}630631#[jrsonnet_macros::builtin]632fn builtin_str_replace(str: String, from: IStr, to: IStr) -> Result<String> {633	Ok(str.replace(&from as &str, &to as &str))634}635636#[jrsonnet_macros::builtin]637fn builtin_splitlimit(str: IStr, c: IStr, maxsplits: Either![usize, M1]) -> Result<VecVal> {638	use Either2::*;639	Ok(VecVal(Cc::new(match maxsplits {640		A(n) => str641			.splitn(n + 1, &c as &str)642			.map(|s| Val::Str(s.into()))643			.collect(),644		B(_) => str.split(&c as &str).map(|s| Val::Str(s.into())).collect(),645	})))646}647648#[jrsonnet_macros::builtin]649fn builtin_ascii_upper(str: IStr) -> Result<String> {650	Ok(str.to_ascii_uppercase())651}652653#[jrsonnet_macros::builtin]654fn builtin_ascii_lower(str: IStr) -> Result<String> {655	Ok(str.to_ascii_lowercase())656}657658#[jrsonnet_macros::builtin]659fn builtin_member(arr: IndexableVal, x: Any) -> Result<bool> {660	match arr {661		IndexableVal::Str(s) => {662			let x: IStr = IStr::try_from(x.0)?;663			Ok(!x.is_empty() && s.contains(&*x))664		}665		IndexableVal::Arr(a) => {666			for item in a.iter() {667				let item = item?;668				if equals(&item, &x.0)? {669					return Ok(true);670				}671			}672			Ok(false)673		}674	}675}676677#[jrsonnet_macros::builtin]678fn builtin_count(arr: Vec<Any>, v: Any) -> Result<usize> {679	let mut count = 0;680	for item in arr.iter() {681		if equals(&item.0, &v.0)? {682			count += 1;683		}684	}685	Ok(count)686}687688#[jrsonnet_macros::builtin]689fn builtin_any(arr: ArrValue) -> Result<bool> {690	for v in arr.iter() {691		let v: bool = v?.try_into()?;692		if v {693			return Ok(true);694		}695	}696	Ok(false)697}698699#[jrsonnet_macros::builtin]700fn builtin_all(arr: ArrValue) -> Result<bool> {701	for v in arr.iter() {702		let v: bool = v?.try_into()?;703		if !v {704			return Ok(false);705		}706	}707	Ok(true)708}
after · crates/jrsonnet-evaluator/src/builtin/mod.rs
1use std::{2	collections::HashMap,3	convert::{TryFrom, TryInto},4};56use format::{format_arr, format_obj};7use gcmodule::Cc;8use jrsonnet_interner::IStr;9use serde::Deserialize;10use serde_yaml::DeserializingQuirks;1112use crate::{13	builtin::manifest::{manifest_yaml_ex, ManifestYamlOptions},14	error::{Error::*, Result},15	function::{CallLocation, StaticBuiltin},16	operator::evaluate_mod_op,17	push_frame, throw,18	typed::{Any, BoundedUsize, Bytes, Either2, Either4, PositiveF64, VecVal, M1},19	val::{equals, primitive_equals, ArrValue, FuncVal, IndexableVal, Slice},20	with_state, Either, ObjValue, Val,21};2223pub mod stdlib;24pub use stdlib::*;2526use self::manifest::{escape_string_json, manifest_json_ex, ManifestJsonOptions, ManifestType};2728pub mod format;29pub mod manifest;30pub mod sort;3132pub fn std_format(str: IStr, vals: Val) -> Result<String> {33	push_frame(34		CallLocation::native(),35		|| format!("std.format of {}", str),36		|| {37			Ok(match vals {38				Val::Arr(vals) => format_arr(&str, &vals.evaluated()?)?,39				Val::Obj(obj) => format_obj(&str, &obj)?,40				o => format_arr(&str, &[o])?,41			})42		},43	)44}4546pub fn std_slice(47	indexable: IndexableVal,48	index: Option<BoundedUsize<0, { i32::MAX as usize }>>,49	end: Option<BoundedUsize<0, { i32::MAX as usize }>>,50	step: Option<BoundedUsize<1, { i32::MAX as usize }>>,51) -> Result<Val> {52	match &indexable {53		IndexableVal::Str(s) => {54			let index = index.as_deref().copied().unwrap_or(0);55			let end = end.as_deref().copied().unwrap_or(usize::MAX);56			let step = step.as_deref().copied().unwrap_or(1);5758			if index >= end {59				return Ok(Val::Str("".into()));60			}6162			Ok(Val::Str(63				(s.chars()64					.skip(index)65					.take(end - index)66					.step_by(step)67					.collect::<String>())68				.into(),69			))70		}71		IndexableVal::Arr(arr) => {72			let index = index.as_deref().copied().unwrap_or(0);73			let end = end.as_deref().copied().unwrap_or(usize::MAX).min(arr.len());74			let step = step.as_deref().copied().unwrap_or(1);7576			if index >= end {77				return Ok(Val::Arr(ArrValue::new_eager()));78			}7980			Ok(Val::Arr(ArrValue::Slice(Box::new(Slice {81				inner: arr.clone(),82				from: index as u32,83				to: end as u32,84				step: step as u32,85			}))))86		}87	}88}8990type BuiltinsType = HashMap<IStr, &'static dyn StaticBuiltin>;9192thread_local! {93	pub static BUILTINS: BuiltinsType = {94		[95			("length".into(), builtin_length::INST),96			("type".into(), builtin_type::INST),97			("makeArray".into(), builtin_make_array::INST),98			("codepoint".into(), builtin_codepoint::INST),99			("objectFieldsEx".into(), builtin_object_fields_ex::INST),100			("objectHasEx".into(), builtin_object_has_ex::INST),101			("slice".into(), builtin_slice::INST),102			("substr".into(), builtin_substr::INST),103			("primitiveEquals".into(), builtin_primitive_equals::INST),104			("equals".into(), builtin_equals::INST),105			("modulo".into(), builtin_modulo::INST),106			("mod".into(), builtin_mod::INST),107			("floor".into(), builtin_floor::INST),108			("ceil".into(), builtin_ceil::INST),109			("log".into(), builtin_log::INST),110			("pow".into(), builtin_pow::INST),111			("sqrt".into(), builtin_sqrt::INST),112			("sin".into(), builtin_sin::INST),113			("cos".into(), builtin_cos::INST),114			("tan".into(), builtin_tan::INST),115			("asin".into(), builtin_asin::INST),116			("acos".into(), builtin_acos::INST),117			("atan".into(), builtin_atan::INST),118			("exp".into(), builtin_exp::INST),119			("mantissa".into(), builtin_mantissa::INST),120			("exponent".into(), builtin_exponent::INST),121			("extVar".into(), builtin_ext_var::INST),122			("native".into(), builtin_native::INST),123			("filter".into(), builtin_filter::INST),124			("map".into(), builtin_map::INST),125			("flatMap".into(), builtin_flatmap::INST),126			("foldl".into(), builtin_foldl::INST),127			("foldr".into(), builtin_foldr::INST),128			("sort".into(), builtin_sort::INST),129			("format".into(), builtin_format::INST),130			("range".into(), builtin_range::INST),131			("char".into(), builtin_char::INST),132			("encodeUTF8".into(), builtin_encode_utf8::INST),133			("decodeUTF8".into(), builtin_decode_utf8::INST),134			("md5".into(), builtin_md5::INST),135			("base64".into(), builtin_base64::INST),136			("base64DecodeBytes".into(), builtin_base64_decode_bytes::INST),137			("base64Decode".into(), builtin_base64_decode::INST),138			("trace".into(), builtin_trace::INST),139			("join".into(), builtin_join::INST),140			("escapeStringJson".into(), builtin_escape_string_json::INST),141			("manifestJsonEx".into(), builtin_manifest_json_ex::INST),142			("manifestYamlDoc".into(), builtin_manifest_yaml_doc::INST),143			("reverse".into(), builtin_reverse::INST),144			("id".into(), builtin_id::INST),145			("strReplace".into(), builtin_str_replace::INST),146			("splitLimit".into(), builtin_splitlimit::INST),147			("parseJson".into(), builtin_parse_json::INST),148			("parseYaml".into(), builtin_parse_yaml::INST),149			("asciiUpper".into(), builtin_ascii_upper::INST),150			("asciiLower".into(), builtin_ascii_lower::INST),151			("member".into(), builtin_member::INST),152			("count".into(), builtin_count::INST),153			("any".into(), builtin_any::INST),154			("all".into(), builtin_all::INST),155		].iter().cloned().collect()156	};157}158159#[jrsonnet_macros::builtin]160fn builtin_length(x: Either![IStr, ArrValue, ObjValue, FuncVal]) -> Result<usize> {161	use Either4::*;162	Ok(match x {163		A(x) => x.chars().count(),164		B(x) => x.len(),165		C(x) => x166			.fields_visibility()167			.into_iter()168			.filter(|(_k, v)| *v)169			.count(),170		D(f) => f.args_len(),171	})172}173174#[jrsonnet_macros::builtin]175fn builtin_type(x: Any) -> Result<IStr> {176	Ok(x.0.value_type().name().into())177}178179#[jrsonnet_macros::builtin]180fn builtin_make_array(sz: usize, func: FuncVal) -> Result<VecVal> {181	let mut out = Vec::with_capacity(sz);182	for i in 0..sz {183		out.push(func.evaluate_simple(&[i as f64].as_slice())?)184	}185	Ok(VecVal(Cc::new(out)))186}187188#[jrsonnet_macros::builtin]189const fn builtin_codepoint(str: char) -> Result<u32> {190	Ok(str as u32)191}192193#[jrsonnet_macros::builtin]194fn builtin_object_fields_ex(obj: ObjValue, inc_hidden: bool) -> Result<VecVal> {195	let out = obj.fields_ex(inc_hidden);196	Ok(VecVal(Cc::new(197		out.into_iter().map(Val::Str).collect::<Vec<_>>(),198	)))199}200201#[jrsonnet_macros::builtin]202fn builtin_object_has_ex(obj: ObjValue, f: IStr, inc_hidden: bool) -> Result<bool> {203	Ok(obj.has_field_ex(f, inc_hidden))204}205206#[jrsonnet_macros::builtin]207fn builtin_parse_json(s: IStr) -> Result<Any> {208	let value: serde_json::Value = serde_json::from_str(&s)209		.map_err(|e| RuntimeError(format!("failed to parse json: {}", e).into()))?;210	Ok(Any(Val::try_from(&value)?))211}212213#[jrsonnet_macros::builtin]214fn builtin_parse_yaml(s: IStr) -> Result<Any> {215	let value = serde_yaml::Deserializer::from_str_with_quirks(216		&s,217		DeserializingQuirks { old_octals: true },218	);219	let mut out = vec![];220	for item in value {221		let value = serde_json::Value::deserialize(item)222			.map_err(|e| RuntimeError(format!("failed to parse yaml: {}", e).into()))?;223		let val = Val::try_from(&value)?;224		out.push(val);225	}226	Ok(Any(if out.is_empty() {227		Val::Null228	} else if out.len() == 1 {229		out.into_iter().next().unwrap()230	} else {231		Val::Arr(out.into())232	}))233}234235#[jrsonnet_macros::builtin]236fn builtin_slice(237	indexable: IndexableVal,238	index: Option<BoundedUsize<0, { i32::MAX as usize }>>,239	end: Option<BoundedUsize<0, { i32::MAX as usize }>>,240	step: Option<BoundedUsize<1, { i32::MAX as usize }>>,241) -> Result<Any> {242	std_slice(indexable, index, end, step).map(Any)243}244245#[jrsonnet_macros::builtin]246fn builtin_substr(str: IStr, from: usize, len: usize) -> Result<String> {247	Ok(str.chars().skip(from as usize).take(len as usize).collect())248}249250#[jrsonnet_macros::builtin]251fn builtin_primitive_equals(a: Any, b: Any) -> Result<bool> {252	primitive_equals(&a.0, &b.0)253}254255#[jrsonnet_macros::builtin]256fn builtin_equals(a: Any, b: Any) -> Result<bool> {257	equals(&a.0, &b.0)258}259260#[jrsonnet_macros::builtin]261fn builtin_modulo(a: f64, b: f64) -> Result<f64> {262	Ok(a % b)263}264265#[jrsonnet_macros::builtin]266fn builtin_mod(a: Either![f64, IStr], b: Any) -> Result<Any> {267	use Either2::*;268	Ok(Any(evaluate_mod_op(269		&match a {270			A(v) => Val::Num(v),271			B(s) => Val::Str(s),272		},273		&b.0,274	)?))275}276277#[jrsonnet_macros::builtin]278fn builtin_floor(x: f64) -> Result<f64> {279	Ok(x.floor())280}281282#[jrsonnet_macros::builtin]283fn builtin_ceil(x: f64) -> Result<f64> {284	Ok(x.ceil())285}286287#[jrsonnet_macros::builtin]288fn builtin_log(n: f64) -> Result<f64> {289	Ok(n.ln())290}291292#[jrsonnet_macros::builtin]293fn builtin_pow(x: f64, n: f64) -> Result<f64> {294	Ok(x.powf(n))295}296297#[jrsonnet_macros::builtin]298fn builtin_sqrt(x: PositiveF64) -> Result<f64> {299	Ok(x.0.sqrt())300}301302#[jrsonnet_macros::builtin]303fn builtin_sin(x: f64) -> Result<f64> {304	Ok(x.sin())305}306307#[jrsonnet_macros::builtin]308fn builtin_cos(x: f64) -> Result<f64> {309	Ok(x.cos())310}311312#[jrsonnet_macros::builtin]313fn builtin_tan(x: f64) -> Result<f64> {314	Ok(x.tan())315}316317#[jrsonnet_macros::builtin]318fn builtin_asin(x: f64) -> Result<f64> {319	Ok(x.asin())320}321322#[jrsonnet_macros::builtin]323fn builtin_acos(x: f64) -> Result<f64> {324	Ok(x.acos())325}326327#[jrsonnet_macros::builtin]328fn builtin_atan(x: f64) -> Result<f64> {329	Ok(x.atan())330}331332#[jrsonnet_macros::builtin]333fn builtin_exp(x: f64) -> Result<f64> {334	Ok(x.exp())335}336337fn frexp(s: f64) -> (f64, i16) {338	if 0.0 == s {339		(s, 0)340	} else {341		let lg = s.abs().log2();342		let x = (lg - lg.floor() - 1.0).exp2();343		let exp = lg.floor() + 1.0;344		(s.signum() * x, exp as i16)345	}346}347348#[jrsonnet_macros::builtin]349fn builtin_mantissa(x: f64) -> Result<f64> {350	Ok(frexp(x).0)351}352353#[jrsonnet_macros::builtin]354fn builtin_exponent(x: f64) -> Result<i16> {355	Ok(frexp(x).1)356}357358#[jrsonnet_macros::builtin]359fn builtin_ext_var(x: IStr) -> Result<Any> {360	Ok(Any(with_state(|s| s.settings().ext_vars.get(&x).cloned())361		.ok_or(UndefinedExternalVariable(x))?))362}363364#[jrsonnet_macros::builtin]365fn builtin_native(name: IStr) -> Result<FuncVal> {366	Ok(with_state(|s| s.settings().ext_natives.get(&name).cloned())367		.map(|v| FuncVal::Builtin(v.clone()))368		.ok_or(UndefinedExternalFunction(name))?)369}370371#[jrsonnet_macros::builtin]372fn builtin_filter(func: FuncVal, arr: ArrValue) -> Result<ArrValue> {373	arr.filter(|val| bool::try_from(func.evaluate_simple(&[Any(val.clone())].as_slice())?))374}375376#[jrsonnet_macros::builtin]377fn builtin_map(func: FuncVal, arr: ArrValue) -> Result<ArrValue> {378	arr.map(|val| func.evaluate_simple(&[Any(val)].as_slice()))379}380381#[jrsonnet_macros::builtin]382fn builtin_flatmap(func: FuncVal, arr: IndexableVal) -> Result<IndexableVal> {383	match arr {384		IndexableVal::Str(s) => {385			let mut out = String::new();386			for c in s.chars() {387				match func.evaluate_simple(&[c.to_string()].as_slice())? {388					Val::Str(o) => out.push_str(&o),389					_ => throw!(RuntimeError(390						"in std.join all items should be strings".into()391					)),392				};393			}394			Ok(IndexableVal::Str(out.into()))395		}396		IndexableVal::Arr(a) => {397			let mut out = Vec::new();398			for el in a.iter() {399				let el = el?;400				match func.evaluate_simple(&[Any(el)].as_slice())? {401					Val::Arr(o) => {402						for oe in o.iter() {403							out.push(oe?)404						}405					}406					_ => throw!(RuntimeError(407						"in std.join all items should be arrays".into()408					)),409				};410			}411			Ok(IndexableVal::Arr(out.into()))412		}413	}414}415416#[jrsonnet_macros::builtin]417fn builtin_foldl(func: FuncVal, arr: ArrValue, init: Any) -> Result<Any> {418	let mut acc = init.0;419	for i in arr.iter() {420		acc = func.evaluate_simple(&[Any(acc), Any(i?)].as_slice())?;421	}422	Ok(Any(acc))423}424425#[jrsonnet_macros::builtin]426fn builtin_foldr(func: FuncVal, arr: ArrValue, init: Any) -> Result<Any> {427	let mut acc = init.0;428	for i in arr.iter().rev() {429		acc = func.evaluate_simple(&[Any(i?), Any(acc)].as_slice())?;430	}431	Ok(Any(acc))432}433434#[jrsonnet_macros::builtin]435#[allow(non_snake_case)]436fn builtin_sort(arr: ArrValue, keyF: Option<FuncVal>) -> Result<ArrValue> {437	if arr.len() <= 1 {438		return Ok(arr);439	}440	Ok(ArrValue::Eager(sort::sort(441		arr.evaluated()?,442		keyF.as_ref(),443	)?))444}445446#[jrsonnet_macros::builtin]447fn builtin_format(str: IStr, vals: Any) -> Result<String> {448	std_format(str, vals.0)449}450451#[jrsonnet_macros::builtin]452fn builtin_range(from: i32, to: i32) -> Result<ArrValue> {453	if to < from {454		return Ok(ArrValue::new_eager());455	}456	Ok(ArrValue::new_range(from, to))457}458459#[jrsonnet_macros::builtin]460fn builtin_char(n: u32) -> Result<char> {461	Ok(std::char::from_u32(n as u32).ok_or(InvalidUnicodeCodepointGot(n as u32))?)462}463464#[jrsonnet_macros::builtin]465fn builtin_encode_utf8(str: IStr) -> Result<Bytes> {466	Ok(Bytes(str.bytes().collect::<Vec<u8>>().into()))467}468469#[jrsonnet_macros::builtin]470fn builtin_decode_utf8(arr: Bytes) -> Result<IStr> {471	Ok(std::str::from_utf8(&arr.0)472		.map_err(|_| RuntimeError("bad utf8".into()))?473		.into())474}475476#[jrsonnet_macros::builtin]477fn builtin_md5(str: IStr) -> Result<String> {478	Ok(format!("{:x}", md5::compute(&str.as_bytes())))479}480481#[jrsonnet_macros::builtin]482fn builtin_trace(loc: CallLocation, str: IStr, rest: Any) -> Result<Any> {483	eprint!("TRACE:");484	if let Some(loc) = loc.0 {485		with_state(|s| {486			let locs = s.map_source_locations(&loc.0, &[loc.1]);487			eprint!(488				" {}:{}",489				loc.0.file_name().unwrap().to_str().unwrap(),490				locs[0].line491			);492		});493	}494	eprintln!(" {}", str);495	Ok(rest) as Result<Any>496}497498#[jrsonnet_macros::builtin]499fn builtin_base64(input: Either![Bytes, IStr]) -> Result<String> {500	use Either2::*;501	Ok(match input {502		A(a) => base64::encode(a.0),503		B(l) => base64::encode(l.bytes().collect::<Vec<_>>()),504	})505}506507#[jrsonnet_macros::builtin]508fn builtin_base64_decode_bytes(input: IStr) -> Result<Bytes> {509	Ok(Bytes(510		base64::decode(&input.as_bytes())511			.map_err(|_| RuntimeError("bad base64".into()))?512			.into(),513	))514}515516#[jrsonnet_macros::builtin]517fn builtin_base64_decode(input: IStr) -> Result<String> {518	let bytes = base64::decode(&input.as_bytes()).map_err(|_| RuntimeError("bad base64".into()))?;519	Ok(String::from_utf8(bytes).map_err(|_| RuntimeError("bad utf8".into()))?)520}521522#[jrsonnet_macros::builtin]523fn builtin_join(sep: IndexableVal, arr: ArrValue) -> Result<IndexableVal> {524	Ok(match sep {525		IndexableVal::Arr(joiner_items) => {526			let mut out = Vec::new();527528			let mut first = true;529			for item in arr.iter() {530				let item = item?.clone();531				if let Val::Arr(items) = item {532					if !first {533						out.reserve(joiner_items.len());534						// TODO: extend535						for item in joiner_items.iter() {536							out.push(item?);537						}538					}539					first = false;540					out.reserve(items.len());541					// TODO: extend542					for item in items.iter() {543						out.push(item?);544					}545				} else {546					throw!(RuntimeError(547						"in std.join all items should be arrays".into()548					));549				}550			}551552			IndexableVal::Arr(out.into())553		}554		IndexableVal::Str(sep) => {555			let mut out = String::new();556557			let mut first = true;558			for item in arr.iter() {559				let item = item?.clone();560				if let Val::Str(item) = item {561					if !first {562						out += &sep;563					}564					first = false;565					out += &item;566				} else {567					throw!(RuntimeError(568						"in std.join all items should be strings".into()569					));570				}571			}572573			IndexableVal::Str(out.into())574		}575	})576}577578#[jrsonnet_macros::builtin]579fn builtin_escape_string_json(str_: IStr) -> Result<String> {580	Ok(escape_string_json(&str_))581}582583#[jrsonnet_macros::builtin]584fn builtin_manifest_json_ex(585	value: Any,586	indent: IStr,587	newline: Option<IStr>,588	key_val_sep: Option<IStr>,589) -> Result<String> {590	let newline = newline.as_deref().unwrap_or("\n");591	let key_val_sep = key_val_sep.as_deref().unwrap_or(": ");592	manifest_json_ex(593		&value.0,594		&ManifestJsonOptions {595			padding: &indent,596			mtype: ManifestType::Std,597			newline,598			key_val_sep,599		},600	)601}602603#[jrsonnet_macros::builtin]604fn builtin_manifest_yaml_doc(605	value: Any,606	indent_array_in_object: Option<bool>,607	quote_keys: Option<bool>,608) -> Result<String> {609	manifest_yaml_ex(610		&value.0,611		&ManifestYamlOptions {612			padding: "  ",613			arr_element_padding: if indent_array_in_object.unwrap_or(false) {614				"  "615			} else {616				""617			},618			quote_keys: quote_keys.unwrap_or(true),619		},620	)621}622623#[jrsonnet_macros::builtin]624fn builtin_reverse(value: ArrValue) -> Result<ArrValue> {625	Ok(value.reversed())626}627628#[jrsonnet_macros::builtin]629const fn builtin_id(v: Any) -> Result<Any> {630	Ok(v)631}632633#[jrsonnet_macros::builtin]634fn builtin_str_replace(str: String, from: IStr, to: IStr) -> Result<String> {635	Ok(str.replace(&from as &str, &to as &str))636}637638#[jrsonnet_macros::builtin]639fn builtin_splitlimit(str: IStr, c: IStr, maxsplits: Either![usize, M1]) -> Result<VecVal> {640	use Either2::*;641	Ok(VecVal(Cc::new(match maxsplits {642		A(n) => str643			.splitn(n + 1, &c as &str)644			.map(|s| Val::Str(s.into()))645			.collect(),646		B(_) => str.split(&c as &str).map(|s| Val::Str(s.into())).collect(),647	})))648}649650#[jrsonnet_macros::builtin]651fn builtin_ascii_upper(str: IStr) -> Result<String> {652	Ok(str.to_ascii_uppercase())653}654655#[jrsonnet_macros::builtin]656fn builtin_ascii_lower(str: IStr) -> Result<String> {657	Ok(str.to_ascii_lowercase())658}659660#[jrsonnet_macros::builtin]661fn builtin_member(arr: IndexableVal, x: Any) -> Result<bool> {662	match arr {663		IndexableVal::Str(s) => {664			let x: IStr = IStr::try_from(x.0)?;665			Ok(!x.is_empty() && s.contains(&*x))666		}667		IndexableVal::Arr(a) => {668			for item in a.iter() {669				let item = item?;670				if equals(&item, &x.0)? {671					return Ok(true);672				}673			}674			Ok(false)675		}676	}677}678679#[jrsonnet_macros::builtin]680fn builtin_count(arr: Vec<Any>, v: Any) -> Result<usize> {681	let mut count = 0;682	for item in arr.iter() {683		if equals(&item.0, &v.0)? {684			count += 1;685		}686	}687	Ok(count)688}689690#[jrsonnet_macros::builtin]691fn builtin_any(arr: ArrValue) -> Result<bool> {692	for v in arr.iter() {693		let v: bool = v?.try_into()?;694		if v {695			return Ok(true);696		}697	}698	Ok(false)699}700701#[jrsonnet_macros::builtin]702fn builtin_all(arr: ArrValue) -> Result<bool> {703	for v in arr.iter() {704		let v: bool = v?.try_into()?;705		if !v {706			return Ok(false);707		}708	}709	Ok(true)710}
modifiedcrates/jrsonnet-evaluator/src/builtin/sort.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/builtin/sort.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/sort.rs
@@ -1,10 +1,12 @@
+use gcmodule::{Cc, Trace};
+
 use crate::{
 	error::{Error, LocError, Result},
 	throw,
 	typed::Any,
-	FuncVal, Val,
+	val::FuncVal,
+	Val,
 };
-use gcmodule::{Cc, Trace};
 
 #[derive(Debug, Clone, thiserror::Error, Trace)]
 pub enum SortError {
modifiedcrates/jrsonnet-evaluator/src/builtin/stdlib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/builtin/stdlib.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/stdlib.rs
@@ -1,6 +1,7 @@
-use jrsonnet_parser::{LocExpr, ParserSettings};
 use std::path::PathBuf;
 
+use jrsonnet_parser::{LocExpr, ParserSettings};
+
 thread_local! {
 	/// To avoid parsing again when issued from the same thread
 	#[allow(unreachable_code)]
modifiedcrates/jrsonnet-evaluator/src/ctx.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/ctx.rs
+++ b/crates/jrsonnet-evaluator/src/ctx.rs
@@ -1,12 +1,12 @@
-use crate::cc_ptr_eq;
-use crate::gc::GcHashMap;
+use std::fmt::Debug;
+
+use gcmodule::{Cc, Trace};
+use jrsonnet_interner::IStr;
+
 use crate::{
-	error::Error::*, map::LayeredHashMap, FutureWrapper, LazyBinding, LazyVal, ObjValue, Result,
-	Val,
+	cc_ptr_eq, error::Error::*, gc::GcHashMap, map::LayeredHashMap, FutureWrapper, LazyBinding,
+	LazyVal, ObjValue, Result, Val,
 };
-use gcmodule::{Cc, Trace};
-use jrsonnet_interner::IStr;
-use std::fmt::Debug;
 
 #[derive(Clone, Trace)]
 pub struct ContextCreator(pub Context, pub FutureWrapper<GcHashMap<IStr, LazyBinding>>);
modifiedcrates/jrsonnet-evaluator/src/error.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/error.rs
+++ b/crates/jrsonnet-evaluator/src/error.rs
@@ -1,16 +1,18 @@
-use crate::{
-	builtin::{format::FormatError, sort::SortError},
-	typed::TypeLocError,
+use std::{
+	path::{Path, PathBuf},
+	rc::Rc,
 };
+
 use gcmodule::Trace;
 use jrsonnet_interner::IStr;
 use jrsonnet_parser::{BinaryOpType, ExprLocation, UnaryOpType};
 use jrsonnet_types::ValType;
-use std::{
-	path::{Path, PathBuf},
-	rc::Rc,
+use thiserror::Error;
+
+use crate::{
+	builtin::{format::FormatError, sort::SortError},
+	typed::TypeLocError,
 };
-use thiserror::Error;
 
 #[derive(Error, Debug, Clone, Trace)]
 pub enum Error {
modifiedcrates/jrsonnet-evaluator/src/evaluate/mod.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/evaluate/mod.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/mod.rs
@@ -1,15 +1,5 @@
 use std::convert::TryFrom;
 
-use crate::{
-	builtin::{std_slice, BUILTINS},
-	error::Error::*,
-	evaluate::operator::{evaluate_add_op, evaluate_binary_op_special, evaluate_unary_op},
-	function::CallLocation,
-	gc::TraceBox,
-	push_frame, throw, with_state, ArrValue, Bindable, Context, ContextCreator, FuncDesc, FuncVal,
-	FutureWrapper, GcHashMap, LazyBinding, LazyVal, LazyValValue, ObjValue, ObjValueBuilder,
-	ObjectAssertion, Result, Val,
-};
 use gcmodule::{Cc, Trace};
 use jrsonnet_interner::IStr;
 use jrsonnet_parser::{
@@ -17,6 +7,19 @@
 	LiteralType, LocExpr, Member, ObjBody, ParamsDesc,
 };
 use jrsonnet_types::ValType;
+
+use crate::{
+	builtin::{std_slice, BUILTINS},
+	error::Error::*,
+	evaluate::operator::{evaluate_add_op, evaluate_binary_op_special, evaluate_unary_op},
+	function::CallLocation,
+	gc::TraceBox,
+	push_frame, throw,
+	typed::BoundedUsize,
+	val::{ArrValue, FuncDesc, FuncVal, LazyValValue},
+	with_state, Bindable, Context, ContextCreator, FutureWrapper, GcHashMap, LazyBinding, LazyVal,
+	ObjValue, ObjValueBuilder, ObjectAssertion, Result, Val,
+};
 pub mod operator;
 
 pub fn evaluate_binding_in_future(
modifiedcrates/jrsonnet-evaluator/src/evaluate/operator.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/evaluate/operator.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/operator.rs
@@ -1,10 +1,11 @@
 use std::convert::TryInto;
 
-use crate::builtin::std_format;
-use crate::{equals, evaluate, Context, Val};
-use crate::{error::Error::*, throw, Result};
 use jrsonnet_parser::{BinaryOpType, LocExpr, UnaryOpType};
 
+use crate::{
+	builtin::std_format, error::Error::*, evaluate, throw, val::equals, Context, Result, Val,
+};
+
 pub fn evaluate_unary_op(op: UnaryOpType, b: &Val) -> Result<Val> {
 	use UnaryOpType::*;
 	use Val::*;
modifiedcrates/jrsonnet-evaluator/src/function.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/function.rs
+++ b/crates/jrsonnet-evaluator/src/function.rs
@@ -1,16 +1,19 @@
+use std::{borrow::Cow, collections::HashMap, convert::TryFrom};
+
+use gcmodule::Trace;
+use jrsonnet_interner::IStr;
+pub use jrsonnet_macros::builtin;
+use jrsonnet_parser::{ArgsDesc, ExprLocation, LocExpr, ParamsDesc};
+
 use crate::{
 	error::{Error::*, LocError},
 	evaluate, evaluate_named,
 	gc::TraceBox,
 	throw,
 	typed::Typed,
-	Context, FutureWrapper, GcHashMap, LazyVal, LazyValValue, Result, Val,
+	val::LazyValValue,
+	Context, FutureWrapper, GcHashMap, LazyVal, Result, Val,
 };
-use gcmodule::Trace;
-use jrsonnet_interner::IStr;
-pub use jrsonnet_macros::builtin;
-use jrsonnet_parser::{ArgsDesc, ExprLocation, LocExpr, ParamsDesc};
-use std::{borrow::Cow, collections::HashMap, convert::TryFrom};
 
 #[derive(Clone, Copy)]
 pub struct CallLocation<'l>(pub Option<&'l ExprLocation>);
modifiedcrates/jrsonnet-evaluator/src/import.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/import.rs
+++ b/crates/jrsonnet-evaluator/src/import.rs
@@ -1,17 +1,20 @@
-use crate::{
-	error::{Error::*, Result},
-	throw,
-};
-use fs::File;
-use jrsonnet_interner::IStr;
-use std::fs;
 use std::{
 	any::Any,
+	convert::TryFrom,
+	fs,
+	io::Read,
 	path::{Path, PathBuf},
 	rc::Rc,
 };
-use std::{convert::TryFrom, io::Read};
 
+use fs::File;
+use jrsonnet_interner::IStr;
+
+use crate::{
+	error::{Error::*, Result},
+	throw,
+};
+
 /// Implements file resolution logic for `import` and `importStr`
 pub trait ImportResolver {
 	/// Resolves real file path, e.g. `(/home/user/manifests, b.libjsonnet)` can correspond
modifiedcrates/jrsonnet-evaluator/src/integrations/serde.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/integrations/serde.rs
+++ b/crates/jrsonnet-evaluator/src/integrations/serde.rs
@@ -1,9 +1,11 @@
+use std::convert::{TryFrom, TryInto};
+
+use serde_json::{Map, Number, Value};
+
 use crate::{
 	error::{Error::*, LocError, Result},
 	throw, ObjValueBuilder, Val,
 };
-use serde_json::{Map, Number, Value};
-use std::convert::{TryFrom, TryInto};
 
 impl TryFrom<&Val> for Value {
 	type Error = LocError;
modifiedcrates/jrsonnet-evaluator/src/lib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/lib.rs
+++ b/crates/jrsonnet-evaluator/src/lib.rs
@@ -13,6 +13,7 @@
 pub mod error;
 mod evaluate;
 pub mod function;
+pub mod gc;
 mod import;
 mod integrations;
 mod map;
@@ -20,9 +21,15 @@
 mod obj;
 pub mod trace;
 pub mod typed;
-mod val;
+pub mod val;
 
-pub use jrsonnet_parser as parser;
+use std::{
+	cell::{Ref, RefCell, RefMut},
+	collections::HashMap,
+	fmt::Debug,
+	path::{Path, PathBuf},
+	rc::Rc,
+};
 
 pub use ctx::*;
 pub use dynamic::*;
@@ -33,18 +40,11 @@
 use gcmodule::{Cc, Trace, Weak};
 pub use import::*;
 pub use jrsonnet_interner::IStr;
+pub use jrsonnet_parser as parser;
 use jrsonnet_parser::*;
 pub use obj::*;
-use std::{
-	cell::{Ref, RefCell, RefMut},
-	collections::HashMap,
-	fmt::Debug,
-	path::{Path, PathBuf},
-	rc::Rc,
-};
 use trace::{location_to_offset, offset_to_location, CodeLocation, CompactFormat, TraceFormat};
-pub use val::*;
-pub mod gc;
+pub use val::{LazyVal, ManifestFormat, Val};
 
 pub trait Bindable: Trace + 'static {
 	fn bind(&self, this: Option<ObjValue>, super_obj: Option<ObjValue>) -> Result<LazyVal>;
@@ -693,18 +693,24 @@
 
 #[cfg(test)]
 pub mod tests {
-	use super::Val;
-	use crate::{
-		error::Error::*, function::BuiltinParam, gc::TraceBox, native::NativeCallbackHandler,
-		primitive_equals, EvaluationState,
-	};
-	use gcmodule::{Cc, Trace};
-	use jrsonnet_parser::*;
 	use std::{
 		path::{Path, PathBuf},
 		rc::Rc,
 	};
 
+	use gcmodule::{Cc, Trace};
+	use jrsonnet_parser::*;
+
+	use super::Val;
+	use crate::{
+		error::Error::*,
+		function::{BuiltinParam, CallLocation},
+		gc::TraceBox,
+		native::NativeCallbackHandler,
+		val::primitive_equals,
+		EvaluationState,
+	};
+
 	#[test]
 	#[should_panic]
 	fn eval_state_stacktrace() {
@@ -712,11 +718,15 @@
 		state.run_in_state(|| {
 			state
 				.push(
-					Some(&ExprLocation(PathBuf::from("test1.jsonnet").into(), 10, 20)),
+					CallLocation::new(&ExprLocation(PathBuf::from("test1.jsonnet").into(), 10, 20)),
 					|| "outer".to_owned(),
 					|| {
 						state.push(
-							Some(&ExprLocation(PathBuf::from("test2.jsonnet").into(), 30, 40)),
+							CallLocation::new(&ExprLocation(
+								PathBuf::from("test2.jsonnet").into(),
+								30,
+								40,
+							)),
 							|| "inner".to_owned(),
 							|| Err(RuntimeError("".into()).into()),
 						)?;
@@ -1290,10 +1300,11 @@
 	}
 
 	mod derive_typed {
+		use std::path::PathBuf;
+
 		use crate::{typed::Typed, EvaluationState};
-		use std::path::PathBuf;
 
-		#[derive(Typed, PartialEq, Debug)]
+		#[derive(PartialEq, Debug, Typed)]
 		struct MyTyped {
 			a: u32,
 			#[typed(rename = "b")]
modifiedcrates/jrsonnet-evaluator/src/native.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/native.rs
+++ b/crates/jrsonnet-evaluator/src/native.rs
@@ -1,13 +1,16 @@
 #![allow(clippy::type_complexity)]
 
-use crate::function::{parse_builtin_call, ArgsLike, Builtin, BuiltinParam, CallLocation};
-use crate::gc::TraceBox;
-use crate::Context;
-use crate::{error::Result, Val};
+use std::{path::Path, rc::Rc};
+
 use gcmodule::Trace;
-use std::path::Path;
-use std::rc::Rc;
 
+use crate::{
+	error::Result,
+	function::{parse_builtin_call, ArgsLike, Builtin, BuiltinParam, CallLocation},
+	gc::TraceBox,
+	Context, Val,
+};
+
 #[derive(Trace)]
 pub struct NativeCallback {
 	pub(crate) params: Vec<BuiltinParam>,
modifiedcrates/jrsonnet-evaluator/src/obj.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/obj.rs
+++ b/crates/jrsonnet-evaluator/src/obj.rs
@@ -1,20 +1,23 @@
-use crate::error::LocError;
-use crate::function::CallLocation;
-use crate::gc::{GcHashMap, GcHashSet, TraceBox};
-use crate::operator::evaluate_add_op;
-use crate::push_frame;
-use crate::{
-	cc_ptr_eq, error::Error::*, throw, weak_ptr_eq, weak_raw, Bindable, LazyBinding, LazyVal,
-	Result, Val,
+use std::{
+	cell::RefCell,
+	fmt::Debug,
+	hash::{Hash, Hasher},
 };
+
 use gcmodule::{Cc, Trace, Weak};
 use jrsonnet_interner::IStr;
 use jrsonnet_parser::{ExprLocation, Visibility};
 use rustc_hash::FxHashMap;
-use std::cell::RefCell;
-use std::fmt::Debug;
-use std::hash::{Hash, Hasher};
 
+use crate::{
+	cc_ptr_eq,
+	error::{Error::*, LocError},
+	function::CallLocation,
+	gc::{GcHashMap, GcHashSet, TraceBox},
+	operator::evaluate_add_op,
+	push_frame, throw, weak_ptr_eq, weak_raw, Bindable, LazyBinding, LazyVal, Result, Val,
+};
+
 #[derive(Debug, Trace)]
 pub struct ObjMember {
 	pub add: bool,
modifiedcrates/jrsonnet-evaluator/src/trace/mod.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/trace/mod.rs
+++ b/crates/jrsonnet-evaluator/src/trace/mod.rs
@@ -1,8 +1,10 @@
 mod location;
 
+use std::path::{Path, PathBuf};
+
+pub use location::*;
+
 use crate::{error::Error, EvaluationState, LocError};
-pub use location::*;
-use std::path::{Path, PathBuf};
 
 /// The way paths should be displayed
 pub enum PathResolver {
modifiedcrates/jrsonnet-evaluator/src/typed/mod.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/typed/mod.rs
+++ b/crates/jrsonnet-evaluator/src/typed/mod.rs
@@ -2,14 +2,14 @@
 
 mod conversions;
 pub use conversions::*;
+use gcmodule::Trace;
+pub use jrsonnet_types::{ComplexValType, ValType};
+use thiserror::Error;
 
 use crate::{
 	error::{Error, LocError, Result},
 	push_description_frame, Val,
 };
-use gcmodule::Trace;
-pub use jrsonnet_types::{ComplexValType, ValType};
-use thiserror::Error;
 
 #[derive(Debug, Error, Clone, Trace)]
 pub enum TypeError {
modifiedcrates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -1,3 +1,10 @@
+use std::{cell::RefCell, fmt::Debug, rc::Rc};
+
+use gcmodule::{Cc, Trace};
+use jrsonnet_interner::IStr;
+use jrsonnet_parser::{LocExpr, ParamsDesc};
+use jrsonnet_types::ValType;
+
 use crate::{
 	builtin::manifest::{
 		manifest_json_ex, manifest_yaml_ex, ManifestJsonOptions, ManifestType, ManifestYamlOptions,
@@ -12,11 +19,6 @@
 	gc::TraceBox,
 	throw, Context, ObjValue, Result,
 };
-use gcmodule::{Cc, Trace};
-use jrsonnet_interner::IStr;
-use jrsonnet_parser::{LocExpr, ParamsDesc};
-use jrsonnet_types::ValType;
-use std::{cell::RefCell, fmt::Debug, rc::Rc};
 
 pub trait LazyValValue: Trace {
 	fn get(self: Box<Self>) -> Result<Val>;
modifiedcrates/jrsonnet-interner/src/lib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-interner/src/lib.rs
+++ b/crates/jrsonnet-interner/src/lib.rs
@@ -1,6 +1,3 @@
-use gcmodule::Trace;
-use rustc_hash::FxHashMap;
-use serde::{Deserialize, Serialize};
 use std::{
 	borrow::Cow,
 	cell::RefCell,
@@ -12,6 +9,10 @@
 	str::Utf8Error,
 };
 
+use gcmodule::Trace;
+use rustc_hash::FxHashMap;
+use serde::{Deserialize, Serialize};
+
 #[derive(Clone, PartialOrd, Ord, Eq)]
 pub struct IStr(Rc<str>);
 impl Trace for IStr {
modifiedcrates/jrsonnet-parser/src/expr.rsdiffbeforeafterboth
--- a/crates/jrsonnet-parser/src/expr.rs
+++ b/crates/jrsonnet-parser/src/expr.rs
@@ -1,7 +1,3 @@
-use gcmodule::Trace;
-use jrsonnet_interner::IStr;
-#[cfg(feature = "serde")]
-use serde::{Deserialize, Serialize};
 use std::{
 	fmt::{Debug, Display},
 	ops::Deref,
@@ -9,6 +5,11 @@
 	rc::Rc,
 };
 
+use gcmodule::Trace;
+use jrsonnet_interner::IStr;
+#[cfg(feature = "serde")]
+use serde::{Deserialize, Serialize};
+
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[derive(Debug, PartialEq, Trace)]
 pub enum FieldName {
modifiedcrates/jrsonnet-parser/src/lib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-parser/src/lib.rs
+++ b/crates/jrsonnet-parser/src/lib.rs
@@ -1,10 +1,11 @@
 #![allow(clippy::redundant_closure_call)]
 
-use peg::parser;
 use std::{
 	path::{Path, PathBuf},
 	rc::Rc,
 };
+
+use peg::parser;
 mod expr;
 pub use expr::*;
 pub use jrsonnet_interner::IStr;
@@ -317,11 +318,13 @@
 
 #[cfg(test)]
 pub mod tests {
-	use super::{expr::*, parse};
-	use crate::ParserSettings;
 	use std::path::PathBuf;
+
 	use BinaryOpType::*;
 
+	use super::{expr::*, parse};
+	use crate::ParserSettings;
+
 	macro_rules! parse {
 		($s:expr) => {
 			parse(
modifiedcrates/jrsonnet-types/src/lib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-types/src/lib.rs
+++ b/crates/jrsonnet-types/src/lib.rs
@@ -1,8 +1,9 @@
 #![allow(clippy::redundant_closure_call)]
 
-use gcmodule::Trace;
 use std::fmt::Display;
 
+use gcmodule::Trace;
+
 #[macro_export]
 macro_rules! ty {
 	((Array<number>)) => {{