From e1e1d4b4fac983c3c1852774002e3474245f23fc Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Thu, 26 May 2022 18:24:30 +0000
Subject: [PATCH] fix: make import trace line not show absolute path


---
--- a/crates/jrsonnet-evaluator/src/evaluate/mod.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/mod.rs
@@ -649,15 +649,15 @@
 					p
 				})
 				.unwrap_or_default();
-			let path = s.resolve_file(&import_location, path as &str)?;
+			let resolved_path = s.resolve_file(&import_location, path as &str)?;
 			match i {
 				Import(_) => s.push(
 					CallLocation::new(loc),
 					|| format!("import {:?}", path.clone()),
-					|| s.import(path.clone()),
+					|| s.import(resolved_path.clone()),
 				)?,
-				ImportStr(_) => Val::Str(s.import_str(path)?),
-				ImportBin(_) => Val::Arr(ArrValue::Bytes(s.import_bin(path)?)),
+				ImportStr(_) => Val::Str(s.import_str(resolved_path)?),
+				ImportBin(_) => Val::Arr(ArrValue::Bytes(s.import_bin(resolved_path)?)),
 				_ => unreachable!(),
 			}
 		}
--- a/crates/jrsonnet-evaluator/tests/golden/issue23.jsonnet.golden
+++ b/crates/jrsonnet-evaluator/tests/golden/issue23.jsonnet.golden
@@ -1,2 +1,2 @@
 infinite recursion detected
-   issue23.jsonnet:1:1-26: import "/home/lach/build/jrsonnet/crates/jrsonnet-evaluator/tests/golden/issue23.jsonnet"
\ No newline at end of file
+   issue23.jsonnet:1:1-26: import "issue23.jsonnet"
\ No newline at end of file

-- 
gitstuff