From ba7b562a0c01c74567487cec32743c1e9886bbd0 Mon Sep 17 00:00:00 2001
From: Лач <iam@lach.pw>
Date: Fri, 24 Jul 2020 12:18:09 +0000
Subject: [PATCH] fix: use new to_string method


---
--- a/crates/jrsonnet-evaluator/src/builtin/format.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/format.rs
@@ -470,7 +470,7 @@
 	let mut tmp_out = String::new();
 
 	match code.convtype {
-		ConvTypeV::String => tmp_out.push_str(&to_string(value)?),
+		ConvTypeV::String => tmp_out.push_str(&value.clone().into_string()?),
 		ConvTypeV::Decimal => {
 			let value = value.clone().try_cast_num("%d/%u/%i requires number")?;
 			render_decimal(
--- a/crates/jrsonnet-evaluator/src/evaluate.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate.rs
@@ -92,8 +92,8 @@
 		(Val::Num(n), Val::Str(o)) => Val::Str(format!("{}{}", n, o).into()),
 		(Val::Str(o), Val::Num(n)) => Val::Str(format!("{}{}", o, n).into()),
 
-		(Val::Str(s), o) => Val::Str(format!("{}{}", s, o.clone().into_json(0)?).into()),
-		(o, Val::Str(s)) => Val::Str(format!("{}{}", o.clone().into_json(0)?, s).into()),
+		(Val::Str(s), o) => Val::Str(format!("{}{}", s, o.clone().into_string()?).into()),
+		(o, Val::Str(s)) => Val::Str(format!("{}{}", o.clone().into_string()?, s).into()),
 
 		(Val::Obj(v1), Val::Obj(v2)) => Val::Obj(v2.with_super(v1.clone())),
 		(Val::Arr(a), Val::Arr(b)) => Val::Arr(Rc::new([&a[..], &b[..]].concat())),
@@ -825,7 +825,6 @@
 						|| format!("field <{}> access", sn),
 						|| {
 							if let Some(v) = v.get(s.clone())? {
-								println!("{:?}", loc);
 								Ok(v.unwrap_if_lazy()?)
 							} else if let Some(Val::Str(n)) =
 								v.get("__intristic_namespace__".into())?

-- 
gitstuff