git.delta.rocks / jrsonnet / refs/commits / 1111100e839d

--- a/crates/jrsonnet-evaluator/src/builtin/mod.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/mod.rs
@@ -192,8 +192,6 @@
 	inc_hidden: bool,
 	#[cfg(feature = "exp-preserve-order")] preserve_order: Option<bool>,
 ) -> Result<VecVal> {
-	#[cfg(not(feature = "exp-preserve-order"))]
-	let preserve_order = false;
 	#[cfg(feature = "exp-preserve-order")]
 	let preserve_order = preserve_order.unwrap_or(false);
 	let out = obj.fields_ex(

--- a/crates/jrsonnet-evaluator/src/evaluate/mod.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/mod.rs
@@ -680,7 +680,7 @@
 					Ok(Some(push_frame(
 						loc,
 						|| format!("slice {}", desc),
-						|| Ok(evaluate(context.clone(), value)?.try_into()?),
+						|| evaluate(context.clone(), value)?.try_into(),
 					)?))
 				} else {
 					Ok(None)

--- a/crates/jrsonnet-evaluator/src/obj.rs
+++ b/crates/jrsonnet-evaluator/src/obj.rs
@@ -19,13 +19,13 @@
 };
 
 #[cfg(not(feature = "exp-preserve-order"))]
-pub(crate) mod ordering {
+mod ordering {
 	use gcmodule::Trace;
 
 	#[derive(Clone, Copy, Default, Debug, Trace)]
 	pub struct FieldIndex;
 	impl FieldIndex {
-		pub fn next(self) -> Self {
+		pub const fn next(self) -> Self {
 			Self
 		}
 	}
@@ -33,7 +33,7 @@
 	#[derive(Clone, Copy, Default, Debug, Trace)]
 	pub struct SuperDepth;
 	impl SuperDepth {
-		pub fn deeper(self) -> Self {
+		pub const fn deeper(self) -> Self {
 			Self
 		}
 	}
@@ -41,7 +41,7 @@
 	#[derive(Clone, Copy)]
 	pub struct FieldSortKey;
 	impl FieldSortKey {
-		pub fn new(_: SuperDepth, _: FieldIndex) -> Self {
+		pub const fn new(_: SuperDepth, _: FieldIndex) -> Self {
 			Self
 		}
 	}
@@ -87,7 +87,7 @@
 	}
 }
 
-pub(crate) use ordering::*;
+use ordering::*;
 
 #[derive(Debug, Trace)]
 pub struct ObjMember {
@@ -594,7 +594,7 @@
 	pub fn bindable(self, bindable: TraceBox<dyn Bindable>) {
 		self.binding(LazyBinding::Bindable(Cc::new(bindable)))
 	}
-	pub fn binding(self, binding: LazyBinding) -> () {
+	pub fn binding(self, binding: LazyBinding) {
 		let (receiver, name, member) = self.build_member(binding);
 		let new = receiver.0.clone();
 		*receiver.0 = new.extend_with_raw_member(name, member)

201	pub(crate) step: u32,201	pub(crate) step: u32,
202}202}
203impl Slice {203impl Slice {
204	fn from(&self) -> usize {204	const fn from(&self) -> usize {
205		self.from as usize205		self.from as usize
206	}206	}
207	fn to(&self) -> usize {207	const fn to(&self) -> usize {
208		self.to as usize208		self.to as usize
209	}209	}
210	fn step(&self) -> usize {210	const fn step(&self) -> usize {
211		self.step as usize211		self.step as usize
212	}212	}
213	fn len(&self) -> usize {213	const fn len(&self) -> usize {
214		// TODO: use div_ceil214		// TODO: use div_ceil
215		let diff = self.to() - self.from();215		let diff = self.to() - self.from();
216		let rem = diff % self.step();216		let rem = diff % self.step();