git.delta.rocks / jrsonnet / refs/commits / 4944c9eb9e42

--- a/crates/jrsonnet-evaluator/src/arr/mod.rs
+++ b/crates/jrsonnet-evaluator/src/arr/mod.rs
@@ -45,10 +45,6 @@
 		Some(Self::new(RepeatedArray::new(data, repeats)?))
 	}
 
-	pub fn chars(chars: impl Iterator<Item = char>) -> Self {
-		Self::new(CharArray(chars.collect()))
-	}
-
 	#[must_use]
 	pub fn map(self, mapper: NativeFn!((Val) -> Val)) -> Self {
 		Self::new(<MappedArray>::new(self, ArrayMapper::Plain(mapper)))

97	}97	}
98}98}
99
100#[derive(Trace, Debug)]
101pub struct CharArray(pub Vec<char>);
102impl ArrayCheap for CharArray {
103	fn len(&self) -> usize {
104		self.0.as_slice().len()
105	}
106	fn get(&self, index: usize) -> Option<Val> {
107		self.0.as_slice().get(index).map(|v| Val::string(*v))
108	}
109}
11099
111impl ArrayCheap for IBytes {100impl ArrayCheap for IBytes {
112	fn len(&self) -> usize {101	fn len(&self) -> usize {

--- a/crates/jrsonnet-evaluator/src/typed/conversions.rs
+++ b/crates/jrsonnet-evaluator/src/typed/conversions.rs
@@ -463,6 +463,11 @@
 impl Typed for char {
 	const TYPE: &'static ComplexValType = &ComplexValType::Char;
 }
+impl IntoUntyped for &char {
+	fn into_untyped(value: Self) -> Result<Val> {
+		Ok(Val::string(*value))
+	}
+}
 impl IntoUntyped for char {
 	fn into_untyped(value: Self) -> Result<Val> {
 		Ok(Val::string(value))

--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -266,7 +266,7 @@
 
 	pub fn to_array(self) -> ArrValue {
 		match self {
-			Self::Str(s) => ArrValue::chars(s.chars()),
+			Self::Str(s) => s.chars().collect(),
 			Self::Arr(arr) => arr,
 		}
 	}

--- a/crates/jrsonnet-stdlib/src/strings.rs
+++ b/crates/jrsonnet-stdlib/src/strings.rs
@@ -223,7 +223,7 @@
 
 #[builtin]
 pub fn builtin_string_chars(str: IStr) -> ArrValue {
-	ArrValue::chars(str.chars())
+	str.chars().collect()
 }
 
 #[builtin]