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
4default-members = ["cmds/jrsonnet"]4default-members = ["cmds/jrsonnet"]
55
6[workspace.dependencies]6[workspace.dependencies]
7jrsonnet-evaluator = { path = "./crates/jrsonnet-evaluator", version = "0.5.0" }7jrsonnet-evaluator = { path = "./crates/jrsonnet-evaluator", version = "0.5.0-pre7" }
8jrsonnet-macros = { path = "./crates/jrsonnet-macros", version = "0.5.0" }8jrsonnet-macros = { path = "./crates/jrsonnet-macros", version = "0.5.0-pre7" }
9jrsonnet-parser = { path = "./crates/jrsonnet-parser", version = "0.5.0" }9jrsonnet-parser = { path = "./crates/jrsonnet-parser", version = "0.5.0-pre7" }
10jrsonnet-interner = { path = "./crates/jrsonnet-interner", version = "0.5.0" }10jrsonnet-interner = { path = "./crates/jrsonnet-interner", version = "0.5.0-pre7" }
11jrsonnet-stdlib = { path = "./crates/jrsonnet-stdlib", version = "0.5.0" }11jrsonnet-stdlib = { path = "./crates/jrsonnet-stdlib", version = "0.5.0-pre7" }
12jrsonnet-cli = { path = "./crates/jrsonnet-cli", version = "0.5.0" }12jrsonnet-cli = { path = "./crates/jrsonnet-cli", version = "0.5.0-pre7" }
13jrsonnet-types = { path = "./crates/jrsonnet-types", version = "0.5.0" }13jrsonnet-types = { path = "./crates/jrsonnet-types", version = "0.5.0-pre7" }
1414
15jrsonnet-gcmodule = "0.3.5"15jrsonnet-gcmodule = "0.3.5"
1616
addedclippy.tomldiffbeforeafterboth

no changes

modifiedcrates/jrsonnet-evaluator/src/arr/mod.rsdiffbeforeafterboth
234 }234 }
235 }235 }
236236
237 /// Is this vec supports .get_cheap()?237 /// Is this vec supports `.get_cheap()?`
238 pub fn is_cheap(&self) -> bool {238 pub fn is_cheap(&self) -> bool {
239 match self {239 match self {
240 ArrValue::Eager(_) | ArrValue::Range(..) | ArrValue::Bytes(_) => true,240 ArrValue::Eager(_) | ArrValue::Range(..) | ArrValue::Bytes(_) => true,
modifiedcrates/jrsonnet-stdlib/src/sets.rsdiffbeforeafterboth
35}35}
3636
37#[builtin]37#[builtin]
38#[allow(non_snake_case)]38#[allow(non_snake_case, clippy::redundant_closure)]
39pub fn builtin_set_inter(a: ArrValue, b: ArrValue, keyF: Option<FuncVal>) -> Result<ArrValue> {39pub fn builtin_set_inter(a: ArrValue, b: ArrValue, keyF: Option<FuncVal>) -> Result<ArrValue> {
40 let mut a = a.iter_lazy();40 let mut a = a.iter_lazy();
41 let mut b = b.iter_lazy();41 let mut b = b.iter_lazy();
modifiedcrates/jrsonnet-stdlib/src/sort.rsdiffbeforeafterboth
71 keyf.evaluate_simple(&(value.clone(),), false)?,71 keyf.evaluate_simple(&(value.clone(),), false)?,
72 ));72 ));
73 }73 }
74 let sort_type = get_sort_type(&mut vk, |v| &v.1)?;74 let sort_type = get_sort_type(&vk, |v| &v.1)?;
75 match sort_type {75 match sort_type {
76 SortKeyType::Number => vk.sort_by_key(|v| match v.1 {76 SortKeyType::Number => vk.sort_by_key(|v| match v.1 {
77 Val::Num(n) => NonNaNf64(n),77 Val::Num(n) => NonNaNf64(n),
106 if arr.len() <= 1 {106 if arr.len() <= 1 {
107 return Ok(arr);107 return Ok(arr);
108 }108 }
109 Ok(super::sort::sort(109 super::sort::sort(
110 arr,110 arr,
111 keyF.unwrap_or_else(FuncVal::identity),111 keyF.unwrap_or_else(FuncVal::identity),
112 )?)112 )
113}113}
114114
115fn uniq_identity(arr: Vec<Val>) -> Result<Vec<Val>> {115fn uniq_identity(arr: Vec<Val>) -> Result<Vec<Val>> {
129 let mut out = Vec::new();129 let mut out = Vec::new();
130 let last_value = arr.get_lazy(0).unwrap();130 let last_value = arr.get_lazy(0).unwrap();
131 let mut last_key = keyf.evaluate_simple(&(last_value.clone(),), false)?;131 let mut last_key = keyf.evaluate_simple(&(last_value.clone(),), false)?;
132 out.push(last_value.clone());132 out.push(last_value);
133133
134 for next in arr.iter_lazy().skip(1) {134 for next in arr.iter_lazy().skip(1) {
135 let next_key = keyf.evaluate_simple(&(next.clone(),), false)?;135 let next_key = keyf.evaluate_simple(&(next.clone(),), false)?;