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

difftreelog

fix clippy warnings

Yaroslav Bolyukin2021-05-23parent: #51b072d.patch.diff
in: master

5 files changed

modifiedcrates/jrsonnet-evaluator/src/evaluate.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/evaluate.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate.rs
@@ -147,8 +147,8 @@
 	Ok(match (a, op, b) {
 		(a, BinaryOpType::Add, b) => evaluate_add_op(a, b)?,
 
-		(a, BinaryOpType::Eq, b) => Val::Bool(equals(&a, &b)?),
-		(a, BinaryOpType::Neq, b) => Val::Bool(!equals(&a, &b)?),
+		(a, BinaryOpType::Eq, b) => Val::Bool(equals(a, b)?),
+		(a, BinaryOpType::Neq, b) => Val::Bool(!equals(a, b)?),
 
 		(Val::Str(v1), BinaryOpType::Mul, Val::Num(v2)) => Val::Str(v1.repeat(*v2 as usize).into()),
 
@@ -578,7 +578,7 @@
 		}
 		Intrinsic(name) => Val::Func(Rc::new(FuncVal::Intrinsic(name.clone()))),
 		AssertExpr(assert, returned) => {
-			evaluate_assert(context.clone(), &assert)?;
+			evaluate_assert(context.clone(), assert)?;
 			evaluate(context, returned)?
 		}
 		ErrorStmt(e) => push(
modifiedcrates/jrsonnet-evaluator/src/integrations/serde.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/integrations/serde.rs
+++ b/crates/jrsonnet-evaluator/src/integrations/serde.rs
@@ -1,7 +1,6 @@
 use crate::{
-	Context,
 	error::{Error::*, LocError, Result},
-	throw, LazyBinding, LazyVal, ObjMember, ObjValue, Val,
+	throw, Context, LazyBinding, LazyVal, ObjMember, ObjValue, Val,
 };
 use jrsonnet_parser::Visibility;
 use rustc_hash::FxHasher;
@@ -77,7 +76,12 @@
 						},
 					);
 				}
-				Self::Obj(ObjValue::new(Context::new(), None, Rc::new(entries), Rc::new(Vec::new())))
+				Self::Obj(ObjValue::new(
+					Context::new(),
+					None,
+					Rc::new(entries),
+					Rc::new(Vec::new()),
+				))
 			}
 		}
 	}
modifiedcrates/jrsonnet-evaluator/src/lib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/lib.rs
+++ b/crates/jrsonnet-evaluator/src/lib.rs
@@ -1,6 +1,9 @@
 #![cfg_attr(feature = "unstable", feature(stmt_expr_attributes))]
 #![warn(clippy::all, clippy::nursery)]
-#![allow(macro_expanded_macro_exports_accessed_by_absolute_paths, clippy::ptr_arg)]
+#![allow(
+	macro_expanded_macro_exports_accessed_by_absolute_paths,
+	clippy::ptr_arg
+)]
 
 mod builtin;
 mod ctx;
@@ -390,7 +393,7 @@
 				loc_data: true,
 			},
 		)
-    	.map_err(|e| ImportSyntaxError {
+		.map_err(|e| ImportSyntaxError {
 			path: source.clone(),
 			source_code: code.clone(),
 			error: Box::new(e),
@@ -998,9 +1001,10 @@
 		let state = EvaluationState::default();
 		state.with_stdlib();
 
-		let error = state.evaluate_snippet_raw(
-			Rc::new(PathBuf::from("issue40.jsonnet")),
-			r#"
+		let error = state
+			.evaluate_snippet_raw(
+				Rc::new(PathBuf::from("issue40.jsonnet")),
+				r#"
 				local conf = {
 					n: ""
 				};
@@ -1010,8 +1014,10 @@
 				};
 
 				std.manifestJsonEx(result, "")
-			"#.into(),
-		).unwrap_err();
+			"#
+				.into(),
+			)
+			.unwrap_err();
 		assert_eq!(error.error().to_string(), "assert failed: is number");
 	}
 }
modifiedcrates/jrsonnet-evaluator/src/obj.rsdiffbeforeafterboth
before · crates/jrsonnet-evaluator/src/obj.rs
1use crate::{Context, evaluate_add_op, evaluate_assert, LazyBinding, Result, Val};2use jrsonnet_interner::IStr;3use jrsonnet_parser::{ExprLocation, LocExpr, Visibility, AssertStmt};4use rustc_hash::{FxHashMap, FxHashSet};5use std::hash::{Hash, Hasher};6use std::{cell::RefCell, fmt::Debug, hash::BuildHasherDefault, rc::Rc};78#[derive(Debug)]9pub struct ObjMember {10	pub add: bool,11	pub visibility: Visibility,12	pub invoke: LazyBinding,13	pub location: Option<ExprLocation>,14}1516// Field => This17type CacheKey = (IStr, ObjValue);18#[derive(Debug)]19pub struct ObjValueInternals {20	context: Context,21	super_obj: Option<ObjValue>,22	assertions: Rc<Vec<AssertStmt>>,23	assertions_ran: RefCell<FxHashSet<ObjValue>>,24	this_obj: Option<ObjValue>,25	this_entries: Rc<FxHashMap<IStr, ObjMember>>,26	value_cache: RefCell<FxHashMap<CacheKey, Option<Val>>>,27}2829#[derive(Clone)]30pub struct ObjValue(pub(crate) Rc<ObjValueInternals>);31impl Debug for ObjValue {32	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {33		if let Some(super_obj) = self.0.super_obj.as_ref() {34			if f.alternate() {35				write!(f, "{:#?}", super_obj)?;36			} else {37				write!(f, "{:?}", super_obj)?;38			}39			write!(f, " + ")?;40		}41		let mut debug = f.debug_struct("ObjValue");42		for (name, member) in self.0.this_entries.iter() {43			debug.field(name, member);44		}45		#[cfg(feature = "unstable")]46		{47			debug.finish_non_exhaustive()48		}49		#[cfg(not(feature = "unstable"))]50		{51			debug.finish()52		}53	}54}5556impl ObjValue {57	pub fn new(context: Context, super_obj: Option<Self>, this_entries: Rc<FxHashMap<IStr, ObjMember>>, assertions: Rc<Vec<AssertStmt>>) -> Self {58		Self(Rc::new(ObjValueInternals {59			context,60			super_obj,61			assertions,62			assertions_ran: RefCell::new(FxHashSet::default()),63			this_obj: None,64			this_entries,65			value_cache: RefCell::new(FxHashMap::default()),66		}))67	}68	pub fn new_empty() -> Self {69		Self::new(Context::new(), None, Rc::new(FxHashMap::default()), Rc::new(Vec::new()))70	}71	pub fn extend_from(&self, super_obj: Self) -> Self {72		match &self.0.super_obj {73			None => Self::new(self.0.context.clone(), Some(super_obj), self.0.this_entries.clone(), self.0.assertions.clone()),74			Some(v) => Self::new(self.0.context.clone(), Some(v.extend_from(super_obj)), self.0.this_entries.clone(), self.0.assertions.clone()),75		}76	}77	pub fn with_this(&self, this_obj: Self) -> Self {78		Self(Rc::new(ObjValueInternals {79			context: self.0.context.clone(),80			super_obj: self.0.super_obj.clone(),81			assertions: self.0.assertions.clone(),82			assertions_ran: RefCell::new(FxHashSet::default()),83			this_obj: Some(this_obj),84			this_entries: self.0.this_entries.clone(),85			value_cache: RefCell::new(FxHashMap::default()),86		}))87	}8889	/// Run callback for every field found in object90	pub(crate) fn enum_fields(&self, handler: &mut impl FnMut(&IStr, &Visibility) -> bool) -> bool {91		if let Some(s) = &self.0.super_obj {92			if s.enum_fields(handler) {93				return true;94			}95		}96		for (name, member) in self.0.this_entries.iter() {97			if handler(name, &member.visibility) {98				return true;99			}100		}101		false102	}103104	pub fn fields_visibility(&self) -> FxHashMap<IStr, bool> {105		let mut out = FxHashMap::default();106		self.enum_fields(&mut |name, visibility| {107			match visibility {108				Visibility::Normal => {109					let entry = out.entry(name.to_owned());110					entry.or_insert(true);111				}112				Visibility::Hidden => {113					out.insert(name.to_owned(), false);114				}115				Visibility::Unhide => {116					out.insert(name.to_owned(), true);117				}118			};119			false120		});121		out122	}123	pub fn fields_ex(&self, include_hidden: bool) -> Vec<IStr> {124		let mut fields: Vec<_> = self125			.fields_visibility()126			.into_iter()127			.filter(|(_k, v)| include_hidden || *v)128			.map(|(k, _)| k)129			.collect();130		fields.sort_unstable();131		fields132	}133	pub fn fields(&self) -> Vec<IStr> {134		self.fields_ex(false)135	}136137	pub fn field_visibility(&self, name: IStr) -> Option<Visibility> {138		if let Some(m) = self.0.this_entries.get(&name) {139			Some(match &m.visibility {140				Visibility::Normal => self141					.0142					.super_obj143					.as_ref()144					.and_then(|super_obj| super_obj.field_visibility(name))145					.unwrap_or(Visibility::Normal),146				v => *v,147			})148		} else if let Some(super_obj) = &self.0.super_obj {149			super_obj.field_visibility(name)150		} else {151			None152		}153	}154155	fn has_field_include_hidden(&self, name: IStr) -> bool {156		if self.0.this_entries.contains_key(&name) {157			true158		} else if let Some(super_obj) = &self.0.super_obj {159			super_obj.has_field_include_hidden(name)160		} else {161			false162		}163	}164165	pub fn has_field_ex(&self, name: IStr, include_hidden: bool) -> bool {166		if include_hidden {167			self.has_field_include_hidden(name)168		} else {169			self.has_field(name)170		}171	}172	pub fn has_field(&self, name: IStr) -> bool {173		self.field_visibility(name)174			.map(|v| v.is_visible())175			.unwrap_or(false)176	}177178	pub fn get(&self, key: IStr) -> Result<Option<Val>> {179		self.run_assertions(self.0.this_obj.as_ref().unwrap_or(self))?;180		self.get_raw(key, self.0.this_obj.as_ref())181	}182183	pub fn extend_with_field(self, key: IStr, value: ObjMember) -> Self {184		let mut new = FxHashMap::with_capacity_and_hasher(1, BuildHasherDefault::default());185		new.insert(key, value);186		Self::new(Context::new(), Some(self), Rc::new(new), Rc::new(Vec::new()))187	}188189	pub fn get_raw(&self, key: IStr, real_this: Option<&Self>) -> Result<Option<Val>> {190		let real_this = real_this.unwrap_or(self);191		let cache_key = (key.clone(), real_this.clone());192193		if let Some(v) = self.0.value_cache.borrow().get(&cache_key) {194			return Ok(v.clone());195		}196		let value = match (self.0.this_entries.get(&key), &self.0.super_obj) {197			(Some(k), None) => Ok(Some(self.evaluate_this(k, real_this)?)),198			(Some(k), Some(s)) => {199				let our = self.evaluate_this(k, real_this)?;200				if k.add {201					s.get_raw(key, Some(real_this))?202						.map_or(Ok(Some(our.clone())), |v| {203							Ok(Some(evaluate_add_op(&v, &our)?))204						})205				} else {206					Ok(Some(our))207				}208			}209			(None, Some(s)) => s.get_raw(key, Some(real_this)),210			(None, None) => Ok(None),211		}?;212		self.0213			.value_cache214			.borrow_mut()215			.insert(cache_key, value.clone());216		Ok(value)217	}218	fn evaluate_this(&self, v: &ObjMember, real_this: &Self) -> Result<Val> {219		v.invoke220			.evaluate(Some(real_this.clone()), self.0.super_obj.clone())?221			.evaluate()222	}223224	fn run_assertions_raw(&self, real_this: &Self) -> Result<()> {225		if self.0.assertions_ran.borrow_mut().insert(real_this.clone()) {226			for assertion in self.0.assertions.iter() {227				if let Err(e) = evaluate_assert(228					self.0229						.context230						.clone()231						.with_this_super(real_this.clone(), self.0.super_obj.clone()),232					assertion,233				) {234					self.0.assertions_ran.borrow_mut().remove(real_this);235					return Err(e);236				}237			}238			if let Some(super_obj) = &self.0.super_obj {239				super_obj.run_assertions_raw(real_this)?;240			}241		}242		Ok(())243	}244	pub fn run_assertions(&self) -> Result<()> {245		self.run_assertions_raw(self)246	}247248	pub fn ptr_eq(a: &Self, b: &Self) -> bool {249		Rc::ptr_eq(&a.0, &b.0)250	}251}252253impl PartialEq for ObjValue {254	fn eq(&self, other: &Self) -> bool {255		Rc::ptr_eq(&self.0, &other.0)256	}257}258259impl Eq for ObjValue {}260impl Hash for ObjValue {261	fn hash<H: Hasher>(&self, state: &mut H) {262		state.write_usize(Rc::as_ptr(&self.0) as usize)263	}264}
modifiedcrates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -124,7 +124,7 @@
 				for p in handler.params.0.iter() {
 					out_args.push(args.binding(p.0.clone())?.evaluate()?);
 				}
-				Ok(handler.call(loc.clone().map(|l| l.0.clone()), &out_args)?)
+				Ok(handler.call(loc.map(|l| l.0.clone()), &out_args)?)
 			}
 		}
 	}