git.delta.rocks / jrsonnet / refs/commits / 6d08ea9d576f

difftreelog

style fix formatting

Yaroslav Bolyukin2023-08-13parent: #773438d.patch.diff
in: master

4 files changed

modifiedcrates/jrsonnet-evaluator/src/function/mod.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/function/mod.rs
+++ b/crates/jrsonnet-evaluator/src/function/mod.rs
@@ -12,10 +12,7 @@
 	native::NativeDesc,
 	parse::{parse_default_function_call, parse_function_call},
 };
-use crate::{
-	evaluate, evaluate_trivial, gc::TraceBox, tb, Context, ContextBuilder, Result,
-	Val,
-};
+use crate::{evaluate, evaluate_trivial, gc::TraceBox, tb, Context, ContextBuilder, Result, Val};
 
 pub mod arglike;
 pub mod builtin;
modifiedcrates/jrsonnet-evaluator/src/integrations/serde.rsdiffbeforeafterboth
before · crates/jrsonnet-evaluator/src/integrations/serde.rs
1use std::borrow::Cow;23use jrsonnet_interner::IStr;4use serde::{5	de::Visitor,6	ser::{7		Error, SerializeMap, SerializeSeq, SerializeStruct, SerializeStructVariant, SerializeTuple,8		SerializeTupleStruct, SerializeTupleVariant,9	},10	Deserialize, Serialize, Serializer,11};1213use crate::{14	arr::ArrValue, runtime_error, Error as JrError, ObjValue, ObjValueBuilder,15	Result, State, Val,16};1718impl<'de> Deserialize<'de> for Val {19	fn deserialize<D>(deserializer: D) -> Result<Val, D::Error>20	where21		D: serde::Deserializer<'de>,22	{23		struct ValVisitor;2425		// macro_rules! visit_num {26		// 	($($method:ident => $ty:ty),* $(,)?) => {$(27		// 		fn $method<E>(self, v: $ty) -> Result<Self::Value, E>28		// 		where29		// 			E: serde::de::Error,30		// 		{31		// 			Ok(Val::Num(f64::from(v)))32		// 		}33		// 	)*};34		// }3536		impl<'de> Visitor<'de> for ValVisitor {37			type Value = Val;3839			fn visit_bool<E>(self, v: bool) -> Result<Self::Value, E>40			where41				E: serde::de::Error,42			{43				Ok(Val::Bool(v))44			}45			fn visit_f64<E>(self, v: f64) -> Result<Self::Value, E>46			where47				E: serde::de::Error,48			{49				if !v.is_finite() {50					return Err(E::custom("only finite numbers are supported"));51				}52				Ok(Val::Num(v))53			}54			fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>55			where56				E: serde::de::Error,57			{58				Ok(Val::string(v))59			}6061			// visit_num! {62			// 	visit_i8 => i8,63			// 	visit_i16 => i16,64			// 	visit_i32 => i32,65			// 	visit_u8 => u8,66			// 	visit_u16 => u16,67			// 	visit_u32 => u32,68			// }69			fn visit_i64<E>(self, v: i64) -> Result<Self::Value, E>70			where71				E: serde::de::Error,72			{73				Ok(Val::Num(v as f64))74			}75			fn visit_u64<E>(self, v: u64) -> Result<Self::Value, E>76			where77				E: serde::de::Error,78			{79				Ok(Val::Num(v as f64))80			}8182			fn visit_bytes<E>(self, v: &[u8]) -> Result<Self::Value, E>83			where84				E: serde::de::Error,85			{86				Ok(Val::Arr(ArrValue::bytes(v.into())))87			}8889			fn visit_none<E>(self) -> Result<Self::Value, E>90			where91				E: serde::de::Error,92			{93				Ok(Val::Null)94			}95			fn visit_some<D>(self, deserializer: D) -> Result<Self::Value, D::Error>96			where97				D: serde::Deserializer<'de>,98			{99				deserializer.deserialize_any(self)100			}101102			fn visit_unit<E>(self) -> Result<Self::Value, E>103			where104				E: serde::de::Error,105			{106				Ok(Val::Null)107			}108109			fn visit_newtype_struct<D>(self, deserializer: D) -> Result<Self::Value, D::Error>110			where111				D: serde::Deserializer<'de>,112			{113				deserializer.deserialize_any(self)114			}115116			fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>117			where118				A: serde::de::SeqAccess<'de>,119			{120				let mut out = seq.size_hint().map_or_else(Vec::new, Vec::with_capacity);121122				while let Some(val) = seq.next_element::<Val>()? {123					out.push(val);124				}125126				Ok(Val::Arr(ArrValue::eager(out)))127			}128129			fn visit_map<A>(self, mut map: A) -> Result<Self::Value, A::Error>130			where131				A: serde::de::MapAccess<'de>,132			{133				let mut out = map134					.size_hint()135					.map_or_else(ObjValueBuilder::new, ObjValueBuilder::with_capacity);136137				while let Some((k, v)) = map.next_entry::<Cow<'de, str>, Val>()? {138					// Jsonnet ignores duplicate keys139					out.field(k).value(v);140				}141142				Ok(Val::Obj(out.build()))143			}144145			fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {146				write!(formatter, "any valid jsonnet value")147			}148		}149		deserializer.deserialize_any(ValVisitor)150	}151}152153impl Serialize for Val {154	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>155	where156		S: serde::Serializer,157	{158		match self {159			Val::Bool(v) => serializer.serialize_bool(*v),160			Val::Null => serializer.serialize_none(),161			Val::Str(s) => serializer.serialize_str(&s.clone().into_flat()),162			Val::Num(n) => {163				if n.fract() != 0.0 {164					serializer.serialize_f64(*n)165				} else {166					let n = *n as i64;167					serializer.serialize_i64(n)168				}169			}170			#[cfg(feature = "exp-bigint")]171			Val::BigInt(b) => b.serialize(serializer),172			Val::Arr(arr) => {173				let mut seq = serializer.serialize_seq(Some(arr.len()))?;174				for (i, element) in arr.iter().enumerate() {175					let mut serde_error = None;176					// TODO: rewrite using try{} after stabilization177					State::push_description(178						|| format!("array index [{i}]"),179						|| {180							let e = element?;181							if let Err(e) = seq.serialize_element(&e) {182								serde_error = Some(e);183							}184							Ok(())185						},186					)187					.map_err(|e| S::Error::custom(e.to_string()))?;188					if let Some(e) = serde_error {189						return Err(e);190					}191				}192				seq.end()193			}194			Val::Obj(obj) => {195				let mut map = serializer.serialize_map(Some(obj.len()))?;196				for (field, value) in obj.iter(197					#[cfg(feature = "exp-preserve-order")]198					true,199				) {200					let mut serde_error = None;201					// TODO: rewrite using try{} after stabilization202					State::push_description(203						|| format!("object field {field:?}"),204						|| {205							let v = value?;206							if let Err(e) = map.serialize_entry(field.as_str(), &v) {207								serde_error = Some(e);208							}209							Ok(())210						},211					)212					.map_err(|e| S::Error::custom(e.to_string()))?;213					if let Some(e) = serde_error {214						return Err(e);215					}216				}217				map.end()218			}219			Val::Func(_) => Err(S::Error::custom("tried to manifest function")),220		}221	}222}223224struct IntoVecValSerializer {225	variant: Option<IStr>,226	data: Vec<Val>,227}228impl IntoVecValSerializer {229	fn new() -> Self {230		Self {231			variant: None,232			data: Vec::new(),233		}234	}235	fn with_capacity(capacity: usize) -> Self {236		Self {237			variant: None,238			data: Vec::with_capacity(capacity),239		}240	}241	fn variant_with_capacity(variant: impl Into<IStr>, capacity: usize) -> Self {242		Self {243			variant: Some(variant.into()),244			data: Vec::with_capacity(capacity),245		}246	}247}248impl SerializeSeq for IntoVecValSerializer {249	type Ok = Val;250	type Error = JrError;251252	fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<()>253	where254		T: Serialize,255	{256		let value = value.serialize(IntoValSerializer)?;257		self.data.push(value);258		Ok(())259	}260261	fn end(self) -> Result<Val> {262		let inner = Val::Arr(ArrValue::eager(self.data));263		if let Some(variant) = self.variant {264			let mut out = ObjValue::builder_with_capacity(1);265			out.field(variant).value(inner);266			Ok(Val::Obj(out.build()))267		} else {268			Ok(inner)269		}270	}271}272impl SerializeTuple for IntoVecValSerializer {273	type Ok = Val;274	type Error = JrError;275276	fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<()>277	where278		T: Serialize,279	{280		SerializeSeq::serialize_element(self, value)281	}282283	fn end(self) -> Result<Val> {284		SerializeSeq::end(self)285	}286}287impl SerializeTupleVariant for IntoVecValSerializer {288	type Ok = Val;289	type Error = JrError;290291	fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<()>292	where293		T: Serialize,294	{295		SerializeSeq::serialize_element(self, value)296	}297298	fn end(self) -> Result<Val> {299		SerializeSeq::end(self)300	}301}302impl SerializeTupleStruct for IntoVecValSerializer {303	type Ok = Val;304	type Error = JrError;305306	fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<()>307	where308		T: Serialize,309	{310		SerializeSeq::serialize_element(self, value)311	}312313	fn end(self) -> Result<Val> {314		SerializeSeq::end(self)315	}316}317318struct IntoObjValueSerializer {319	variant: Option<IStr>,320	data: ObjValueBuilder,321	key: Option<IStr>,322}323impl IntoObjValueSerializer {324	fn new() -> Self {325		Self {326			variant: None,327			data: ObjValue::builder(),328			key: None,329		}330	}331	fn with_capacity(capacity: usize) -> Self {332		Self {333			variant: None,334			data: ObjValue::builder_with_capacity(capacity),335			key: None,336		}337	}338	fn variant_with_capacity(variant: impl Into<IStr>, capacity: usize) -> Self {339		Self {340			variant: Some(variant.into()),341			data: ObjValue::builder_with_capacity(capacity),342			key: None,343		}344	}345}346impl SerializeMap for IntoObjValueSerializer {347	type Ok = Val;348	type Error = JrError;349350	fn serialize_key<T: ?Sized>(&mut self, key: &T) -> Result<()>351	where352		T: Serialize,353	{354		let key = key.serialize(IntoValSerializer)?;355		let key = key.to_string()?;356		self.key = Some(key);357		Ok(())358	}359360	fn serialize_value<T: ?Sized>(&mut self, value: &T) -> Result<()>361	where362		T: Serialize,363	{364		let key = self.key.take().expect("no serialize_key called");365		let value = value.serialize(IntoValSerializer)?;366		self.data.field(key).try_value(value)?;367		Ok(())368	}369370	// TODO: serialize_key/serialize_value371	fn serialize_entry<K: ?Sized, V: ?Sized>(&mut self, key: &K, value: &V) -> Result<()>372	where373		K: Serialize,374		V: Serialize,375	{376		let key = key.serialize(IntoValSerializer)?;377		let key = key.to_string()?;378		let value = value.serialize(IntoValSerializer)?;379		self.data.field(key).try_value(value)?;380		Ok(())381	}382383	fn end(self) -> Result<Val> {384		let inner = Val::Obj(self.data.build());385		if let Some(variant) = self.variant {386			let mut out = ObjValue::builder_with_capacity(1);387			out.field(variant).value(inner);388			Ok(Val::Obj(out.build()))389		} else {390			Ok(inner)391		}392	}393}394impl SerializeStruct for IntoObjValueSerializer {395	type Ok = Val;396	type Error = JrError;397398	fn serialize_field<T: ?Sized>(&mut self, key: &'static str, value: &T) -> Result<()>399	where400		T: Serialize,401	{402		SerializeMap::serialize_entry(self, key, value)?;403		Ok(())404	}405406	fn end(self) -> Result<Val> {407		SerializeMap::end(self)408	}409}410impl SerializeStructVariant for IntoObjValueSerializer {411	type Ok = Val;412413	type Error = JrError;414415	fn serialize_field<T: ?Sized>(&mut self, key: &'static str, value: &T) -> Result<()>416	where417		T: Serialize,418	{419		SerializeMap::serialize_entry(self, key, value)?;420		Ok(())421	}422423	fn end(self) -> Result<Val> {424		SerializeMap::end(self)425	}426}427428struct IntoValSerializer;429impl Serializer for IntoValSerializer {430	type Ok = Val;431432	type Error = JrError;433434	type SerializeSeq = IntoVecValSerializer;435436	type SerializeTuple = IntoVecValSerializer;437438	type SerializeTupleStruct = IntoVecValSerializer;439440	type SerializeTupleVariant = IntoVecValSerializer;441442	type SerializeMap = IntoObjValueSerializer;443444	type SerializeStruct = IntoObjValueSerializer;445446	type SerializeStructVariant = IntoObjValueSerializer;447448	fn serialize_bool(self, v: bool) -> Result<Val> {449		Ok(Val::Bool(v))450	}451452	fn serialize_i8(self, v: i8) -> Result<Val> {453		Ok(Val::Num(f64::from(v)))454	}455456	fn serialize_i16(self, v: i16) -> Result<Val> {457		Ok(Val::Num(f64::from(v)))458	}459460	fn serialize_i32(self, v: i32) -> Result<Val> {461		Ok(Val::Num(f64::from(v)))462	}463464	fn serialize_i64(self, v: i64) -> Result<Val> {465		Ok(Val::Str(v.to_string().into()))466	}467468	fn serialize_u8(self, v: u8) -> Result<Val> {469		Ok(Val::Num(f64::from(v)))470	}471472	fn serialize_u16(self, v: u16) -> Result<Val> {473		Ok(Val::Num(f64::from(v)))474	}475476	fn serialize_u32(self, v: u32) -> Result<Val> {477		Ok(Val::Num(f64::from(v)))478	}479480	fn serialize_u64(self, v: u64) -> Result<Val> {481		Ok(Val::Str(v.to_string().into()))482	}483484	fn serialize_f32(self, v: f32) -> Result<Val> {485		Ok(Val::Num(f64::from(v)))486	}487488	fn serialize_f64(self, v: f64) -> Result<Val> {489		Ok(Val::Num(v))490	}491492	fn serialize_char(self, v: char) -> Result<Val> {493		Ok(Val::Str(v.to_string().into()))494	}495496	fn serialize_str(self, v: &str) -> Result<Val> {497		Ok(Val::Str(v.into()))498	}499500	fn serialize_bytes(self, v: &[u8]) -> Result<Val> {501		Ok(Val::Arr(ArrValue::bytes(v.into())))502	}503504	fn serialize_none(self) -> Result<Val> {505		Ok(Val::Null)506	}507508	fn serialize_some<T: ?Sized>(self, value: &T) -> Result<Val>509	where510		T: Serialize,511	{512		value.serialize(self)513	}514515	fn serialize_unit(self) -> Result<Val> {516		Ok(Val::Null)517	}518519	fn serialize_unit_struct(self, _name: &'static str) -> Result<Val> {520		Ok(Val::Null)521	}522523	fn serialize_unit_variant(524		self,525		_name: &'static str,526		_variant_index: u32,527		variant: &'static str,528	) -> Result<Val> {529		Ok(Val::Str(variant.into()))530	}531532	fn serialize_newtype_struct<T: ?Sized>(self, _name: &'static str, value: &T) -> Result<Val>533	where534		T: Serialize,535	{536		value.serialize(self)537	}538539	fn serialize_newtype_variant<T: ?Sized>(540		self,541		_name: &'static str,542		_variant_index: u32,543		variant: &'static str,544		value: &T,545	) -> Result<Val>546	where547		T: Serialize,548	{549		let mut out = ObjValue::builder_with_capacity(1);550		let value = value.serialize(self)?;551		out.field(variant).value(value);552		Ok(Val::Obj(out.build()))553	}554555	fn serialize_seq(self, len: Option<usize>) -> Result<Self::SerializeSeq, Self::Error> {556		Ok(len.map_or_else(557			IntoVecValSerializer::new,558			IntoVecValSerializer::with_capacity,559		))560	}561562	fn serialize_tuple(self, len: usize) -> Result<Self::SerializeTuple, Self::Error> {563		Ok(IntoVecValSerializer::with_capacity(len))564	}565566	fn serialize_tuple_struct(567		self,568		_name: &'static str,569		len: usize,570	) -> Result<Self::SerializeTupleStruct, Self::Error> {571		Ok(IntoVecValSerializer::with_capacity(len))572	}573574	fn serialize_tuple_variant(575		self,576		_name: &'static str,577		_variant_index: u32,578		variant: &'static str,579		len: usize,580	) -> Result<Self::SerializeTupleVariant, Self::Error> {581		Ok(IntoVecValSerializer::variant_with_capacity(variant, len))582	}583584	fn serialize_map(self, len: Option<usize>) -> Result<Self::SerializeMap, Self::Error> {585		Ok(len.map_or_else(586			IntoObjValueSerializer::new,587			IntoObjValueSerializer::with_capacity,588		))589	}590591	fn serialize_struct(592		self,593		_name: &'static str,594		len: usize,595	) -> Result<Self::SerializeStruct, Self::Error> {596		Ok(IntoObjValueSerializer::with_capacity(len))597	}598599	fn serialize_struct_variant(600		self,601		_name: &'static str,602		_variant_index: u32,603		variant: &'static str,604		len: usize,605	) -> Result<Self::SerializeStructVariant, Self::Error> {606		Ok(IntoObjValueSerializer::variant_with_capacity(variant, len))607	}608}609610impl Val {611	pub fn from_serde(v: impl Serialize) -> Result<Val, JrError> {612		v.serialize(IntoValSerializer)613	}614}615616impl serde::ser::Error for JrError {617	fn custom<T>(msg: T) -> Self618	where619		T: std::fmt::Display,620	{621		runtime_error!("serde: {msg}")622	}623}
after · crates/jrsonnet-evaluator/src/integrations/serde.rs
1use std::borrow::Cow;23use jrsonnet_interner::IStr;4use serde::{5	de::Visitor,6	ser::{7		Error, SerializeMap, SerializeSeq, SerializeStruct, SerializeStructVariant, SerializeTuple,8		SerializeTupleStruct, SerializeTupleVariant,9	},10	Deserialize, Serialize, Serializer,11};1213use crate::{14	arr::ArrValue, runtime_error, Error as JrError, ObjValue, ObjValueBuilder, Result, State, Val,15};1617impl<'de> Deserialize<'de> for Val {18	fn deserialize<D>(deserializer: D) -> Result<Val, D::Error>19	where20		D: serde::Deserializer<'de>,21	{22		struct ValVisitor;2324		// macro_rules! visit_num {25		// 	($($method:ident => $ty:ty),* $(,)?) => {$(26		// 		fn $method<E>(self, v: $ty) -> Result<Self::Value, E>27		// 		where28		// 			E: serde::de::Error,29		// 		{30		// 			Ok(Val::Num(f64::from(v)))31		// 		}32		// 	)*};33		// }3435		impl<'de> Visitor<'de> for ValVisitor {36			type Value = Val;3738			fn visit_bool<E>(self, v: bool) -> Result<Self::Value, E>39			where40				E: serde::de::Error,41			{42				Ok(Val::Bool(v))43			}44			fn visit_f64<E>(self, v: f64) -> Result<Self::Value, E>45			where46				E: serde::de::Error,47			{48				if !v.is_finite() {49					return Err(E::custom("only finite numbers are supported"));50				}51				Ok(Val::Num(v))52			}53			fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>54			where55				E: serde::de::Error,56			{57				Ok(Val::string(v))58			}5960			// visit_num! {61			// 	visit_i8 => i8,62			// 	visit_i16 => i16,63			// 	visit_i32 => i32,64			// 	visit_u8 => u8,65			// 	visit_u16 => u16,66			// 	visit_u32 => u32,67			// }68			fn visit_i64<E>(self, v: i64) -> Result<Self::Value, E>69			where70				E: serde::de::Error,71			{72				Ok(Val::Num(v as f64))73			}74			fn visit_u64<E>(self, v: u64) -> Result<Self::Value, E>75			where76				E: serde::de::Error,77			{78				Ok(Val::Num(v as f64))79			}8081			fn visit_bytes<E>(self, v: &[u8]) -> Result<Self::Value, E>82			where83				E: serde::de::Error,84			{85				Ok(Val::Arr(ArrValue::bytes(v.into())))86			}8788			fn visit_none<E>(self) -> Result<Self::Value, E>89			where90				E: serde::de::Error,91			{92				Ok(Val::Null)93			}94			fn visit_some<D>(self, deserializer: D) -> Result<Self::Value, D::Error>95			where96				D: serde::Deserializer<'de>,97			{98				deserializer.deserialize_any(self)99			}100101			fn visit_unit<E>(self) -> Result<Self::Value, E>102			where103				E: serde::de::Error,104			{105				Ok(Val::Null)106			}107108			fn visit_newtype_struct<D>(self, deserializer: D) -> Result<Self::Value, D::Error>109			where110				D: serde::Deserializer<'de>,111			{112				deserializer.deserialize_any(self)113			}114115			fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>116			where117				A: serde::de::SeqAccess<'de>,118			{119				let mut out = seq.size_hint().map_or_else(Vec::new, Vec::with_capacity);120121				while let Some(val) = seq.next_element::<Val>()? {122					out.push(val);123				}124125				Ok(Val::Arr(ArrValue::eager(out)))126			}127128			fn visit_map<A>(self, mut map: A) -> Result<Self::Value, A::Error>129			where130				A: serde::de::MapAccess<'de>,131			{132				let mut out = map133					.size_hint()134					.map_or_else(ObjValueBuilder::new, ObjValueBuilder::with_capacity);135136				while let Some((k, v)) = map.next_entry::<Cow<'de, str>, Val>()? {137					// Jsonnet ignores duplicate keys138					out.field(k).value(v);139				}140141				Ok(Val::Obj(out.build()))142			}143144			fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {145				write!(formatter, "any valid jsonnet value")146			}147		}148		deserializer.deserialize_any(ValVisitor)149	}150}151152impl Serialize for Val {153	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>154	where155		S: serde::Serializer,156	{157		match self {158			Val::Bool(v) => serializer.serialize_bool(*v),159			Val::Null => serializer.serialize_none(),160			Val::Str(s) => serializer.serialize_str(&s.clone().into_flat()),161			Val::Num(n) => {162				if n.fract() != 0.0 {163					serializer.serialize_f64(*n)164				} else {165					let n = *n as i64;166					serializer.serialize_i64(n)167				}168			}169			#[cfg(feature = "exp-bigint")]170			Val::BigInt(b) => b.serialize(serializer),171			Val::Arr(arr) => {172				let mut seq = serializer.serialize_seq(Some(arr.len()))?;173				for (i, element) in arr.iter().enumerate() {174					let mut serde_error = None;175					// TODO: rewrite using try{} after stabilization176					State::push_description(177						|| format!("array index [{i}]"),178						|| {179							let e = element?;180							if let Err(e) = seq.serialize_element(&e) {181								serde_error = Some(e);182							}183							Ok(())184						},185					)186					.map_err(|e| S::Error::custom(e.to_string()))?;187					if let Some(e) = serde_error {188						return Err(e);189					}190				}191				seq.end()192			}193			Val::Obj(obj) => {194				let mut map = serializer.serialize_map(Some(obj.len()))?;195				for (field, value) in obj.iter(196					#[cfg(feature = "exp-preserve-order")]197					true,198				) {199					let mut serde_error = None;200					// TODO: rewrite using try{} after stabilization201					State::push_description(202						|| format!("object field {field:?}"),203						|| {204							let v = value?;205							if let Err(e) = map.serialize_entry(field.as_str(), &v) {206								serde_error = Some(e);207							}208							Ok(())209						},210					)211					.map_err(|e| S::Error::custom(e.to_string()))?;212					if let Some(e) = serde_error {213						return Err(e);214					}215				}216				map.end()217			}218			Val::Func(_) => Err(S::Error::custom("tried to manifest function")),219		}220	}221}222223struct IntoVecValSerializer {224	variant: Option<IStr>,225	data: Vec<Val>,226}227impl IntoVecValSerializer {228	fn new() -> Self {229		Self {230			variant: None,231			data: Vec::new(),232		}233	}234	fn with_capacity(capacity: usize) -> Self {235		Self {236			variant: None,237			data: Vec::with_capacity(capacity),238		}239	}240	fn variant_with_capacity(variant: impl Into<IStr>, capacity: usize) -> Self {241		Self {242			variant: Some(variant.into()),243			data: Vec::with_capacity(capacity),244		}245	}246}247impl SerializeSeq for IntoVecValSerializer {248	type Ok = Val;249	type Error = JrError;250251	fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<()>252	where253		T: Serialize,254	{255		let value = value.serialize(IntoValSerializer)?;256		self.data.push(value);257		Ok(())258	}259260	fn end(self) -> Result<Val> {261		let inner = Val::Arr(ArrValue::eager(self.data));262		if let Some(variant) = self.variant {263			let mut out = ObjValue::builder_with_capacity(1);264			out.field(variant).value(inner);265			Ok(Val::Obj(out.build()))266		} else {267			Ok(inner)268		}269	}270}271impl SerializeTuple for IntoVecValSerializer {272	type Ok = Val;273	type Error = JrError;274275	fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<()>276	where277		T: Serialize,278	{279		SerializeSeq::serialize_element(self, value)280	}281282	fn end(self) -> Result<Val> {283		SerializeSeq::end(self)284	}285}286impl SerializeTupleVariant for IntoVecValSerializer {287	type Ok = Val;288	type Error = JrError;289290	fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<()>291	where292		T: Serialize,293	{294		SerializeSeq::serialize_element(self, value)295	}296297	fn end(self) -> Result<Val> {298		SerializeSeq::end(self)299	}300}301impl SerializeTupleStruct for IntoVecValSerializer {302	type Ok = Val;303	type Error = JrError;304305	fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<()>306	where307		T: Serialize,308	{309		SerializeSeq::serialize_element(self, value)310	}311312	fn end(self) -> Result<Val> {313		SerializeSeq::end(self)314	}315}316317struct IntoObjValueSerializer {318	variant: Option<IStr>,319	data: ObjValueBuilder,320	key: Option<IStr>,321}322impl IntoObjValueSerializer {323	fn new() -> Self {324		Self {325			variant: None,326			data: ObjValue::builder(),327			key: None,328		}329	}330	fn with_capacity(capacity: usize) -> Self {331		Self {332			variant: None,333			data: ObjValue::builder_with_capacity(capacity),334			key: None,335		}336	}337	fn variant_with_capacity(variant: impl Into<IStr>, capacity: usize) -> Self {338		Self {339			variant: Some(variant.into()),340			data: ObjValue::builder_with_capacity(capacity),341			key: None,342		}343	}344}345impl SerializeMap for IntoObjValueSerializer {346	type Ok = Val;347	type Error = JrError;348349	fn serialize_key<T: ?Sized>(&mut self, key: &T) -> Result<()>350	where351		T: Serialize,352	{353		let key = key.serialize(IntoValSerializer)?;354		let key = key.to_string()?;355		self.key = Some(key);356		Ok(())357	}358359	fn serialize_value<T: ?Sized>(&mut self, value: &T) -> Result<()>360	where361		T: Serialize,362	{363		let key = self.key.take().expect("no serialize_key called");364		let value = value.serialize(IntoValSerializer)?;365		self.data.field(key).try_value(value)?;366		Ok(())367	}368369	// TODO: serialize_key/serialize_value370	fn serialize_entry<K: ?Sized, V: ?Sized>(&mut self, key: &K, value: &V) -> Result<()>371	where372		K: Serialize,373		V: Serialize,374	{375		let key = key.serialize(IntoValSerializer)?;376		let key = key.to_string()?;377		let value = value.serialize(IntoValSerializer)?;378		self.data.field(key).try_value(value)?;379		Ok(())380	}381382	fn end(self) -> Result<Val> {383		let inner = Val::Obj(self.data.build());384		if let Some(variant) = self.variant {385			let mut out = ObjValue::builder_with_capacity(1);386			out.field(variant).value(inner);387			Ok(Val::Obj(out.build()))388		} else {389			Ok(inner)390		}391	}392}393impl SerializeStruct for IntoObjValueSerializer {394	type Ok = Val;395	type Error = JrError;396397	fn serialize_field<T: ?Sized>(&mut self, key: &'static str, value: &T) -> Result<()>398	where399		T: Serialize,400	{401		SerializeMap::serialize_entry(self, key, value)?;402		Ok(())403	}404405	fn end(self) -> Result<Val> {406		SerializeMap::end(self)407	}408}409impl SerializeStructVariant for IntoObjValueSerializer {410	type Ok = Val;411412	type Error = JrError;413414	fn serialize_field<T: ?Sized>(&mut self, key: &'static str, value: &T) -> Result<()>415	where416		T: Serialize,417	{418		SerializeMap::serialize_entry(self, key, value)?;419		Ok(())420	}421422	fn end(self) -> Result<Val> {423		SerializeMap::end(self)424	}425}426427struct IntoValSerializer;428impl Serializer for IntoValSerializer {429	type Ok = Val;430431	type Error = JrError;432433	type SerializeSeq = IntoVecValSerializer;434435	type SerializeTuple = IntoVecValSerializer;436437	type SerializeTupleStruct = IntoVecValSerializer;438439	type SerializeTupleVariant = IntoVecValSerializer;440441	type SerializeMap = IntoObjValueSerializer;442443	type SerializeStruct = IntoObjValueSerializer;444445	type SerializeStructVariant = IntoObjValueSerializer;446447	fn serialize_bool(self, v: bool) -> Result<Val> {448		Ok(Val::Bool(v))449	}450451	fn serialize_i8(self, v: i8) -> Result<Val> {452		Ok(Val::Num(f64::from(v)))453	}454455	fn serialize_i16(self, v: i16) -> Result<Val> {456		Ok(Val::Num(f64::from(v)))457	}458459	fn serialize_i32(self, v: i32) -> Result<Val> {460		Ok(Val::Num(f64::from(v)))461	}462463	fn serialize_i64(self, v: i64) -> Result<Val> {464		Ok(Val::Str(v.to_string().into()))465	}466467	fn serialize_u8(self, v: u8) -> Result<Val> {468		Ok(Val::Num(f64::from(v)))469	}470471	fn serialize_u16(self, v: u16) -> Result<Val> {472		Ok(Val::Num(f64::from(v)))473	}474475	fn serialize_u32(self, v: u32) -> Result<Val> {476		Ok(Val::Num(f64::from(v)))477	}478479	fn serialize_u64(self, v: u64) -> Result<Val> {480		Ok(Val::Str(v.to_string().into()))481	}482483	fn serialize_f32(self, v: f32) -> Result<Val> {484		Ok(Val::Num(f64::from(v)))485	}486487	fn serialize_f64(self, v: f64) -> Result<Val> {488		Ok(Val::Num(v))489	}490491	fn serialize_char(self, v: char) -> Result<Val> {492		Ok(Val::Str(v.to_string().into()))493	}494495	fn serialize_str(self, v: &str) -> Result<Val> {496		Ok(Val::Str(v.into()))497	}498499	fn serialize_bytes(self, v: &[u8]) -> Result<Val> {500		Ok(Val::Arr(ArrValue::bytes(v.into())))501	}502503	fn serialize_none(self) -> Result<Val> {504		Ok(Val::Null)505	}506507	fn serialize_some<T: ?Sized>(self, value: &T) -> Result<Val>508	where509		T: Serialize,510	{511		value.serialize(self)512	}513514	fn serialize_unit(self) -> Result<Val> {515		Ok(Val::Null)516	}517518	fn serialize_unit_struct(self, _name: &'static str) -> Result<Val> {519		Ok(Val::Null)520	}521522	fn serialize_unit_variant(523		self,524		_name: &'static str,525		_variant_index: u32,526		variant: &'static str,527	) -> Result<Val> {528		Ok(Val::Str(variant.into()))529	}530531	fn serialize_newtype_struct<T: ?Sized>(self, _name: &'static str, value: &T) -> Result<Val>532	where533		T: Serialize,534	{535		value.serialize(self)536	}537538	fn serialize_newtype_variant<T: ?Sized>(539		self,540		_name: &'static str,541		_variant_index: u32,542		variant: &'static str,543		value: &T,544	) -> Result<Val>545	where546		T: Serialize,547	{548		let mut out = ObjValue::builder_with_capacity(1);549		let value = value.serialize(self)?;550		out.field(variant).value(value);551		Ok(Val::Obj(out.build()))552	}553554	fn serialize_seq(self, len: Option<usize>) -> Result<Self::SerializeSeq, Self::Error> {555		Ok(len.map_or_else(556			IntoVecValSerializer::new,557			IntoVecValSerializer::with_capacity,558		))559	}560561	fn serialize_tuple(self, len: usize) -> Result<Self::SerializeTuple, Self::Error> {562		Ok(IntoVecValSerializer::with_capacity(len))563	}564565	fn serialize_tuple_struct(566		self,567		_name: &'static str,568		len: usize,569	) -> Result<Self::SerializeTupleStruct, Self::Error> {570		Ok(IntoVecValSerializer::with_capacity(len))571	}572573	fn serialize_tuple_variant(574		self,575		_name: &'static str,576		_variant_index: u32,577		variant: &'static str,578		len: usize,579	) -> Result<Self::SerializeTupleVariant, Self::Error> {580		Ok(IntoVecValSerializer::variant_with_capacity(variant, len))581	}582583	fn serialize_map(self, len: Option<usize>) -> Result<Self::SerializeMap, Self::Error> {584		Ok(len.map_or_else(585			IntoObjValueSerializer::new,586			IntoObjValueSerializer::with_capacity,587		))588	}589590	fn serialize_struct(591		self,592		_name: &'static str,593		len: usize,594	) -> Result<Self::SerializeStruct, Self::Error> {595		Ok(IntoObjValueSerializer::with_capacity(len))596	}597598	fn serialize_struct_variant(599		self,600		_name: &'static str,601		_variant_index: u32,602		variant: &'static str,603		len: usize,604	) -> Result<Self::SerializeStructVariant, Self::Error> {605		Ok(IntoObjValueSerializer::variant_with_capacity(variant, len))606	}607}608609impl Val {610	pub fn from_serde(v: impl Serialize) -> Result<Val, JrError> {611		v.serialize(IntoValSerializer)612	}613}614615impl serde::ser::Error for JrError {616	fn custom<T>(msg: T) -> Self617	where618		T: std::fmt::Display,619	{620		runtime_error!("serde: {msg}")621	}622}
modifiedcrates/jrsonnet-parser/src/lib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-parser/src/lib.rs
+++ b/crates/jrsonnet-parser/src/lib.rs
@@ -635,13 +635,11 @@
 							el!(
 								Index {
 									indexable: el!(Var("std".into()), 1, 4),
-									parts: vec![
-										IndexPart {
-											value: el!(Str("deepJoin".into()), 5, 13),
-											#[cfg(feature = "exp-null-coaelse")]
-											null_coaelse: false,
-										},
-									],
+									parts: vec![IndexPart {
+										value: el!(Str("deepJoin".into()), 5, 13),
+										#[cfg(feature = "exp-null-coaelse")]
+										null_coaelse: false,
+									}],
 								},
 								1,
 								13
modifiedcrates/jrsonnet-stdlib/src/lib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/lib.rs
+++ b/crates/jrsonnet-stdlib/src/lib.rs
@@ -349,12 +349,10 @@
 		std.with_super(self.stdlib_obj.clone());
 		std.field("thisFile".into())
 			.hide()
-			.value(Val::string(
-				match source.source_path().path() {
-					Some(p) => self.settings().path_resolver.resolve(p).into(),
-					None => source.source_path().to_string().into(),
-				},
-			))
+			.value(Val::string(match source.source_path().path() {
+				Some(p) => self.settings().path_resolver.resolve(p).into(),
+				None => source.source_path().to_string().into(),
+			}))
 			.expect("this object builder is empty");
 		let stdlib_with_this_file = std.build();