--- a/Cargo.lock +++ b/Cargo.lock @@ -261,7 +261,7 @@ [[package]] name = "jrsonnet" -version = "0.5.0" +version = "0.5.0-pre7" dependencies = [ "clap", "clap_complete", @@ -275,7 +275,7 @@ [[package]] name = "jrsonnet-cli" -version = "0.5.0" +version = "0.5.0-pre7" dependencies = [ "clap", "jrsonnet-evaluator", @@ -286,7 +286,7 @@ [[package]] name = "jrsonnet-evaluator" -version = "0.5.0" +version = "0.5.0-pre7" dependencies = [ "annotate-snippets", "anyhow", @@ -330,7 +330,7 @@ [[package]] name = "jrsonnet-interner" -version = "0.5.0" +version = "0.5.0-pre7" dependencies = [ "hashbrown 0.13.2", "jrsonnet-gcmodule", @@ -341,7 +341,7 @@ [[package]] name = "jrsonnet-macros" -version = "0.5.0" +version = "0.5.0-pre7" dependencies = [ "proc-macro2", "quote", @@ -350,7 +350,7 @@ [[package]] name = "jrsonnet-parser" -version = "0.5.0" +version = "0.5.0-pre7" dependencies = [ "jrsonnet-gcmodule", "jrsonnet-interner", @@ -362,7 +362,7 @@ [[package]] name = "jrsonnet-stdlib" -version = "0.5.0" +version = "0.5.0-pre7" dependencies = [ "base64", "bincode", @@ -381,7 +381,7 @@ [[package]] name = "jrsonnet-types" -version = "0.5.0" +version = "0.5.0-pre7" dependencies = [ "jrsonnet-gcmodule", "peg", @@ -395,7 +395,7 @@ [[package]] name = "libjsonnet" -version = "0.5.0" +version = "0.5.0-pre7" dependencies = [ "jrsonnet-evaluator", "jrsonnet-gcmodule", --- 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" --- /dev/null +++ b/clippy.toml @@ -0,0 +1 @@ +ignore-interior-mutability = ["jrsonnet_interner::IStr"] --- 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, --- 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) -> Result { let mut a = a.iter_lazy(); let mut b = b.iter_lazy(); --- 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) -> Result> { @@ -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)?;