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

difftreelog

fix(evaluator) str+num infinite recursion

Лач2020-06-25parent: #0b9856e.patch.diff
in: master

1 file changed

modifiedcrates/jsonnet-evaluator/src/evaluate.rsdiffbeforeafterboth
82 Ok(match (a, b) {82 Ok(match (a, b) {
83 (Val::Str(v1), Val::Str(v2)) => Val::Str(v1.to_owned() + &v2),83 (Val::Str(v1), Val::Str(v2)) => Val::Str(v1.to_owned() + &v2),
84
85 // Can't use generic json serialization way, because it depends on number to string concatenation (std.jsonnet:890)
86 (Val::Num(n), Val::Str(o)) => Val::Str(format!("{}{}", n, o)),
87 (Val::Str(o), Val::Num(n)) => Val::Str(format!("{}{}", o, n)),
8488
85 (Val::Str(s), o) => Val::Str(format!("{}{}", s, o.clone().into_json(0)?)),89 (Val::Str(s), o) => Val::Str(format!("{}{}", s, o.clone().into_json(0)?)),
86 (o, Val::Str(s)) => Val::Str(format!("{}{}", o.clone().into_json(0)?, s)),90 (o, Val::Str(s)) => Val::Str(format!("{}{}", o.clone().into_json(0)?, s)),