git.delta.rocks / jrsonnet / refs/commits / ad8b59dcdf89

--- a/crates/jsonnet-evaluator/src/evaluate.rs
+++ b/crates/jsonnet-evaluator/src/evaluate.rs
@@ -152,7 +152,7 @@
 					context.clone().extend(
 						new_bindings.clone().unwrap(),
 						context.clone().dollar().clone().or_else(||this.clone()),
-						Some(this.clone().unwrap()),
+						Some(this.unwrap()),
 						super_obj
 					)
 				})
@@ -347,7 +347,7 @@
 					}
 					("std", "codepoint") => {
 						assert_eq!(args.len(), 1);
-						if let Val::Str(s) = evaluate(context.clone(), &args[0].1) {
+						if let Val::Str(s) = evaluate(context, &args[0].1) {
 							assert!(
 								s.chars().count() == 1,
 								"std.codepoint should receive single char string"

--- a/crates/jsonnet-evaluator/src/obj.rs
+++ b/crates/jsonnet-evaluator/src/obj.rs
@@ -79,10 +79,7 @@
 				self.0.super_obj.clone(),
 			)),
 			(Some(k), Some(s)) => {
-				let our = k.invoke.0(
-					Some(real_this.clone()),
-					self.0.super_obj.clone(),
-				);
+				let our = k.invoke.0(Some(real_this.clone()), self.0.super_obj.clone());
 				if k.add {
 					s.get_raw(key, real_this).map_or(Some(our.clone()), |v| {
 						Some(evaluate_binary_op(&v, BinaryOpType::Add, &our))

--- a/crates/jsonnet-parser/src/expr.rs
+++ b/crates/jsonnet-parser/src/expr.rs
@@ -83,11 +83,7 @@
 pub struct ParamsDesc(pub Vec<Param>);
 impl ParamsDesc {
 	pub fn with_defaults(&self) -> Vec<Param> {
-		self.0
-			.iter()
-			.filter(|e| e.1.is_some())
-			.map(|e| e.clone())
-			.collect()
+		self.0.iter().filter(|e| e.1.is_some()).cloned().collect()
 	}
 }
 

2323
24		/// For comma-delimited elements24		/// For comma-delimited elements
25		rule comma() = quiet!{_ "," _} / expected!("<comma>")25		rule comma() = quiet!{_ "," _} / expected!("<comma>")
26		rule alpha() -> char = c:$(['_' | 'a'..='z' | 'A'..='Z']) {c.chars().nth(0).unwrap()}26		rule alpha() -> char = c:$(['_' | 'a'..='z' | 'A'..='Z']) {c.chars().next().unwrap()}
27		rule digit() -> char = d:$(['0'..='9']) {d.chars().nth(0).unwrap()}27		rule digit() -> char = d:$(['0'..='9']) {d.chars().next().unwrap()}
28		rule end_of_ident() = !['0'..='9' | '_' | 'a'..='z' | 'A'..='Z']28		rule end_of_ident() = !['0'..='9' | '_' | 'a'..='z' | 'A'..='Z']
29		/// Sequence of digits29		/// Sequence of digits
30		rule uint() -> u32 = a:$(digit()+) { a.parse().unwrap() }30		rule uint() -> u32 = a:$(digit()+) { a.parse().unwrap() }
106					value,106					value,
107					post_locals,107					post_locals,
108					first,108					first,
109					rest: rest.unwrap_or(Vec::new()),109					rest: rest.unwrap_or_default(),
110				}110				}
111			}111			}
112			/ members:(member() ** comma()) comma()? {expr::ObjBody::MemberList(members)}112			/ members:(member() ** comma()) comma()? {expr::ObjBody::MemberList(members)}
119		pub rule parened_expr() -> Expr = "(" e:boxed_expr() ")" {Expr::Parened(e)}119		pub rule parened_expr() -> Expr = "(" e:boxed_expr() ")" {Expr::Parened(e)}
120		pub rule obj_expr() -> Expr = "{" _ body:objinside() _ "}" {Expr::Obj(body)}120		pub rule obj_expr() -> Expr = "{" _ body:objinside() _ "}" {Expr::Obj(body)}
121		pub rule array_expr() -> Expr = "[" _ elems:(expr() ** comma()) _ comma()? "]" {Expr::Arr(elems)}121		pub rule array_expr() -> Expr = "[" _ elems:(expr() ** comma()) _ comma()? "]" {Expr::Arr(elems)}
122		pub rule array_comp_expr() -> Expr = "[" _ expr:boxed_expr() _ comma()? _ forspec:forspec() _ others:(others: compspec() _ {others})? "]" {Expr::ArrComp(expr, forspec, others.unwrap_or(vec![]))}122		pub rule array_comp_expr() -> Expr = "[" _ expr:boxed_expr() _ comma()? _ forspec:forspec() _ others:(others: compspec() _ {others})? "]" {Expr::ArrComp(expr, forspec, others.unwrap_or_default())}
123		pub rule index_expr() -> Expr123		pub rule index_expr() -> Expr
124			= val:boxed_expr() "." idx:id() {Expr::Index(val, Box::new(Expr::Str(idx)))}124			= val:boxed_expr() "." idx:id() {Expr::Index(val, Box::new(Expr::Str(idx)))}
125			/ val:boxed_expr() "[" key:boxed_expr() "]" {Expr::Index(val, key)}125			/ val:boxed_expr() "[" key:boxed_expr() "]" {Expr::Index(val, key)}