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

difftreelog

style fixes for unnecessary-lazy-evaluations lint

Yaroslav Bolyukin2021-01-06parent: #9367ffe.patch.diff
in: master

2 files changed

modifiedcrates/jrsonnet-evaluator/src/builtin/mod.rsdiffbeforeafterboth
212 "extVar" => parse_args!(context, "std.extVar", args, 1, [212 "extVar" => parse_args!(context, "std.extVar", args, 1, [
213 0, x: [Val::Str]!!Val::Str, vec![ValType::Str];213 0, x: [Val::Str]!!Val::Str, vec![ValType::Str];
214 ], {214 ], {
215 Ok(with_state(|s| s.settings().ext_vars.get(&x).cloned()).ok_or_else(215 Ok(with_state(|s| s.settings().ext_vars.get(&x).cloned()).ok_or(UndefinedExternalVariable(x))?)
216 || UndefinedExternalVariable(x),
217 )?)
218 })?,216 })?,
219 "native" => parse_args!(context, "std.native", args, 1, [217 "native" => parse_args!(context, "std.native", args, 1, [
220 0, x: [Val::Str]!!Val::Str, vec![ValType::Str];218 0, x: [Val::Str]!!Val::Str, vec![ValType::Str];
221 ], {219 ], {
222 Ok(with_state(|s| s.settings().ext_natives.get(&x).cloned()).map(|v| Val::Func(Rc::new(FuncVal::NativeExt(x.clone(), v)))).ok_or_else(220 Ok(with_state(|s| s.settings().ext_natives.get(&x).cloned()).map(|v| Val::Func(Rc::new(FuncVal::NativeExt(x.clone(), v)))).ok_or(UndefinedExternalFunction(x))?)
223 || UndefinedExternalFunction(x),
224 )?)
225 })?,221 })?,
226 "filter" => parse_args!(context, "std.filter", args, 2, [222 "filter" => parse_args!(context, "std.filter", args, 2, [
modifiedcrates/jrsonnet-evaluator/src/ctx.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/ctx.rs
+++ b/crates/jrsonnet-evaluator/src/ctx.rs
@@ -63,7 +63,7 @@
 			.bindings
 			.get(&name)
 			.cloned()
-			.ok_or_else(|| VariableIsNotDefined(name))?)
+			.ok_or(VariableIsNotDefined(name))?)
 	}
 	pub fn into_future(self, ctx: FutureContext) -> Self {
 		{