From 6db420cedf84b00d8dda7af412e42e1b5e83c45a Mon Sep 17 00:00:00 2001 From: Лач Date: Fri, 26 Jun 2020 12:36:30 +0000 Subject: [PATCH] refactor(evaluator): remove inline variant of argument parsing --- --- a/crates/jsonnet-evaluator/src/function.rs +++ b/crates/jsonnet-evaluator/src/function.rs @@ -17,20 +17,6 @@ args: &ArgsDesc, tailstrict: bool, ) -> Result { - inline_parse_function_call(ctx, body_ctx, params, args, tailstrict) -} - -/// See [parse_function_call](parse_function_call) -/// -/// ## Notes -/// This function is always inlined for tailstrict -pub(crate) fn inline_parse_function_call( - ctx: Context, - body_ctx: Option, - params: &ParamsDesc, - args: &ArgsDesc, - tailstrict: bool, -) -> Result { let mut out = HashMap::new(); let mut positioned_args = vec![None; params.0.len()]; for (id, arg) in args.iter().enumerate() { --- a/crates/jsonnet-evaluator/src/val.rs +++ b/crates/jsonnet-evaluator/src/val.rs @@ -1,6 +1,6 @@ use crate::{ create_error, evaluate, - function::{inline_parse_function_call, place_args}, + function::{parse_function_call, place_args}, Context, Error, ObjValue, Result, }; use jsonnet_parser::{ArgsDesc, LocExpr, ParamsDesc}; @@ -65,7 +65,7 @@ impl FuncDesc { /// This function is always inlined to make tailstrict work pub fn evaluate(&self, call_ctx: Context, args: &ArgsDesc, tailstrict: bool) -> Result { - let ctx = inline_parse_function_call( + let ctx = parse_function_call( call_ctx, Some(self.ctx.clone()), &self.params, -- gitstuff