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

difftreelog

style fix clippy warnings

Yaroslav Bolyukin2023-04-17parent: #d0fb5f4.patch.diff
in: master

6 files changed

modifiedCargo.lockdiffbeforeafterboth
261261
262[[package]]262[[package]]
263name = "jrsonnet"263name = "jrsonnet"
264version = "0.5.0"264version = "0.5.0-pre7"
265dependencies = [265dependencies = [
266 "clap",266 "clap",
267 "clap_complete",267 "clap_complete",
275275
276[[package]]276[[package]]
277name = "jrsonnet-cli"277name = "jrsonnet-cli"
278version = "0.5.0"278version = "0.5.0-pre7"
279dependencies = [279dependencies = [
280 "clap",280 "clap",
281 "jrsonnet-evaluator",281 "jrsonnet-evaluator",
286286
287[[package]]287[[package]]
288name = "jrsonnet-evaluator"288name = "jrsonnet-evaluator"
289version = "0.5.0"289version = "0.5.0-pre7"
290dependencies = [290dependencies = [
291 "annotate-snippets",291 "annotate-snippets",
292 "anyhow",292 "anyhow",
330330
331[[package]]331[[package]]
332name = "jrsonnet-interner"332name = "jrsonnet-interner"
333version = "0.5.0"333version = "0.5.0-pre7"
334dependencies = [334dependencies = [
335 "hashbrown 0.13.2",335 "hashbrown 0.13.2",
336 "jrsonnet-gcmodule",336 "jrsonnet-gcmodule",
341341
342[[package]]342[[package]]
343name = "jrsonnet-macros"343name = "jrsonnet-macros"
344version = "0.5.0"344version = "0.5.0-pre7"
345dependencies = [345dependencies = [
346 "proc-macro2",346 "proc-macro2",
347 "quote",347 "quote",
350350
351[[package]]351[[package]]
352name = "jrsonnet-parser"352name = "jrsonnet-parser"
353version = "0.5.0"353version = "0.5.0-pre7"
354dependencies = [354dependencies = [
355 "jrsonnet-gcmodule",355 "jrsonnet-gcmodule",
356 "jrsonnet-interner",356 "jrsonnet-interner",
362362
363[[package]]363[[package]]
364name = "jrsonnet-stdlib"364name = "jrsonnet-stdlib"
365version = "0.5.0"365version = "0.5.0-pre7"
366dependencies = [366dependencies = [
367 "base64",367 "base64",
368 "bincode",368 "bincode",
381381
382[[package]]382[[package]]
383name = "jrsonnet-types"383name = "jrsonnet-types"
384version = "0.5.0"384version = "0.5.0-pre7"
385dependencies = [385dependencies = [
386 "jrsonnet-gcmodule",386 "jrsonnet-gcmodule",
387 "peg",387 "peg",
395395
396[[package]]396[[package]]
397name = "libjsonnet"397name = "libjsonnet"
398version = "0.5.0"398version = "0.5.0-pre7"
399dependencies = [399dependencies = [
400 "jrsonnet-evaluator",400 "jrsonnet-evaluator",
401 "jrsonnet-gcmodule",401 "jrsonnet-gcmodule",
modifiedCargo.tomldiffbeforeafterboth
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,13 +4,13 @@
 default-members = ["cmds/jrsonnet"]
 
 [workspace.dependencies]
-jrsonnet-evaluator = { path = "./crates/jrsonnet-evaluator", version = "0.5.0" }
-jrsonnet-macros = { path = "./crates/jrsonnet-macros", version = "0.5.0" }
-jrsonnet-parser = { path = "./crates/jrsonnet-parser", version = "0.5.0" }
-jrsonnet-interner = { path = "./crates/jrsonnet-interner", version = "0.5.0" }
-jrsonnet-stdlib = { path = "./crates/jrsonnet-stdlib", version = "0.5.0" }
-jrsonnet-cli = { path = "./crates/jrsonnet-cli", version = "0.5.0" }
-jrsonnet-types = { path = "./crates/jrsonnet-types", version = "0.5.0" }
+jrsonnet-evaluator = { path = "./crates/jrsonnet-evaluator", version = "0.5.0-pre7" }
+jrsonnet-macros = { path = "./crates/jrsonnet-macros", version = "0.5.0-pre7" }
+jrsonnet-parser = { path = "./crates/jrsonnet-parser", version = "0.5.0-pre7" }
+jrsonnet-interner = { path = "./crates/jrsonnet-interner", version = "0.5.0-pre7" }
+jrsonnet-stdlib = { path = "./crates/jrsonnet-stdlib", version = "0.5.0-pre7" }
+jrsonnet-cli = { path = "./crates/jrsonnet-cli", version = "0.5.0-pre7" }
+jrsonnet-types = { path = "./crates/jrsonnet-types", version = "0.5.0-pre7" }
 
 jrsonnet-gcmodule = "0.3.5"
 
addedclippy.tomldiffbeforeafterboth
--- /dev/null
+++ b/clippy.toml
@@ -0,0 +1 @@
+ignore-interior-mutability = ["jrsonnet_interner::IStr"]
modifiedcrates/jrsonnet-evaluator/src/arr/mod.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/arr/mod.rs
+++ b/crates/jrsonnet-evaluator/src/arr/mod.rs
@@ -234,7 +234,7 @@
 		}
 	}
 
-	/// Is this vec supports .get_cheap()?
+	/// Is this vec supports `.get_cheap()?`
 	pub fn is_cheap(&self) -> bool {
 		match self {
 			ArrValue::Eager(_) | ArrValue::Range(..) | ArrValue::Bytes(_) => true,
modifiedcrates/jrsonnet-stdlib/src/sets.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/sets.rs
+++ b/crates/jrsonnet-stdlib/src/sets.rs
@@ -35,7 +35,7 @@
 }
 
 #[builtin]
-#[allow(non_snake_case)]
+#[allow(non_snake_case, clippy::redundant_closure)]
 pub fn builtin_set_inter(a: ArrValue, b: ArrValue, keyF: Option<FuncVal>) -> Result<ArrValue> {
 	let mut a = a.iter_lazy();
 	let mut b = b.iter_lazy();
modifiedcrates/jrsonnet-stdlib/src/sort.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/sort.rs
+++ b/crates/jrsonnet-stdlib/src/sort.rs
@@ -71,7 +71,7 @@
 			keyf.evaluate_simple(&(value.clone(),), false)?,
 		));
 	}
-	let sort_type = get_sort_type(&mut vk, |v| &v.1)?;
+	let sort_type = get_sort_type(&vk, |v| &v.1)?;
 	match sort_type {
 		SortKeyType::Number => vk.sort_by_key(|v| match v.1 {
 			Val::Num(n) => NonNaNf64(n),
@@ -106,10 +106,10 @@
 	if arr.len() <= 1 {
 		return Ok(arr);
 	}
-	Ok(super::sort::sort(
+	super::sort::sort(
 		arr,
 		keyF.unwrap_or_else(FuncVal::identity),
-	)?)
+	)
 }
 
 fn uniq_identity(arr: Vec<Val>) -> Result<Vec<Val>> {
@@ -129,7 +129,7 @@
 	let mut out = Vec::new();
 	let last_value = arr.get_lazy(0).unwrap();
 	let mut last_key = keyf.evaluate_simple(&(last_value.clone(),), false)?;
-	out.push(last_value.clone());
+	out.push(last_value);
 
 	for next in arr.iter_lazy().skip(1) {
 		let next_key = keyf.evaluate_simple(&(next.clone(),), false)?;