git.delta.rocks / jrsonnet / refs/commits / 7c0b0974dac4

--- a/crates/jrsonnet-evaluator/src/evaluate/mod.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/mod.rs
@@ -4,8 +4,8 @@
 	evaluate::operator::{evaluate_add_op, evaluate_binary_op_special, evaluate_unary_op},
 	gc::TraceBox,
 	push_frame, throw, with_state, ArrValue, Bindable, Context, ContextCreator, FuncDesc, FuncVal,
-	FutureWrapper, GcHashMap, LazyBinding, LazyVal, LazyValValue, ObjValue,
-	ObjValueBuilder, ObjectAssertion, Result, Val,
+	FutureWrapper, GcHashMap, LazyBinding, LazyVal, LazyValValue, ObjValue, ObjValueBuilder,
+	ObjectAssertion, Result, Val,
 };
 use gcmodule::{Cc, Trace};
 use jrsonnet_interner::IStr;
@@ -103,17 +103,15 @@
 		}
 		impl Bindable for BindableMethod {
 			fn bind(&self, this: Option<ObjValue>, super_obj: Option<ObjValue>) -> Result<LazyVal> {
-				Ok(LazyVal::new(TraceBox(Box::new(
-					BindableMethodLazyVal {
-						this,
-						super_obj,
+				Ok(LazyVal::new(TraceBox(Box::new(BindableMethodLazyVal {
+					this,
+					super_obj,
 
-						context_creator: self.context_creator.clone(),
-						name: self.name.clone(),
-						params: self.params.clone(),
-						value: self.value.clone(),
-					},
-				))))
+					context_creator: self.context_creator.clone(),
+					name: self.name.clone(),
+					params: self.params.clone(),
+					value: self.value.clone(),
+				}))))
 			}
 		}
 
@@ -154,16 +152,14 @@
 		}
 		impl Bindable for BindableNamed {
 			fn bind(&self, this: Option<ObjValue>, super_obj: Option<ObjValue>) -> Result<LazyVal> {
-				Ok(LazyVal::new(TraceBox(Box::new(
-					BindableNamedLazyVal {
-						this,
-						super_obj,
+				Ok(LazyVal::new(TraceBox(Box::new(BindableNamedLazyVal {
+					this,
+					super_obj,
 
-						context_creator: self.context_creator.clone(),
-						name: self.name.clone(),
-						value: self.value.clone(),
-					},
-				))))
+					context_creator: self.context_creator.clone(),
+					name: self.name.clone(),
+					value: self.value.clone(),
+				}))))
 			}
 		}
 

--- a/crates/jrsonnet-evaluator/src/function.rs
+++ b/crates/jrsonnet-evaluator/src/function.rs
@@ -1,4 +1,7 @@
-use crate::{Context, FutureWrapper, GcHashMap, LazyVal, LazyValValue, Result, Val, error::Error::*, evaluate, evaluate_named, gc::TraceBox, throw};
+use crate::{
+	error::Error::*, evaluate, evaluate_named, gc::TraceBox, throw, Context, FutureWrapper,
+	GcHashMap, LazyVal, LazyValValue, Result, Val,
+};
 use gcmodule::Trace;
 use jrsonnet_interner::IStr;
 use jrsonnet_parser::{ArgsDesc, LocExpr, ParamsDesc};
@@ -187,10 +190,7 @@
 						)
 					}
 				}
-				LazyVal::new(TraceBox(Box::new(EvaluateLazyVal {
-					body_ctx,
-					default,
-				})))
+				LazyVal::new(TraceBox(Box::new(EvaluateLazyVal { body_ctx, default })))
 			}
 		} else {
 			throw!(FunctionParameterNotBoundInCall(p.0.clone()));

1use std::{fmt::Display, rc::Rc};1use std::{fmt::Display, rc::Rc};
22
3use crate::{Val, error::{Error, LocError, Result}, push_description_frame};3use crate::{
4	error::{Error, LocError, Result},
5	push_description_frame, Val,
6};
4use gcmodule::Trace;7use gcmodule::Trace;
5use jrsonnet_types::{ComplexValType, ValType};8use jrsonnet_types::{ComplexValType, ValType};