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]

--- a/crates/jsonnet-evaluator/src/evaluate.rs
+++ b/crates/jsonnet-evaluator/src/evaluate.rs
@@ -168,7 +168,6 @@
 future_wrapper!(HashMap<String, LazyBinding>, FutureNewBindings);
 future_wrapper!(ObjValue, FutureObjValue);
 
-#[inline(always)]
 pub fn evaluate_comp<T>(
 	context: Context,
 	value: &impl Fn(Context) -> Result<T>,
@@ -370,7 +369,6 @@
 	})
 }
 
-#[inline(always)]
 pub fn evaluate(context: Context, expr: &LocExpr) -> Result<Val> {
 	use Expr::*;
 	let locexpr = expr.clone();
@@ -731,8 +729,7 @@
 					(ns, name) => panic!("Intristic not found: {}.{}", ns, name),
 				},
 				Val::Func(f) => {
-					let body = #[inline(always)]
-					|| f.evaluate(context, args, *tailstrict);
+					let body = || f.evaluate(context, args, *tailstrict);
 					if *tailstrict {
 						body()?
 					} else {

--- 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>,

2#![feature(type_alias_impl_trait)]2#![feature(type_alias_impl_trait)]
3#![feature(debug_non_exhaustive)]3#![feature(debug_non_exhaustive)]
4#![allow(macro_expanded_macro_exports_accessed_by_absolute_paths)]4#![allow(macro_expanded_macro_exports_accessed_by_absolute_paths)]
5#![feature(stmt_expr_attributes)]
6mod ctx;5mod ctx;
7mod dynamic;6mod dynamic;
8mod error;7mod error;
81	/// Global state is fine there80	/// Global state is fine there
82	pub(crate) static EVAL_STATE: RefCell<Option<EvaluationState>> = RefCell::new(None)81	pub(crate) static EVAL_STATE: RefCell<Option<EvaluationState>> = RefCell::new(None)
83}82}
84#[inline(always)]
85pub(crate) fn with_state<T>(f: impl FnOnce(&EvaluationState) -> T) -> T {83pub(crate) fn with_state<T>(f: impl FnOnce(&EvaluationState) -> T) -> T {
86	EVAL_STATE.with(84	EVAL_STATE.with(
87		#[inline(always)]
88		|s| f(s.borrow().as_ref().unwrap()),85		|s| f(s.borrow().as_ref().unwrap()),
89	)86	)
90}87}
91pub(crate) fn create_error<T>(err: Error) -> Result<T> {88pub(crate) fn create_error<T>(err: Error) -> Result<T> {
92	with_state(|s| s.error(err))89	with_state(|s| s.error(err))
93}90}
94#[inline(always)]
95pub(crate) fn push<T>(e: LocExpr, comment: String, f: impl FnOnce() -> Result<T>) -> Result<T> {91pub(crate) fn push<T>(e: LocExpr, comment: String, f: impl FnOnce() -> Result<T>) -> Result<T> {
96	with_state(|s| s.push(e, comment, f))92	with_state(|s| s.push(e, comment, f))
97}93}
251		Context::new().extend_unbound(new_bindings, None, None, None)247		Context::new().extend_unbound(new_bindings, None, None, None)
252	}248	}
253249
254	#[inline(always)]
255	pub fn push<T>(&self, e: LocExpr, comment: String, f: impl FnOnce() -> Result<T>) -> Result<T> {250	pub fn push<T>(&self, e: LocExpr, comment: String, f: impl FnOnce() -> Result<T>) -> Result<T> {
256		{251		{
257			let mut stack = self.0.stack.borrow_mut();252			let mut stack = self.0.stack.borrow_mut();
287		Err(LocError(err, self.stack_trace()))282		Err(LocError(err, self.stack_trace()))
288	}283	}
289284
290	#[inline(always)]
291	fn run_in_state<T>(&self, f: impl FnOnce() -> T) -> T {285	fn run_in_state<T>(&self, f: impl FnOnce() -> T) -> T {
292		EVAL_STATE.with(|v| {286		EVAL_STATE.with(|v| {
293			let has_state = v.borrow().is_some();287			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)