git.delta.rocks / jrsonnet / refs/commits / f5b072424acc

--- a/crates/jsonnet-evaluator/Cargo.toml
+++ b/crates/jsonnet-evaluator/Cargo.toml
@@ -10,6 +10,7 @@
 default = ["serialized-stdlib", "faster"]
 serialized-stdlib = ["serde", "bincode"]
 # Replace some standard library functions with faster implementations
+# Library works fine without this feature, but requires more memory and time for std function calls
 faster = []
 
 [dependencies]

168future_wrapper!(HashMap<String, LazyBinding>, FutureNewBindings);168future_wrapper!(HashMap<String, LazyBinding>, FutureNewBindings);
169future_wrapper!(ObjValue, FutureObjValue);169future_wrapper!(ObjValue, FutureObjValue);
170170
171#[inline(always)]
172pub fn evaluate_comp<T>(171pub fn evaluate_comp<T>(
173	context: Context,172	context: Context,
174	value: &impl Fn(Context) -> Result<T>,173	value: &impl Fn(Context) -> Result<T>,
370	})369	})
371}370}
372371
373#[inline(always)]
374pub fn evaluate(context: Context, expr: &LocExpr) -> Result<Val> {372pub fn evaluate(context: Context, expr: &LocExpr) -> Result<Val> {
375	use Expr::*;373	use Expr::*;
376	let locexpr = expr.clone();374	let locexpr = expr.clone();
731					(ns, name) => panic!("Intristic not found: {}.{}", ns, name),729					(ns, name) => panic!("Intristic not found: {}.{}", ns, name),
732				},730				},
733				Val::Func(f) => {731				Val::Func(f) => {
734					let body = #[inline(always)]732					let body = || f.evaluate(context, args, *tailstrict);
735					|| f.evaluate(context, args, *tailstrict);
736					if *tailstrict {733					if *tailstrict {
737						body()?734						body()?

--- a/crates/jsonnet-evaluator/src/function.rs
+++ b/crates/jsonnet-evaluator/src/function.rs
@@ -24,7 +24,6 @@
 ///
 /// ## Notes
 /// This function is always inlined for tailstrict
-#[inline(always)]
 pub(crate) fn inline_parse_function_call(
 	ctx: Context,
 	body_ctx: Option<Context>,
@@ -79,7 +78,6 @@
 	Ok(body_ctx.unwrap_or(ctx).extend(out, None, None, None)?)
 }
 
-#[inline(always)]
 pub(crate) fn place_args(
 	ctx: Context,
 	body_ctx: Option<Context>,

--- a/crates/jsonnet-evaluator/src/lib.rs
+++ b/crates/jsonnet-evaluator/src/lib.rs
@@ -2,7 +2,6 @@
 #![feature(type_alias_impl_trait)]
 #![feature(debug_non_exhaustive)]
 #![allow(macro_expanded_macro_exports_accessed_by_absolute_paths)]
-#![feature(stmt_expr_attributes)]
 mod ctx;
 mod dynamic;
 mod error;
@@ -81,17 +80,14 @@
 	/// Global state is fine there
 	pub(crate) static EVAL_STATE: RefCell<Option<EvaluationState>> = RefCell::new(None)
 }
-#[inline(always)]
 pub(crate) fn with_state<T>(f: impl FnOnce(&EvaluationState) -> T) -> T {
 	EVAL_STATE.with(
-		#[inline(always)]
 		|s| f(s.borrow().as_ref().unwrap()),
 	)
 }
 pub(crate) fn create_error<T>(err: Error) -> Result<T> {
 	with_state(|s| s.error(err))
 }
-#[inline(always)]
 pub(crate) fn push<T>(e: LocExpr, comment: String, f: impl FnOnce() -> Result<T>) -> Result<T> {
 	with_state(|s| s.push(e, comment, f))
 }
@@ -251,7 +247,6 @@
 		Context::new().extend_unbound(new_bindings, None, None, None)
 	}
 
-	#[inline(always)]
 	pub fn push<T>(&self, e: LocExpr, comment: String, f: impl FnOnce() -> Result<T>) -> Result<T> {
 		{
 			let mut stack = self.0.stack.borrow_mut();
@@ -287,7 +282,6 @@
 		Err(LocError(err, self.stack_trace()))
 	}
 
-	#[inline(always)]
 	fn run_in_state<T>(&self, f: impl FnOnce() -> T) -> T {
 		EVAL_STATE.with(|v| {
 			let has_state = v.borrow().is_some();

--- a/crates/jsonnet-evaluator/src/map.rs
+++ b/crates/jsonnet-evaluator/src/map.rs
@@ -18,7 +18,6 @@
 		}))
 	}
 
-	#[inline(always)]
 	pub fn get<Q: ?Sized>(&self, key: &Q) -> Option<&V>
 	where
 		K: Borrow<Q>,

--- a/crates/jsonnet-evaluator/src/val.rs
+++ b/crates/jsonnet-evaluator/src/val.rs
@@ -77,7 +77,6 @@
 }
 impl FuncDesc {
 	/// This function is always inlined to make tailstrict work
-	#[inline(always)]
 	pub fn evaluate(&self, call_ctx: Context, args: &ArgsDesc, tailstrict: bool) -> Result<Val> {
 		let ctx = inline_parse_function_call(
 			call_ctx,
@@ -89,7 +88,6 @@
 		evaluate(ctx, &self.body)
 	}
 
-	#[inline(always)]
 	pub fn evaluate_values(&self, call_ctx: Context, args: &[Val]) -> Result<Val> {
 		let ctx = place_args(call_ctx, Some(self.ctx.clone()), &self.params, args)?;
 		evaluate(ctx, &self.body)