From 20515005317536f59e21f78b6248672e7b85f629 Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Sat, 20 Feb 2021 19:16:07 +0000
Subject: [PATCH] refactor!: rename with_super to extend_from


---
--- a/crates/jrsonnet-evaluator/src/evaluate.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate.rs
@@ -92,7 +92,7 @@
 		(Val::Str(s), o) => Val::Str(format!("{}{}", s, o.clone().to_string()?).into()),
 		(o, Val::Str(s)) => Val::Str(format!("{}{}", o.clone().to_string()?, s).into()),
 
-		(Val::Obj(v1), Val::Obj(v2)) => Val::Obj(v2.with_super(v1.clone())),
+		(Val::Obj(v1), Val::Obj(v2)) => Val::Obj(v2.extend_from(v1.clone())),
 		(Val::Arr(a), Val::Arr(b)) => {
 			let mut out = Vec::with_capacity(a.len() + b.len());
 			out.extend(a.iter_lazy());
--- a/crates/jrsonnet-evaluator/src/obj.rs
+++ b/crates/jrsonnet-evaluator/src/obj.rs
@@ -62,10 +62,10 @@
 	pub fn new_empty() -> Self {
 		Self::new(None, Rc::new(FxHashMap::default()))
 	}
-	pub fn with_super(&self, super_obj: Self) -> Self {
+	pub fn extend_from(&self, super_obj: Self) -> Self {
 		match &self.0.super_obj {
 			None => Self::new(Some(super_obj), self.0.this_entries.clone()),
-			Some(v) => Self::new(Some(v.with_super(super_obj)), self.0.this_entries.clone()),
+			Some(v) => Self::new(Some(v.extend_from(super_obj)), self.0.this_entries.clone()),
 		}
 	}
 	pub fn with_this(&self, this_obj: Self) -> Self {

-- 
gitstuff