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

--- a/crates/jrsonnet-evaluator/src/builtin/mod.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/mod.rs
@@ -453,7 +453,6 @@
 	})
 }
 
-
 fn builtin_join(context: Context, _loc: &Option<ExprLocation>, args: &ArgsDesc) -> Result<Val> {
 	parse_args!(context, "join", args, 2, [
 		0, sep: ty!((string | array));
@@ -559,7 +558,11 @@
 }
 
 // faster
-fn builtin_str_replace(context: Context, _loc: &Option<ExprLocation>, args: &ArgsDesc) -> Result<Val> {
+fn builtin_str_replace(
+	context: Context,
+	_loc: &Option<ExprLocation>,
+	args: &ArgsDesc,
+) -> Result<Val> {
 	parse_args!(context, "strReplace", args, 3, [
 		0, str: ty!(string) => Val::Str;
 		1, from: ty!(string) => Val::Str;

--- a/crates/jrsonnet-evaluator/src/typed.rs
+++ b/crates/jrsonnet-evaluator/src/typed.rs
@@ -143,7 +143,7 @@
 			ComplexValType::Any => Ok(()),
 			ComplexValType::Simple(s) => s.check(value),
 			ComplexValType::Char => match value {
-				Val::Str(s) if s.chars().count() == 1 => Ok(()),
+				Val::Str(s) if s.len() == 1 || s.chars().count() == 1 => Ok(()),
 				v => Err(TypeError::ExpectedGot(self.clone(), v.value_type()).into()),
 			},
 			ComplexValType::BoundedNumber(from, to) => {

no syntactic changes