--- a/crates/jsonnet-evaluator/src/evaluate.rs +++ b/crates/jsonnet-evaluator/src/evaluate.rs @@ -5,9 +5,8 @@ }; use closure::closure; use jsonnet_parser::{ - el, Arg, ArgsDesc, AssertStmt, BinaryOpType, BindSpec, CompSpec, Expr, FieldMember, - ForSpecData, IfSpecData, LiteralType, LocExpr, Member, ObjBody, ParamsDesc, UnaryOpType, - Visibility, + AssertStmt, BinaryOpType, BindSpec, CompSpec, Expr, FieldMember, ForSpecData, IfSpecData, + LiteralType, LocExpr, Member, ObjBody, ParamsDesc, UnaryOpType, Visibility, }; use std::{ collections::{BTreeMap, HashMap}, @@ -203,7 +202,7 @@ }) } -pub fn evaluate_member_list_object(context: Context, members: &Vec) -> Result { +pub fn evaluate_member_list_object(context: Context, members: &[Member]) -> Result { let new_bindings = FutureNewBindings::new(); let future_this = FutureObjValue::new(); let context_creator = context_creator!( --- a/crates/jsonnet-evaluator/src/import.rs +++ b/crates/jsonnet-evaluator/src/import.rs @@ -62,8 +62,9 @@ } } +type ResolutionData = (PathBuf, PathBuf); pub struct CachingImportResolver { - resolution_cache: RefCell>>>, + resolution_cache: RefCell>>>, loading_cache: RefCell>>>, inner: Box, } --- a/crates/jsonnet-evaluator/src/lib.rs +++ b/crates/jsonnet-evaluator/src/lib.rs @@ -200,7 +200,7 @@ self.0 .str_files .borrow_mut() - .insert(path.clone(), file_str.into()); + .insert(path.clone(), file_str); } Ok(self.0.str_files.borrow().get(&path).cloned().unwrap()) }