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

difftreelog

fix use new to_string method

Лач2020-07-24parent: #bb39159.patch.diff
in: master

2 files changed

modifiedcrates/jrsonnet-evaluator/src/builtin/format.rsdiffbeforeafterboth
470 let mut tmp_out = String::new();470 let mut tmp_out = String::new();
471471
472 match code.convtype {472 match code.convtype {
473 ConvTypeV::String => tmp_out.push_str(&to_string(value)?),473 ConvTypeV::String => tmp_out.push_str(&value.clone().into_string()?),
474 ConvTypeV::Decimal => {474 ConvTypeV::Decimal => {
475 let value = value.clone().try_cast_num("%d/%u/%i requires number")?;475 let value = value.clone().try_cast_num("%d/%u/%i requires number")?;
476 render_decimal(476 render_decimal(
modifiedcrates/jrsonnet-evaluator/src/evaluate.rsdiffbeforeafterboth
92 (Val::Num(n), Val::Str(o)) => Val::Str(format!("{}{}", n, o).into()),92 (Val::Num(n), Val::Str(o)) => Val::Str(format!("{}{}", n, o).into()),
93 (Val::Str(o), Val::Num(n)) => Val::Str(format!("{}{}", o, n).into()),93 (Val::Str(o), Val::Num(n)) => Val::Str(format!("{}{}", o, n).into()),
9494
95 (Val::Str(s), o) => Val::Str(format!("{}{}", s, o.clone().into_json(0)?).into()),95 (Val::Str(s), o) => Val::Str(format!("{}{}", s, o.clone().into_string()?).into()),
96 (o, Val::Str(s)) => Val::Str(format!("{}{}", o.clone().into_json(0)?, s).into()),96 (o, Val::Str(s)) => Val::Str(format!("{}{}", o.clone().into_string()?, s).into()),
9797
98 (Val::Obj(v1), Val::Obj(v2)) => Val::Obj(v2.with_super(v1.clone())),98 (Val::Obj(v1), Val::Obj(v2)) => Val::Obj(v2.with_super(v1.clone())),
99 (Val::Arr(a), Val::Arr(b)) => Val::Arr(Rc::new([&a[..], &b[..]].concat())),99 (Val::Arr(a), Val::Arr(b)) => Val::Arr(Rc::new([&a[..], &b[..]].concat())),
825 || format!("field <{}> access", sn),825 || format!("field <{}> access", sn),
826 || {826 || {
827 if let Some(v) = v.get(s.clone())? {827 if let Some(v) = v.get(s.clone())? {
828 println!("{:?}", loc);
829 Ok(v.unwrap_if_lazy()?)828 Ok(v.unwrap_if_lazy()?)
830 } else if let Some(Val::Str(n)) =829 } else if let Some(Val::Str(n)) =
831 v.get("__intristic_namespace__".into())?830 v.get("__intristic_namespace__".into())?