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

5};5};
6use closure::closure;6use closure::closure;
7use jsonnet_parser::{7use jsonnet_parser::{
8	el, Arg, ArgsDesc, AssertStmt, BinaryOpType, BindSpec, CompSpec, Expr, FieldMember,8	AssertStmt, BinaryOpType, BindSpec, CompSpec, Expr, FieldMember, ForSpecData, IfSpecData,
9	ForSpecData, IfSpecData, LiteralType, LocExpr, Member, ObjBody, ParamsDesc, UnaryOpType,9	LiteralType, LocExpr, Member, ObjBody, ParamsDesc, UnaryOpType, Visibility,
10	Visibility,
11};10};
203	})202	})
204}203}
205204
206pub fn evaluate_member_list_object(context: Context, members: &Vec<Member>) -> Result<ObjValue> {205pub fn evaluate_member_list_object(context: Context, members: &[Member]) -> Result<ObjValue> {
207	let new_bindings = FutureNewBindings::new();206	let new_bindings = FutureNewBindings::new();
208	let future_this = FutureObjValue::new();207	let future_this = FutureObjValue::new();
209	let context_creator = context_creator!(208	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>,
 }

--- 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())
 	}