git.delta.rocks / jrsonnet / refs/commits / 8766467a8ebe

--- a/crates/jrsonnet-evaluator/src/builtin/mod.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/mod.rs
@@ -466,8 +466,7 @@
 		0, name: ty!(string) => Val::Str;
 		1, rest: ty!(any);
 	], {
-
-		Ok(DebugGcTraceValue::new(name, rest))
+		Ok(DebugGcTraceValue::create(name, rest))
 	})
 }
 

--- a/crates/jrsonnet-evaluator/src/evaluate.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate.rs
@@ -127,8 +127,8 @@
 		impl Bindable for BindableMethod {
 			fn bind(&self, this: Option<ObjValue>, super_obj: Option<ObjValue>) -> Result<LazyVal> {
 				Ok(LazyVal::new(Box::new(BindableMethodLazyVal {
-					this: this.clone(),
-					super_obj: super_obj.clone(),
+					this,
+					super_obj,
 
 					context_creator: self.context_creator.clone(),
 					name: self.name.clone(),
@@ -586,7 +586,7 @@
 								add: false,
 								visibility: Visibility::Normal,
 								invoke: LazyBinding::Bindable(Gc::new(Box::new(ObjCompBinding {
-									context: ctx.clone(),
+									context: ctx,
 									value: obj.value.clone(),
 								}))),
 								location: obj.value.1.clone(),

1use crate::{1use crate::{
2	error::{Error::*, LocError, Result},2	error::{Error::*, LocError, Result},
3	throw, Context, LazyBinding, LazyVal, ObjMember, ObjValue, Val,3	throw, LazyBinding, LazyVal, ObjMember, ObjValue, Val,
4};4};
5use gc::Gc;5use gc::Gc;
6use jrsonnet_parser::Visibility;6use jrsonnet_parser::Visibility;
42				Self::Object(out)42				Self::Object(out)
43			}43			}
44			Val::Func(_) => throw!(RuntimeError("tried to manifest function".into())),44			Val::Func(_) => throw!(RuntimeError("tried to manifest function".into())),
45			Val::DebugGcTraceValue(v) => Value::try_from(&*v.value as &Val)?,45			Val::DebugGcTraceValue(v) => Self::try_from(&*v.value as &Val)?,
46		})46		})
47	}47	}
48}48}

--- a/crates/jrsonnet-evaluator/src/obj.rs
+++ b/crates/jrsonnet-evaluator/src/obj.rs
@@ -1,7 +1,7 @@
-use crate::{evaluate_add_op, evaluate_assert, Context, LazyBinding, Result, Val};
+use crate::{evaluate_add_op, LazyBinding, Result, Val};
 use gc::{Finalize, Gc, GcCell, Trace};
 use jrsonnet_interner::IStr;
-use jrsonnet_parser::{AssertStmt, ExprLocation, Visibility};
+use jrsonnet_parser::{ExprLocation, Visibility};
 use rustc_hash::{FxHashMap, FxHashSet};
 use std::hash::{Hash, Hasher};
 use std::{fmt::Debug, hash::BuildHasherDefault};

--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -49,7 +49,7 @@
 	pub fn evaluate(&self) -> Result<Val> {
 		match &*self.0.borrow() {
 			LazyValInternals::Computed(v) => return Ok(v.clone()),
-			LazyValInternals::Errored(e) => return Err(e.clone().into()),
+			LazyValInternals::Errored(e) => return Err(e.clone()),
 			LazyValInternals::Pending => return Err(RecursiveLazyValueEvaluation.into()),
 			_ => (),
 		};
@@ -400,7 +400,7 @@
 impl Clone for DebugGcTraceValue {
 	fn clone(&self) -> Self {
 		self.print("Cloned");
-		let value = DebugGcTraceValue {
+		let value = Self {
 			name: self.name.clone(),
 			value: self.value.clone(),
 		};
@@ -409,7 +409,7 @@
 	}
 }
 impl DebugGcTraceValue {
-	pub fn new(name: IStr, value: Val) -> Val {
+	pub fn create(name: IStr, value: Val) -> Val {
 		let value = Self {
 			name,
 			value: Box::new(value),