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!(

62	}62	}
63}63}
6464
65type ResolutionData = (PathBuf, PathBuf);
65pub struct CachingImportResolver {66pub struct CachingImportResolver {
66	resolution_cache: RefCell<HashMap<(PathBuf, PathBuf), Result<Rc<PathBuf>>>>,67	resolution_cache: RefCell<HashMap<ResolutionData, Result<Rc<PathBuf>>>>,
67	loading_cache: RefCell<HashMap<PathBuf, Result<Rc<str>>>>,68	loading_cache: RefCell<HashMap<PathBuf, Result<Rc<str>>>>,
68	inner: Box<dyn ImportResolver>,69	inner: Box<dyn ImportResolver>,
69}70}

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