difftreelog
perf(evaluator) remove unnecessary cloning
in: master
4 files changed
crates/jsonnet-evaluator/src/evaluate.rsdiffbeforeafterboth--- a/crates/jsonnet-evaluator/src/evaluate.rs
+++ b/crates/jsonnet-evaluator/src/evaluate.rs
@@ -211,9 +211,9 @@
let future_this = FutureObjValue::new();
let context_creator = context_creator!(
closure!(clone context, clone new_bindings, |this: Option<ObjValue>, super_obj: Option<ObjValue>| {
- Ok(context.clone().extend_unbound(
+ Ok(context.extend_unbound(
new_bindings.clone().unwrap(),
- context.clone().dollar().clone().or_else(||this.clone()),
+ context.dollar().clone().or_else(||this.clone()),
Some(this.unwrap()),
super_obj
)?)
@@ -318,9 +318,9 @@
let new_bindings = FutureNewBindings::new();
let context_creator = context_creator!(
closure!(clone context, clone new_bindings, |this: Option<ObjValue>, super_obj: Option<ObjValue>| {
- Ok(context.clone().extend_unbound(
+ Ok(context.extend_unbound(
new_bindings.clone().unwrap(),
- context.clone().dollar().clone().or_else(||this.clone()),
+ context.dollar().clone().or_else(||this.clone()),
None,
super_obj
)?)
@@ -664,14 +664,14 @@
("std", "filter") => {
assert_eq!(args.len(), 2);
if let (Val::Func(predicate), Val::Arr(arr)) = (
- evaluate(context, &args[0].1)?,
- evaluate(context, &args[1].1)?,
+ evaluate(context.clone(), &args[0].1)?,
+ evaluate(context.clone(), &args[1].1)?,
) {
Val::Arr(
arr.into_iter()
.filter(|e| {
predicate
- .evaluate_values(&context, &[e.clone()])
+ .evaluate_values(context.clone(), &[e.clone()])
.unwrap()
.try_cast_bool("filter predicate")
.unwrap()
@@ -685,7 +685,7 @@
// faster
("std", "join") => {
assert_eq!(args.len(), 2);
- let joiner = evaluate(context, &args[0].1)?.unwrap_if_lazy()?;
+ let joiner = evaluate(context.clone(), &args[0].1)?.unwrap_if_lazy()?;
let items = evaluate(context, &args[1].1)?.unwrap_if_lazy()?;
println!("Before");
let result = match (joiner, items) {
@@ -775,7 +775,9 @@
cond_then,
cond_else,
} => {
- if evaluate(context, &cond.0)?.try_cast_bool("if condition should be boolean")? {
+ if evaluate(context.clone(), &cond.0)?
+ .try_cast_bool("if condition should be boolean")?
+ {
evaluate(context, cond_then)?
} else {
match cond_else {
crates/jsonnet-evaluator/src/function.rsdiffbeforeafterboth1use crate::{create_error, evaluate, lazy_val, resolved_lazy_val, Context, Error, Result};2use closure::closure;3use jsonnet_parser::{ArgsDesc, ParamsDesc};4use std::collections::HashMap;56/// Creates correct [context](Context) for function body evaluation, returning error on invalid call7///8/// * `ctx` used for passed argument expressions execution, and for body execution (if `body_ctx` is not set)9/// * `body_ctx` used for default parameter values execution, and for body execution (if set)10/// * `params` function parameters definition11/// * `args` passed function arguments12/// * `tailstruct` if true - function arguments is eager executed, otherwise - lazy13pub fn parse_function_call(14 ctx: Context,15 body_ctx: Option<Context>,16 params: &ParamsDesc,17 args: &ArgsDesc,18 tailstrict: bool,19) -> Result<Context> {20 inline_parse_function_call(ctx, body_ctx, params, args, tailstrict)21}2223/// See [parse_function_call](parse_function_call)24///25/// ## Notes26/// This function is always inlined for tailstrict27#[inline(always)]28pub(crate) fn inline_parse_function_call(29 ctx: Context,30 body_ctx: Option<Context>,31 params: &ParamsDesc,32 args: &ArgsDesc,33 tailstrict: bool,34) -> Result<Context> {35 let mut out = HashMap::new();36 let mut positioned_args = vec![None; params.0.len()];37 for (id, arg) in args.iter().enumerate() {38 let idx = if let Some(name) = &arg.0 {39 params.iter().position(|p| &p.0 == name).ok_or_else(|| {40 create_error::<()>(Error::UnknownFunctionParameter(name.clone()))41 .err()42 .unwrap()43 })?44 } else {45 id46 };4748 if idx >= params.len() {49 create_error(Error::TooManyArgsFunctionHas(params.len()))?;50 }51 if positioned_args[idx].is_some() {52 create_error(Error::BindingParameterASecondTime(params[idx].0.clone()))?;53 }54 positioned_args[idx] = Some(arg.1.clone());55 }56 // Fill defaults57 for (id, p) in params.iter().enumerate() {58 let (ctx, expr) = if let Some(arg) = &positioned_args[id] {59 (ctx.clone(), arg)60 } else if let Some(default) = &p.1 {61 (62 body_ctx63 .clone()64 .expect("no default context set for call with defined default parameter value"),65 default,66 )67 } else {68 create_error(Error::FunctionParameterNotBoundInCall(p.0.clone()))?;69 unreachable!()70 };71 let val = if tailstrict {72 resolved_lazy_val!(evaluate(ctx, expr)?)73 } else {74 lazy_val!(closure!(clone ctx, clone expr, ||evaluate(ctx.clone(), &expr)))75 };76 out.insert(p.0.clone(), val);77 }7879 Ok(body_ctx.unwrap_or(ctx).extend(out, None, None, None)?)80}crates/jsonnet-evaluator/src/lib.rsdiffbeforeafterboth--- a/crates/jsonnet-evaluator/src/lib.rs
+++ b/crates/jsonnet-evaluator/src/lib.rs
@@ -154,7 +154,7 @@
}
value.1.clone()
};
- let value = evaluate(&self.create_default_context()?, &expr)?;
+ let value = evaluate(self.create_default_context()?, &expr)?;
{
self.0
.files
@@ -205,7 +205,7 @@
}
pub fn evaluate_raw(&self, code: LocExpr) -> Result<Val> {
- self.run_in_state(|| evaluate(&self.create_default_context()?, &code))
+ self.run_in_state(|| evaluate(self.create_default_context()?, &code))
}
pub fn add_global(&self, name: String, value: Val) {
crates/jsonnet-evaluator/src/val.rsdiffbeforeafterboth--- a/crates/jsonnet-evaluator/src/val.rs
+++ b/crates/jsonnet-evaluator/src/val.rs
@@ -179,7 +179,7 @@
.create_default_context()?
.with_var("__tmp__to_json__".to_owned(), self)?;
if let Val::Str(result) = evaluate(
- &ctx,
+ ctx,
&el!(Expr::Apply(
el!(Expr::Index(
el!(Expr::Var("std".to_owned())),