git.delta.rocks / jrsonnet / refs/commits / 58696dc4e430

difftreelog

Merge pull request #146 from CertainLach/fix/tests

Yaroslav Bolyukin2024-01-16parents: #0d49135 #86f8537.patch.diff
in: master
Fix failing CI for tests and lints

22 files changed

modifiedcmds/jrsonnet-fmt/src/comments.rsdiffbeforeafterboth
--- a/cmds/jrsonnet-fmt/src/comments.rs
+++ b/cmds/jrsonnet-fmt/src/comments.rs
@@ -72,7 +72,7 @@
 					if matches!(loc, CommentLocation::ItemInline) {
 						p!(pi: str(" "));
 					}
-					p!(pi: str("/* ") string(lines[0].trim().to_string()) str(" */"))
+					p!(pi: str("/* ") string(lines[0].trim().to_string()) str(" */") nl)
 				} else if !lines.is_empty() {
 					fn common_ws_prefix<'a>(a: &'a str, b: &str) -> &'a str {
 						let offset = a
modifiedcmds/jrsonnet-fmt/src/main.rsdiffbeforeafterboth
--- a/cmds/jrsonnet-fmt/src/main.rs
+++ b/cmds/jrsonnet-fmt/src/main.rs
@@ -372,8 +372,8 @@
 					return p!(new: str("{ }"));
 				}
 				let mut pi = p!(new: str("{") >i nl);
-				for mem in children.into_iter() {
-					if mem.should_start_with_newline {
+				for (i, mem) in children.into_iter().enumerate() {
+					if mem.should_start_with_newline && i != 0 {
 						p!(pi: nl);
 					}
 					p!(pi: items(format_comments(&mem.before_trivia, CommentLocation::AboveItem)));
modifiedcrates/jrsonnet-cli/src/manifest.rsdiffbeforeafterboth
--- a/crates/jrsonnet-cli/src/manifest.rs
+++ b/crates/jrsonnet-cli/src/manifest.rs
@@ -6,7 +6,7 @@
 };
 use jrsonnet_stdlib::{TomlFormat, YamlFormat};
 
-#[derive(Clone, ValueEnum)]
+#[derive(Clone, Copy, ValueEnum)]
 pub enum ManifestFormatName {
 	/// Expect string as output, and write them directly
 	String,
@@ -18,9 +18,11 @@
 #[derive(Parser)]
 #[clap(next_help_heading = "MANIFESTIFICATION OUTPUT")]
 pub struct ManifestOpts {
-	/// Output format, wraps resulting value to corresponding std.manifest call.
-	#[clap(long, short = 'f', default_value = "json")]
-	format: ManifestFormatName,
+	/// Output format, wraps resulting value to corresponding std.manifest call
+	///
+	/// [default: json, yaml when -y is used]
+	#[clap(long, short = 'f')]
+	format: Option<ManifestFormatName>,
 	/// Expect plain string as output.
 	/// Mutually exclusive with `--format`
 	#[clap(long, short = 'S', conflicts_with = "format")]
@@ -29,7 +31,9 @@
 	#[clap(long, short = 'y', conflicts_with = "string")]
 	yaml_stream: bool,
 	/// Number of spaces to pad output manifest with.
-	/// `0` for hard tabs, `-1` for single line output [default: 3 for json, 2 for yaml/toml]
+	/// `0` for hard tabs, `-1` for single line output
+	///
+	/// [default: 3 for json, 2 for yaml/toml]
 	#[clap(long)]
 	line_padding: Option<usize>,
 	/// Preserve order in object manifestification
@@ -44,7 +48,12 @@
 		} else {
 			#[cfg(feature = "exp-preserve-order")]
 			let preserve_order = self.preserve_order;
-			match self.format {
+			let format = match self.format {
+				Some(v) => v,
+				None if self.yaml_stream => ManifestFormatName::Yaml,
+				None => ManifestFormatName::Json,
+			};
+			match format {
 				ManifestFormatName::String => Box::new(ToStringFormat),
 				ManifestFormatName::Json => Box::new(JsonFormat::cli(
 					self.line_padding.unwrap_or(3),
modifiedcrates/jrsonnet-evaluator/src/arr/spec.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/arr/spec.rs
+++ b/crates/jrsonnet-evaluator/src/arr/spec.rs
@@ -372,7 +372,7 @@
 	pub fn new_inclusive(start: i32, end: i32) -> Self {
 		Self { start, end }
 	}
-	fn range(&self) -> impl Iterator<Item = i32> + ExactSizeIterator + DoubleEndedIterator {
+	fn range(&self) -> impl ExactSizeIterator<Item = i32> + DoubleEndedIterator {
 		WithExactSize(
 			self.start..=self.end,
 			(self.end as usize)
@@ -461,7 +461,7 @@
 			ArrayThunk::Waiting(..) => {}
 		};
 
-		let ArrayThunk::Waiting(_) =
+		let ArrayThunk::Waiting(()) =
 			replace(&mut self.cached.borrow_mut()[index], ArrayThunk::Pending)
 		else {
 			unreachable!()
@@ -508,7 +508,7 @@
 		match &self.cached.borrow()[index] {
 			ArrayThunk::Computed(c) => return Some(Thunk::evaluated(c.clone())),
 			ArrayThunk::Errored(e) => return Some(Thunk::errored(e.clone())),
-			ArrayThunk::Waiting(_) | ArrayThunk::Pending => {}
+			ArrayThunk::Waiting(()) | ArrayThunk::Pending => {}
 		};
 
 		Some(Thunk::new(ArrayElement {
@@ -597,9 +597,7 @@
 	}
 
 	fn get_lazy(&self, index: usize) -> Option<Thunk<Val>> {
-		let Some(key) = self.keys.get(index) else {
-			return None;
-		};
+		let key = self.keys.get(index)?;
 		Some(self.obj.get_lazy_or_bail(key.clone()))
 	}
 
@@ -649,9 +647,7 @@
 	}
 
 	fn get_lazy(&self, index: usize) -> Option<Thunk<Val>> {
-		let Some(key) = self.keys.get(index) else {
-			return None;
-		};
+		let key = self.keys.get(index)?;
 		// Nothing can fail in the key part, yet value is still
 		// lazy-evaluated
 		Some(Thunk::evaluated(
modifiedcrates/jrsonnet-evaluator/src/evaluate/mod.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/evaluate/mod.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/mod.rs
@@ -89,7 +89,7 @@
 	specs: &[CompSpec],
 	callback: &mut impl FnMut(Context) -> Result<()>,
 ) -> Result<()> {
-	match specs.get(0) {
+	match specs.first() {
 		None => callback(ctx)?,
 		Some(CompSpec::IfSpec(IfSpecData(cond))) => {
 			if bool::from_untyped(evaluate(ctx.clone(), cond)?)? {
modifiedcrates/jrsonnet-evaluator/src/function/builtin.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/function/builtin.rs
+++ b/crates/jrsonnet-evaluator/src/function/builtin.rs
@@ -6,8 +6,8 @@
 use super::{arglike::ArgsLike, parse::parse_builtin_call, CallLocation};
 use crate::{gc::TraceBox, tb, Context, Result, Val};
 
-/// Can't have str | IStr, because constant BuiltinParam causes
-/// E0492: constant functions cannot refer to interior mutable data
+/// Can't have `str` | `IStr`, because constant `BuiltinParam` causes
+/// `E0492: constant functions cannot refer to interior mutable data`
 #[derive(Clone, Trace)]
 pub struct ParamName(Option<Cow<'static, str>>);
 impl ParamName {
@@ -27,10 +27,9 @@
 }
 impl PartialEq<IStr> for ParamName {
 	fn eq(&self, other: &IStr) -> bool {
-		match &self.0 {
-			Some(s) => s.as_bytes() == other.as_bytes(),
-			None => false,
-		}
+		self.0
+			.as_ref()
+			.map_or(false, |s| s.as_bytes() == other.as_bytes())
 	}
 }
 
@@ -87,7 +86,7 @@
 			params: params
 				.into_iter()
 				.map(|n| BuiltinParam {
-					name: ParamName::new_dynamic(n.to_string()),
+					name: ParamName::new_dynamic(n),
 					has_default: false,
 				})
 				.collect(),
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, 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}
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					let n = *n as i64;164					serializer.serialize_i64(n)165				} else {166					serializer.serialize_f64(*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-evaluator/src/lib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/lib.rs
+++ b/crates/jrsonnet-evaluator/src/lib.rs
@@ -41,10 +41,12 @@
 	clippy::missing_const_for_fn,
 	// too many false-positives with .expect() calls
 	clippy::missing_panics_doc,
-    // false positive for IStr type. There is an configuration option for
-    // such cases, but it doesn't work:
-    // https://github.com/rust-lang/rust-clippy/issues/9801
-    clippy::mutable_key_type,
+	// false positive for IStr type. There is an configuration option for
+	// such cases, but it doesn't work:
+	// https://github.com/rust-lang/rust-clippy/issues/9801
+	clippy::mutable_key_type,
+	// false positives
+	clippy::redundant_pub_crate,
 )]
 
 // For jrsonnet-macros
modifiedcrates/jrsonnet-evaluator/src/manifest.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/manifest.rs
+++ b/crates/jrsonnet-evaluator/src/manifest.rs
@@ -175,6 +175,8 @@
 	manifest_json_ex_buf(val, &mut out, &mut String::new(), options)?;
 	Ok(out)
 }
+
+#[allow(clippy::too_many_lines)]
 fn manifest_json_ex_buf(
 	val: &Val,
 	buf: &mut String,
modifiedcrates/jrsonnet-evaluator/src/obj.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/obj.rs
+++ b/crates/jrsonnet-evaluator/src/obj.rs
@@ -171,7 +171,7 @@
 			// .field("assertions_ran", &self.assertions_ran)
 			.field("this_entries", &self.this_entries)
 			// .field("value_cache", &self.value_cache)
-			.finish()
+			.finish_non_exhaustive()
 	}
 }
 
@@ -347,7 +347,7 @@
 		out.with_super(self);
 		let mut member = out.field(key);
 		if value.flags.add() {
-			member = member.add()
+			member = member.add();
 		}
 		if let Some(loc) = value.location {
 			member = member.with_location(loc);
@@ -395,7 +395,7 @@
 
 	pub fn get(&self, key: IStr) -> Result<Option<Val>> {
 		self.run_assertions()?;
-		self.get_for(key, self.0.this().unwrap_or(self.clone()))
+		self.get_for(key, self.0.this().unwrap_or_else(|| self.clone()))
 	}
 
 	pub fn get_for(&self, key: IStr, this: ObjValue) -> Result<Option<Val>> {
@@ -474,7 +474,7 @@
 			type Output = Val;
 
 			fn get(self: Box<Self>) -> Result<Self::Output> {
-				Ok(self.obj.get_or_bail(self.key)?)
+				self.obj.get_or_bail(self.key)
 			}
 		}
 
@@ -495,7 +495,7 @@
 			SuperDepth::default(),
 			&mut |depth, index, name, visibility| {
 				let new_sort_key = FieldSortKey::new(depth, index);
-				let entry = out.entry(name.clone());
+				let entry = out.entry(name);
 				let (visible, _) = entry.or_insert((true, new_sort_key));
 				match visibility {
 					Visibility::Normal => {}
@@ -634,7 +634,7 @@
 			SuperDepth::default(),
 			&mut |depth, index, name, visibility| {
 				let new_sort_key = FieldSortKey::new(depth, index);
-				let entry = out.entry(name.clone());
+				let entry = out.entry(name);
 				let (visible, _) = entry.or_insert((true, new_sort_key));
 				match visibility {
 					Visibility::Normal => {}
modifiedcrates/jrsonnet-evaluator/src/stdlib/format.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/stdlib/format.rs
+++ b/crates/jrsonnet-evaluator/src/stdlib/format.rs
@@ -248,7 +248,7 @@
 	let (cflags, str) = try_parse_cflags(str)?;
 	let (width, str) = try_parse_field_width(str)?;
 	let (precision, str) = try_parse_precision(str)?;
-	let (_, str) = try_parse_length_modifier(str)?;
+	let ((), str) = try_parse_length_modifier(str)?;
 	let (convtype, str) = parse_conversion_type(str)?;
 
 	Ok((
modifiedcrates/jrsonnet-evaluator/src/typed/conversions.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/typed/conversions.rs
+++ b/crates/jrsonnet-evaluator/src/typed/conversions.rs
@@ -449,25 +449,21 @@
 	}
 
 	fn from_untyped(value: Val) -> Result<Self> {
-		match &value {
-			Val::Arr(a) => {
-				if let Some(bytes) = a.as_any().downcast_ref::<BytesArray>() {
-					return Ok(bytes.0.as_slice().into());
-				};
-				<Self as Typed>::TYPE.check(&value)?;
-				// Any::downcast_ref::<ByteArray>(&a);
-				let mut out = Vec::with_capacity(a.len());
-				for e in a.iter() {
-					let r = e?;
-					out.push(u8::from_untyped(r)?);
-				}
-				Ok(out.as_slice().into())
-			}
-			_ => {
-				<Self as Typed>::TYPE.check(&value)?;
-				unreachable!()
-			}
+		let Val::Arr(a) = &value else {
+			<Self as Typed>::TYPE.check(&value)?;
+			unreachable!()
+		};
+		if let Some(bytes) = a.as_any().downcast_ref::<BytesArray>() {
+			return Ok(bytes.0.as_slice().into());
+		};
+		<Self as Typed>::TYPE.check(&value)?;
+		// Any::downcast_ref::<ByteArray>(&a);
+		let mut out = Vec::with_capacity(a.len());
+		for e in a.iter() {
+			let r = e?;
+			out.push(u8::from_untyped(r)?);
 		}
+		Ok(out.as_slice().into())
 	}
 }
 
modifiedcrates/jrsonnet-evaluator/src/typed/mod.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/typed/mod.rs
+++ b/crates/jrsonnet-evaluator/src/typed/mod.rs
@@ -90,7 +90,7 @@
 	item: impl Fn() -> Result<()>,
 ) -> Result<()> {
 	State::push_description(error_reason, || match item() {
-		Ok(_) => Ok(()),
+		Ok(()) => Ok(()),
 		Err(mut e) => {
 			if let ErrorKind::TypeError(e) = &mut e.error_mut() {
 				(e.1).0.push(path());
modifiedcrates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -351,6 +351,8 @@
 	}
 }
 impl PartialEq for StrValue {
+	// False positive, into_flat returns not StrValue, but IStr, thus no infinite recursion here.
+	#[allow(clippy::unconditional_recursion)]
 	fn eq(&self, other: &Self) -> bool {
 		let a = self.clone().into_flat();
 		let b = other.clone().into_flat();
modifiedcrates/jrsonnet-interner/src/lib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-interner/src/lib.rs
+++ b/crates/jrsonnet-interner/src/lib.rs
@@ -6,7 +6,7 @@
 #![warn(clippy::pedantic, clippy::nursery)]
 #![allow(clippy::missing_const_for_fn)]
 use std::{
-	borrow::{Borrow, Cow},
+	borrow::Cow,
 	cell::RefCell,
 	fmt::{self, Display},
 	hash::{BuildHasherDefault, Hash, Hasher},
@@ -14,7 +14,7 @@
 	str,
 };
 
-use hashbrown::HashMap;
+use hashbrown::{hash_map::RawEntryMut, HashMap};
 use jrsonnet_gcmodule::Trace;
 use rustc_hash::FxHasher;
 
@@ -57,17 +57,6 @@
 	}
 }
 
-impl Borrow<str> for IStr {
-	fn borrow(&self) -> &str {
-		self.as_str()
-	}
-}
-impl Borrow<[u8]> for IStr {
-	fn borrow(&self) -> &[u8] {
-		self.as_bytes()
-	}
-}
-
 impl PartialEq for IStr {
 	fn eq(&self, other: &Self) -> bool {
 		// all IStr should be inlined into same pool
@@ -142,12 +131,6 @@
 	type Target = [u8];
 
 	fn deref(&self) -> &Self::Target {
-		self.0.as_slice()
-	}
-}
-
-impl Borrow<[u8]> for IBytes {
-	fn borrow(&self) -> &[u8] {
 		self.0.as_slice()
 	}
 }
@@ -285,9 +268,9 @@
 		let mut pool = pool.borrow_mut();
 		let entry = pool.raw_entry_mut().from_key(bytes);
 		match entry {
-			hashbrown::hash_map::RawEntryMut::Occupied(i) => IBytes(i.get_key_value().0.clone()),
-			hashbrown::hash_map::RawEntryMut::Vacant(e) => {
-				let (k, _) = e.insert(Inner::new_bytes(bytes), ());
+			RawEntryMut::Occupied(i) => IBytes(i.get_key_value().0.clone()),
+			RawEntryMut::Vacant(e) => {
+				let (k, ()) = e.insert(Inner::new_bytes(bytes), ());
 				IBytes(k.clone())
 			}
 		}
modifiedcrates/jrsonnet-macros/src/lib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-macros/src/lib.rs
+++ b/crates/jrsonnet-macros/src/lib.rs
@@ -374,6 +374,7 @@
 				fn params(&self) -> &[BuiltinParam] {
 					PARAMS
 				}
+				#[allow(unused_variable)]
 				fn call(&self, ctx: Context, location: CallLocation, args: &dyn ArgsLike) -> Result<Val> {
 					let parsed = parse_builtin_call(ctx.clone(), &PARAMS, args, false)?;
 
modifiedcrates/jrsonnet-stdlib/src/encoding.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/encoding.rs
+++ b/crates/jrsonnet-stdlib/src/encoding.rs
@@ -39,5 +39,5 @@
 	let bytes = STANDARD
 		.decode(str.as_bytes())
 		.map_err(|e| runtime_error!("invalid base64: {e}"))?;
-	Ok(String::from_utf8(bytes).map_err(|_| runtime_error!("bad utf8"))?)
+	String::from_utf8(bytes).map_err(|_| runtime_error!("bad utf8"))
 }
modifiedcrates/jrsonnet-stdlib/src/manifest/yaml.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/manifest/yaml.rs
+++ b/crates/jrsonnet-stdlib/src/manifest/yaml.rs
@@ -134,6 +134,14 @@
 					buf.push_str(&options.padding);
 					buf.push_str(line);
 				}
+			} else if s.contains('\n') {
+				buf.push_str("|-");
+				for line in s.split('\n') {
+					buf.push('\n');
+					buf.push_str(cur_padding);
+					buf.push_str(&options.padding);
+					buf.push_str(line);
+				}
 			} else if !options.quote_keys && !yaml_needs_quotes(&s) {
 				buf.push_str(&s);
 			} else {
modifiedcrates/jrsonnet-stdlib/src/misc.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/misc.rs
+++ b/crates/jrsonnet-stdlib/src/misc.rs
@@ -47,7 +47,7 @@
 		.ext_natives
 		.get(&x)
 		.cloned()
-		.map_or(Val::Null, |v| Val::Func(v))
+		.map_or(Val::Null, Val::Func)
 }
 
 #[builtin(fields(
modifiedflake.lockdiffbeforeafterboth
--- a/flake.lock
+++ b/flake.lock
@@ -5,11 +5,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1694529238,
-        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "lastModified": 1705309234,
+        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
         "type": "github"
       },
       "original": {
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1701376520,
-        "narHash": "sha256-U3iGiOZqgu7wvVzgfoQzGGFMqNsDj/q/6zPIjCy7ajg=",
+        "lastModified": 1705391267,
+        "narHash": "sha256-gGVm9QudiRtYTX8PN9cTTy7uuJcL4I2lRMoPx496kXk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c74cc3c3db2ed5e68895953d75c397797d499133",
+        "rev": "41a9a7f170c740acb24f3390323877d11c69d5ee",
         "type": "github"
       },
       "original": {
@@ -50,11 +50,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1701310566,
-        "narHash": "sha256-CL9J3xUR2Ejni4LysrEGX0IdO+Y4BXCiH/By0lmF3eQ=",
+        "lastModified": 1705371439,
+        "narHash": "sha256-P1kulUXpYWkcrjiX3sV4j8ACJZh9XXSaaD+jDLBDLKo=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "6d3c6e185198b8bf7ad639f22404a75aa9a09bff",
+        "rev": "b21f3c0d5bf0f0179f5f0140e8e0cd099618bd04",
         "type": "github"
       },
       "original": {
modifiedflake.nixdiffbeforeafterboth
--- a/flake.nix
+++ b/flake.nix
@@ -25,14 +25,14 @@
         lib = pkgs.lib;
         rust =
           (pkgs.rustChannelOf {
-            date = "2023-10-28";
+            date = "2024-01-10";
             channel = "nightly";
           })
           .default
           .override {
             extensions = ["rust-src" "miri" "rust-analyzer" "clippy"];
           };
-      in rec {
+      in {
         packages = rec {
           go-jsonnet = pkgs.callPackage ./nix/go-jsonnet.nix {};
           sjsonnet = pkgs.callPackage ./nix/sjsonnet.nix {};
modifiedtests/suite/std_param_names.jsonnetdiffbeforeafterboth
--- a/tests/suite/std_param_names.jsonnet
+++ b/tests/suite/std_param_names.jsonnet
@@ -103,6 +103,7 @@
     asin: ['x'],
     acos: ['x'],
     atan: ['x'],
+    atan2: ['y', 'x'],
     type: ['x'],
     filter: ['func', 'arr'],
     objectHasEx: ['obj', 'fname', 'hidden'],