git.delta.rocks / jrsonnet / refs/commits / 0ba2642a3a69

--- 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<Member>) -> Result<ObjValue> {
+pub fn evaluate_member_list_object(context: Context, members: &[Member]) -> Result<ObjValue> {
 	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<HashMap<(PathBuf, PathBuf), Result<Rc<PathBuf>>>>,
+	resolution_cache: RefCell<HashMap<ResolutionData, Result<Rc<PathBuf>>>>,
 	loading_cache: RefCell<HashMap<PathBuf, Result<Rc<str>>>>,
 	inner: Box<dyn ImportResolver>,
 }

200			self.0200			self.0
201				.str_files201				.str_files
202				.borrow_mut()202				.borrow_mut()
203				.insert(path.clone(), file_str.into());203				.insert(path.clone(), file_str);
204		}204		}
205		Ok(self.0.str_files.borrow().get(&path).cloned().unwrap())205		Ok(self.0.str_files.borrow().get(&path).cloned().unwrap())
206	}206	}