git.delta.rocks / jrsonnet / refs/commits / 57f709a58e12

difftreelog

perf move resolvePath to native

Yaroslav Bolyukin2024-06-18parent: #71fb4e2.patch.diff
in: master

3 files changed

modifiedcrates/jrsonnet-stdlib/src/arrays.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/arrays.rs
+++ b/crates/jrsonnet-stdlib/src/arrays.rs
@@ -208,6 +208,14 @@
 	)
 }
 
+#[builtin]
+pub fn builtin_resolve_path(f: String, r: String) -> String {
+	let Some(pos) = f.rfind('/') else {
+		return r;
+	};
+	format!("{}{}", &f[..=pos], r)
+}
+
 pub fn deep_join_inner(out: &mut String, arr: IndexableVal) -> Result<()> {
 	use std::fmt::Write;
 	match arr {
modifiedcrates/jrsonnet-stdlib/src/lib.rsdiffbeforeafterboth
86 ("range", builtin_range::INST),86 ("range", builtin_range::INST),
87 ("join", builtin_join::INST),87 ("join", builtin_join::INST),
88 ("lines", builtin_lines::INST),88 ("lines", builtin_lines::INST),
89 ("resolvePath", builtin_resolve_path::INST),
89 ("deepJoin", builtin_deep_join::INST),90 ("deepJoin", builtin_deep_join::INST),
90 ("reverse", builtin_reverse::INST),91 ("reverse", builtin_reverse::INST),
91 ("any", builtin_any::INST),92 ("any", builtin_any::INST),
modifiedcrates/jrsonnet-stdlib/src/std.jsonnetdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/std.jsonnet
+++ b/crates/jrsonnet-stdlib/src/std.jsonnet
@@ -10,8 +10,4 @@
       error ('std.mapWithKey second param must be object, got ' + std.type(obj))
     else
       { [k]: func(k, obj[k]) for k in std.objectFields(obj) },
-
-  resolvePath(f, r)::
-    local arr = std.split(f, '/');
-    std.join('/', std.makeArray(std.length(arr) - 1, function(i) arr[i]) + [r]),
 }