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
--- a/crates/jrsonnet-evaluator/src/builtin/mod.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/mod.rs
@@ -212,16 +212,12 @@
 		"extVar" => parse_args!(context, "std.extVar", args, 1, [
 			0, x: [Val::Str]!!Val::Str, vec![ValType::Str];
 		], {
-			Ok(with_state(|s| s.settings().ext_vars.get(&x).cloned()).ok_or_else(
-				|| UndefinedExternalVariable(x),
-			)?)
+			Ok(with_state(|s| s.settings().ext_vars.get(&x).cloned()).ok_or(UndefinedExternalVariable(x))?)
 		})?,
 		"native" => parse_args!(context, "std.native", args, 1, [
 			0, x: [Val::Str]!!Val::Str, vec![ValType::Str];
 		], {
-			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(
-				|| UndefinedExternalFunction(x),
-			)?)
+			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))?)
 		})?,
 		"filter" => parse_args!(context, "std.filter", args, 2, [
 			0, func: [Val::Func]!!Val::Func, vec![ValType::Func];
modifiedcrates/jrsonnet-evaluator/src/ctx.rsdiffbeforeafterboth
63 .bindings63 .bindings
64 .get(&name)64 .get(&name)
65 .cloned()65 .cloned()
66 .ok_or_else(|| VariableIsNotDefined(name))?)66 .ok_or(VariableIsNotDefined(name))?)
67 }67 }
68 pub fn into_future(self, ctx: FutureContext) -> Self {68 pub fn into_future(self, ctx: FutureContext) -> Self {
69 {69 {