difftreelog
fix make import trace line not show absolute path
in: master
2 files changed
crates/jrsonnet-evaluator/src/evaluate/mod.rsdiffbeforeafterboth649 p649 p650 })650 })651 .unwrap_or_default();651 .unwrap_or_default();652 let path = s.resolve_file(&import_location, path as &str)?;652 let resolved_path = s.resolve_file(&import_location, path as &str)?;653 match i {653 match i {654 Import(_) => s.push(654 Import(_) => s.push(655 CallLocation::new(loc),655 CallLocation::new(loc),656 || format!("import {:?}", path.clone()),656 || format!("import {:?}", path.clone()),657 || s.import(path.clone()),657 || s.import(resolved_path.clone()),658 )?,658 )?,659 ImportStr(_) => Val::Str(s.import_str(path)?),659 ImportStr(_) => Val::Str(s.import_str(resolved_path)?),660 ImportBin(_) => Val::Arr(ArrValue::Bytes(s.import_bin(path)?)),660 ImportBin(_) => Val::Arr(ArrValue::Bytes(s.import_bin(resolved_path)?)),661 _ => unreachable!(),661 _ => unreachable!(),662 }662 }663 }663 }crates/jrsonnet-evaluator/tests/golden/issue23.jsonnet.goldendiffbeforeafterboth--- 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