git.delta.rocks / jrsonnet / refs/commits / 4f2e8db91a47

--- a/crates/jrsonnet-evaluator/src/arr/mod.rs
+++ b/crates/jrsonnet-evaluator/src/arr/mod.rs
@@ -1,7 +1,4 @@
-use std::{
-	any::Any,
-	num::{NonZeroU32, NonZeroUsize},
-};
+use std::{any::Any, num::NonZeroU32};
 
 use jrsonnet_gcmodule::{Cc, Trace};
 use jrsonnet_interner::IBytes;

--- a/crates/jrsonnet-evaluator/src/evaluate/destructure.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/destructure.rs
@@ -110,7 +110,11 @@
 						fn get(self: Box<Self>) -> Result<Self::Output> {
 							let full = self.full.evaluate()?;
 							let to = full.len() - self.end;
-							Ok(Val::Arr(full.slice(Some(self.start as i32), Some(to as i32), None)))
+							Ok(Val::Arr(full.slice(
+								Some(self.start as i32),
+								Some(to as i32),
+								None,
+							)))
 						}
 					}
 

--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -2,7 +2,7 @@
 	cell::RefCell,
 	fmt::{self, Debug, Display},
 	mem::replace,
-	num::{NonZeroU32, NonZeroUsize},
+	num::NonZeroU32,
 	rc::Rc,
 };
 

--- a/crates/jrsonnet-macros/src/lib.rs
+++ b/crates/jrsonnet-macros/src/lib.rs
@@ -218,8 +218,7 @@
 	item: proc_macro::TokenStream,
 ) -> proc_macro::TokenStream {
 	let attr = parse_macro_input!(attr as BuiltinAttrs);
-	let item_fn = item.clone();
-	let item_fn: ItemFn = parse_macro_input!(item_fn);
+	let item_fn = parse_macro_input!(item as ItemFn);
 
 	match builtin_inner(attr, item_fn) {
 		Ok(v) => v.into(),

--- a/crates/jrsonnet-stdlib/src/manifest/toml.rs
+++ b/crates/jrsonnet-stdlib/src/manifest/toml.rs
@@ -4,7 +4,7 @@
 	bail,
 	manifest::{escape_string_json_buf, ManifestFormat},
 	val::ArrValue,
-	IStr, ObjValue, Result, ResultExt, Val, State,
+	IStr, ObjValue, Result, ResultExt, State, Val,
 };
 
 pub struct TomlFormat<'s> {

1use jrsonnet_evaluator::{1use jrsonnet_evaluator::{
2	bail,2	bail,
3	manifest::{ManifestFormat, ToStringFormat},3	manifest::{ManifestFormat, ToStringFormat},
4	typed::{ComplexValType, Either2, Either4, Typed, ValType},4	typed::{ComplexValType, Either2, Typed, ValType},
5	val::{ArrValue, IndexableVal},5	val::ArrValue,
6	Either, ObjValue, Result, ResultExt, Val, State,6	Either, ObjValue, Result, ResultExt, State, Val,
7};7};
88
9pub struct XmlJsonmlFormat {9pub struct XmlJsonmlFormat {
3939
40	fn from_untyped(untyped: Val) -> Result<Self> {40	fn from_untyped(untyped: Val) -> Result<Self> {
41		let val = <Either![ArrValue, String]>::from_untyped(untyped)41		let val = <Either![ArrValue, String]>::from_untyped(untyped)
42			.with_description(|| format!("parsing JSONML value (an array or string)"))?;42			.description("parsing JSONML value (an array or string)")?;
43		let arr = match val {43		let arr = match val {
44			Either2::A(a) => a,44			Either2::A(a) => a,
45			Either2::B(s) => return Ok(Self::String(s)),45			Either2::B(s) => return Ok(Self::String(s)),
46		};46		};
47		if arr.len() < 1 {47		if arr.is_empty() {
48			bail!("JSONML value should have tag (array length should be >=1)");48			bail!("JSONML value should have tag (array length should be >=1)");
49		};49		};
50		let tag = String::from_untyped(50		let tag = String::from_untyped(
51			arr.get(0)51			arr.get(0)
52				.with_description(|| "getting JSONML tag")?52				.description("getting JSONML tag")?
53				.expect("length checked"),53				.expect("length checked"),
54		)54		)
55		.with_description(|| format!("parsing JSONML tag"))?;55		.description("parsing JSONML tag")?;
5656
57		let (has_attrs, attrs) = if arr.len() >= 2 {57		let (has_attrs, attrs) = if arr.len() >= 2 {
58			let maybe_attrs = arr58			let maybe_attrs = arr
71			tag,71			tag,
72			attrs,72			attrs,
73			children: State::push_description(73			children: State::push_description(
74				|| format!("parsing children"),74				|| "parsing children".to_owned(),
75				|| {75				|| {
76					Typed::from_untyped(Val::Arr(arr.slice(76					Typed::from_untyped(Val::Arr(arr.slice(
77						Some(if has_attrs { 2 } else { 1 }),77						Some(if has_attrs { 2 } else { 1 }),
100		} => {100		} => {
101			let has_children = !children.is_empty();101			let has_children = !children.is_empty();
102			buf.push('<');102			buf.push('<');
103			buf.push_str(&tag);103			buf.push_str(tag);
104			attrs.run_assertions()?;104			attrs.run_assertions()?;
105			for (key, value) in attrs.iter(105			for (key, value) in attrs.iter(
106				// Not much sense to preserve order here106				// Not much sense to preserve order here
125			}125			}
126			buf.push('>');126			buf.push('>');
127			for child in children {127			for child in children {
128				manifest_jsonml(&child, buf, opts)?;128				manifest_jsonml(child, buf, opts)?;
129			}129			}
130			if has_children || opts.force_closing {130			if has_children || opts.force_closing {
131				buf.push('<');131				buf.push('<');
132				buf.push('/');132				buf.push('/');
133				buf.push_str(&tag);133				buf.push_str(tag);
134				buf.push('>');134				buf.push('>');
135			}135			}
136			Ok(())136			Ok(())
177	}177	}
178	if !found {178	if !found {
179		// No match - no escapes required179		// No match - no escapes required
180		out.push_str(&str);180		out.push_str(str);
181		return;181		return;
182	}182	}
183	out.push_str(&remaining);183	out.push_str(remaining);
184}184}
185185

--- a/crates/jrsonnet-stdlib/src/misc.rs
+++ b/crates/jrsonnet-stdlib/src/misc.rs
@@ -28,8 +28,7 @@
 	o: ObjValue,
 	f: IStr,
 	default: Option<Thunk<Val>>,
-	#[default(true)]
-	inc_hidden: bool,
+	#[default(true)] inc_hidden: bool,
 ) -> Result<Val> {
 	let do_default = move || {
 		let Some(default) = default else {

--- a/crates/jrsonnet-stdlib/src/objects.rs
+++ b/crates/jrsonnet-stdlib/src/objects.rs
@@ -57,8 +57,7 @@
 	o: ObjValue,
 	include_hidden: bool,
 
-	#[cfg(feature = "exp-preserve-order")]
-	preserve_order: bool,
+	#[cfg(feature = "exp-preserve-order")] preserve_order: bool,
 ) -> ArrValue {
 	o.values_ex(
 		include_hidden,
@@ -101,8 +100,7 @@
 	o: ObjValue,
 	include_hidden: bool,
 
-	#[cfg(feature = "exp-preserve-order")]
-	preserve_order: bool,
+	#[cfg(feature = "exp-preserve-order")] preserve_order: bool,
 ) -> ArrValue {
 	o.key_values_ex(
 		include_hidden,