`57f709a58e12`

3 files changed

modifiedcrates/jrsonnet-stdlib/src/arrays.rsdiff before after both

208	)208	)
209}209}
210
211#[builtin]
212pub fn builtin_resolve_path(f: String, r: String) -> String {
213	let Some(pos) = f.rfind('/') else {
214		return r;
215	};
216	format!("{}{}", &f[..=pos], r)
217}
210218
211pub fn deep_join_inner(out: &mut String, arr: IndexableVal) -> Result<()> {219pub fn deep_join_inner(out: &mut String, arr: IndexableVal) -> Result<()> {
212	use std::fmt::Write;220	use std::fmt::Write;

modifiedcrates/jrsonnet-stdlib/src/lib.rsdiff before after both

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.jsonnetdiff before after both

10      error ('std.mapWithKey second param must be object, got ' + std.type(obj))10      error ('std.mapWithKey second param must be object, got ' + std.type(obj))
11    else11    else
12      { [k]: func(k, obj[k]) for k in std.objectFields(obj) },12      { [k]: func(k, obj[k]) for k in std.objectFields(obj) },
13
14  resolvePath(f, r)::
15    local arr = std.split(f, '/');
16    std.join('/', std.makeArray(std.length(arr) - 1, function(i) arr[i]) + [r]),
17}13}
1814