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

--- a/crates/jrsonnet-evaluator/src/builtin/mod.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/mod.rs
@@ -221,7 +221,7 @@
 		3, step: ty!((number | null));
 	], {
 		std_slice(
-			indexable.to_indexable()?,
+			indexable.into_indexable()?,
 			index.try_cast_nullable_num("index")?.map(|v| v as usize),
 			end.try_cast_nullable_num("end")?.map(|v| v as usize),
 			step.try_cast_nullable_num("step")?.map(|v| v as usize),

--- a/crates/jrsonnet-evaluator/src/evaluate/mod.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/mod.rs
@@ -687,7 +687,7 @@
 				desc: &'static str,
 			) -> Result<Option<usize>> {
 				Ok(match expr {
-					Some(s) => evaluate(context.clone(), &s)?
+					Some(s) => evaluate(context.clone(), s)?
 						.try_cast_nullable_num(desc)?
 						.map(|v| v as usize),
 					None => None,
@@ -698,7 +698,7 @@
 			let end = parse_num(&context, desc.end.as_ref(), "end")?;
 			let step = parse_num(&context, desc.step.as_ref(), "step")?;
 
-			std_slice(indexable.to_indexable()?, start, end, step)?
+			std_slice(indexable.into_indexable()?, start, end, step)?
 		}
 		Import(path) => {
 			let tmp = loc

47			Value::Number(n) => Self::Num(n.as_f64().expect("as f64")),47			Value::Number(n) => Self::Num(n.as_f64().expect("as f64")),
48			Value::String(s) => Self::Str((s as &str).into()),48			Value::String(s) => Self::Str((s as &str).into()),
49			Value::Array(a) => {49			Value::Array(a) => {
50				let mut out: Vec<Val> = Vec::with_capacity(a.len());50				let mut out: Vec<Self> = Vec::with_capacity(a.len());
51				for v in a {51				for v in a {
52					out.push(v.into());52					out.push(v.into());
53				}53				}
58				for (k, v) in o {58				for (k, v) in o {
59					builder.member((k as &str).into()).value(v.into());59					builder.member((k as &str).into()).value(v.into());
60				}60				}
61				Val::Obj(builder.build())61				Self::Obj(builder.build())
62			}62			}
63		}63		}
64	}64	}

--- a/crates/jrsonnet-evaluator/src/obj.rs
+++ b/crates/jrsonnet-evaluator/src/obj.rs
@@ -322,6 +322,11 @@
 		ObjValue::new(self.super_obj, Gc::new(self.map), Gc::new(self.assertions))
 	}
 }
+impl Default for ObjValueBuilder {
+	fn default() -> Self {
+		Self::with_capacity(0)
+	}
+}
 
 #[must_use = "value not added unless binding() was called"]
 pub struct ObjMemberBuilder<'v> {
@@ -332,8 +337,9 @@
 	location: Option<ExprLocation>,
 }
 
+#[allow(clippy::missing_const_for_fn)]
 impl<'v> ObjMemberBuilder<'v> {
-	pub fn with_add(mut self, add: bool) -> Self {
+	pub const fn with_add(mut self, add: bool) -> Self {
 		self.add = add;
 		self
 	}

--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -571,7 +571,7 @@
 			.try_cast_str("to json")
 		})
 	}
-	pub fn to_indexable(self) -> Result<IndexableVal> {
+	pub fn into_indexable(self) -> Result<IndexableVal> {
 		Ok(match self {
 			Val::Str(s) => IndexableVal::Str(s),
 			Val::Arr(arr) => IndexableVal::Arr(arr),