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

difftreelog

refactor drop LayeredHashMap key generic

Yaroslav Bolyukin2021-01-12parent: #970fbe7.patch.diff
in: master

2 files changed

modifiedcrates/jrsonnet-evaluator/src/ctx.rsdiffbeforeafterboth
before · crates/jrsonnet-evaluator/src/ctx.rs
1use crate::{2	error::Error::*, future_wrapper, map::LayeredHashMap, rc_fn_helper, resolved_lazy_val,3	LazyBinding, LazyVal, ObjValue, Result, Val,4};5use jrsonnet_interner::IStr;6use rustc_hash::FxHashMap;7use std::hash::BuildHasherDefault;8use std::{cell::RefCell, collections::HashMap, fmt::Debug, rc::Rc};910rc_fn_helper!(11	ContextCreator,12	context_creator,13	dyn Fn(Option<ObjValue>, Option<ObjValue>) -> Result<Context>14);1516future_wrapper!(Context, FutureContext);1718struct ContextInternals {19	dollar: Option<ObjValue>,20	this: Option<ObjValue>,21	super_obj: Option<ObjValue>,22	bindings: LayeredHashMap<IStr, LazyVal>,23}24impl Debug for ContextInternals {25	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {26		f.debug_struct("Context")27			.field("this", &self.this.as_ref().map(|e| Rc::as_ptr(&e.0)))28			.field("bindings", &self.bindings)29			.finish()30	}31}3233#[derive(Debug, Clone)]34pub struct Context(Rc<ContextInternals>);35impl Context {36	pub fn new_future() -> FutureContext {37		FutureContext(Rc::new(RefCell::new(None)))38	}3940	pub fn dollar(&self) -> &Option<ObjValue> {41		&self.0.dollar42	}4344	pub fn this(&self) -> &Option<ObjValue> {45		&self.0.this46	}4748	pub fn super_obj(&self) -> &Option<ObjValue> {49		&self.0.super_obj50	}5152	pub fn new() -> Self {53		Self(Rc::new(ContextInternals {54			dollar: None,55			this: None,56			super_obj: None,57			bindings: LayeredHashMap::default(),58		}))59	}6061	pub fn binding(&self, name: IStr) -> Result<LazyVal> {62		Ok(self63			.064			.bindings65			.get(&name)66			.cloned()67			.ok_or(VariableIsNotDefined(name))?)68	}69	pub fn into_future(self, ctx: FutureContext) -> Self {70		{71			ctx.0.borrow_mut().replace(self);72		}73		ctx.unwrap()74	}7576	pub fn with_var(self, name: IStr, value: Val) -> Self {77		let mut new_bindings =78			FxHashMap::with_capacity_and_hasher(1, BuildHasherDefault::default());79		new_bindings.insert(name, resolved_lazy_val!(value));80		self.extend(new_bindings, None, None, None)81	}8283	pub fn extend(84		self,85		new_bindings: FxHashMap<IStr, LazyVal>,86		new_dollar: Option<ObjValue>,87		new_this: Option<ObjValue>,88		new_super_obj: Option<ObjValue>,89	) -> Self {90		match Rc::try_unwrap(self.0) {91			Ok(mut ctx) => {92				// Extended context aren't used by anything else, we can freely mutate it without cloning93				if let Some(dollar) = new_dollar {94					ctx.dollar = Some(dollar);95				}96				if let Some(this) = new_this {97					ctx.this = Some(this);98				}99				if let Some(super_obj) = new_super_obj {100					ctx.super_obj = Some(super_obj);101				}102				if !new_bindings.is_empty() {103					ctx.bindings = ctx.bindings.extend(new_bindings);104				}105				Self(Rc::new(ctx))106			}107			Err(ctx) => {108				let dollar = new_dollar.or_else(|| ctx.dollar.clone());109				let this = new_this.or_else(|| ctx.this.clone());110				let super_obj = new_super_obj.or_else(|| ctx.super_obj.clone());111				let bindings = if new_bindings.is_empty() {112					ctx.bindings.clone()113				} else {114					ctx.bindings.clone().extend(new_bindings)115				};116				Self(Rc::new(ContextInternals {117					dollar,118					this,119					super_obj,120					bindings,121				}))122			}123		}124	}125	pub fn extend_unbound(126		self,127		new_bindings: HashMap<IStr, LazyBinding>,128		new_dollar: Option<ObjValue>,129		new_this: Option<ObjValue>,130		new_super_obj: Option<ObjValue>,131	) -> Result<Self> {132		let this = new_this.or_else(|| self.0.this.clone());133		let super_obj = new_super_obj.or_else(|| self.0.super_obj.clone());134		let mut new =135			FxHashMap::with_capacity_and_hasher(new_bindings.len(), BuildHasherDefault::default());136		for (k, v) in new_bindings.into_iter() {137			new.insert(k, v.evaluate(this.clone(), super_obj.clone())?);138		}139		Ok(self.extend(new, new_dollar, this, super_obj))140	}141	#[cfg(feature = "unstable")]142	pub fn into_weak(self) -> WeakContext {143		WeakContext(Rc::downgrade(&self.0))144	}145}146147impl Default for Context {148	fn default() -> Self {149		Self::new()150	}151}152153impl PartialEq for Context {154	fn eq(&self, other: &Self) -> bool {155		Rc::ptr_eq(&self.0, &other.0)156	}157}158159#[cfg(feature = "unstable")]160#[derive(Debug, Clone)]161pub struct WeakContext(std::rc::Weak<ContextInternals>);162#[cfg(feature = "unstable")]163impl WeakContext {164	pub fn upgrade(&self) -> Context {165		Context(self.0.upgrade().expect("context is removed"))166	}167}168#[cfg(feature = "unstable")]169impl PartialEq for WeakContext {170	fn eq(&self, other: &Self) -> bool {171		self.0.ptr_eq(&other.0)172	}173}
modifiedcrates/jrsonnet-evaluator/src/map.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/map.rs
+++ b/crates/jrsonnet-evaluator/src/map.rs
@@ -1,17 +1,18 @@
+use jrsonnet_interner::IStr;
 use rustc_hash::FxHashMap;
-use std::{borrow::Borrow, hash::Hash, rc::Rc};
+use std::rc::Rc;
 
 #[derive(Default, Debug)]
-struct LayeredHashMapInternals<K: Hash, V> {
-	parent: Option<LayeredHashMap<K, V>>,
-	current: FxHashMap<K, V>,
+struct LayeredHashMapInternals<V> {
+	parent: Option<LayeredHashMap<V>>,
+	current: FxHashMap<IStr, V>,
 }
 
 #[derive(Debug)]
-pub struct LayeredHashMap<K: Hash, V>(Rc<LayeredHashMapInternals<K, V>>);
+pub struct LayeredHashMap<V>(Rc<LayeredHashMapInternals<V>>);
 
-impl<K: Hash + Eq, V> LayeredHashMap<K, V> {
-	pub fn extend(self, new_layer: FxHashMap<K, V>) -> Self {
+impl<V> LayeredHashMap<V> {
+	pub fn extend(self, new_layer: FxHashMap<IStr, V>) -> Self {
 		match Rc::try_unwrap(self.0) {
 			Ok(mut map) => {
 				map.current.extend(new_layer);
@@ -24,11 +25,7 @@
 		}
 	}
 
-	pub fn get<Q: ?Sized>(&self, key: &Q) -> Option<&V>
-	where
-		K: Borrow<Q>,
-		Q: Hash + Eq,
-	{
+	pub fn get(&self, key: &IStr) -> Option<&V> {
 		(self.0)
 			.current
 			.get(key)
@@ -36,13 +33,13 @@
 	}
 }
 
-impl<K: Hash, V> Clone for LayeredHashMap<K, V> {
+impl<V> Clone for LayeredHashMap<V> {
 	fn clone(&self) -> Self {
 		Self(self.0.clone())
 	}
 }
 
-impl<K: Hash + Eq, V> Default for LayeredHashMap<K, V> {
+impl<V> Default for LayeredHashMap<V> {
 	fn default() -> Self {
 		Self(Rc::new(LayeredHashMapInternals {
 			parent: None,