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)

19};19};
2020
21#[cfg(not(feature = "exp-preserve-order"))]21#[cfg(not(feature = "exp-preserve-order"))]
22pub(crate) mod ordering {22mod ordering {
23	use gcmodule::Trace;23	use gcmodule::Trace;
2424
25	#[derive(Clone, Copy, Default, Debug, Trace)]25	#[derive(Clone, Copy, Default, Debug, Trace)]
26	pub struct FieldIndex;26	pub struct FieldIndex;
27	impl FieldIndex {27	impl FieldIndex {
28		pub fn next(self) -> Self {28		pub const fn next(self) -> Self {
29			Self29			Self
30		}30		}
31	}31	}
3232
33	#[derive(Clone, Copy, Default, Debug, Trace)]33	#[derive(Clone, Copy, Default, Debug, Trace)]
34	pub struct SuperDepth;34	pub struct SuperDepth;
35	impl SuperDepth {35	impl SuperDepth {
36		pub fn deeper(self) -> Self {36		pub const fn deeper(self) -> Self {
37			Self37			Self
38		}38		}
39	}39	}
4040
41	#[derive(Clone, Copy)]41	#[derive(Clone, Copy)]
42	pub struct FieldSortKey;42	pub struct FieldSortKey;
43	impl FieldSortKey {43	impl FieldSortKey {
44		pub fn new(_: SuperDepth, _: FieldIndex) -> Self {44		pub const fn new(_: SuperDepth, _: FieldIndex) -> Self {
45			Self45			Self
46		}46		}
47	}47	}
87	}87	}
88}88}
8989
90pub(crate) use ordering::*;90use ordering::*;
9191
92#[derive(Debug, Trace)]92#[derive(Debug, Trace)]
93pub struct ObjMember {93pub struct ObjMember {
594	pub fn bindable(self, bindable: TraceBox<dyn Bindable>) {594	pub fn bindable(self, bindable: TraceBox<dyn Bindable>) {
595		self.binding(LazyBinding::Bindable(Cc::new(bindable)))595		self.binding(LazyBinding::Bindable(Cc::new(bindable)))
596	}596	}
597	pub fn binding(self, binding: LazyBinding) -> () {597	pub fn binding(self, binding: LazyBinding) {
598		let (receiver, name, member) = self.build_member(binding);598		let (receiver, name, member) = self.build_member(binding);
599		let new = receiver.0.clone();599		let new = receiver.0.clone();
600		*receiver.0 = new.extend_with_raw_member(name, member)600		*receiver.0 = new.extend_with_raw_member(name, member)

--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -201,16 +201,16 @@
 	pub(crate) step: u32,
 }
 impl Slice {
-	fn from(&self) -> usize {
+	const fn from(&self) -> usize {
 		self.from as usize
 	}
-	fn to(&self) -> usize {
+	const fn to(&self) -> usize {
 		self.to as usize
 	}
-	fn step(&self) -> usize {
+	const fn step(&self) -> usize {
 		self.step as usize
 	}
-	fn len(&self) -> usize {
+	const fn len(&self) -> usize {
 		// TODO: use div_ceil
 		let diff = self.to() - self.from();
 		let rem = diff % self.step();