difftreelog
Merge branch 'master' into gc-v2
in: master
17 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -242,7 +242,6 @@
dependencies = [
"gc",
"jrsonnet-evaluator",
- "jrsonnet-interner",
"jrsonnet-parser",
]
bindings/jsonnet/Cargo.tomldiffbeforeafterboth--- a/bindings/jsonnet/Cargo.toml
+++ b/bindings/jsonnet/Cargo.toml
@@ -8,7 +8,6 @@
publish = false
[dependencies]
-jrsonnet-interner = { path = "../../crates/jrsonnet-interner", version = "0.3.8" }
jrsonnet-evaluator = { path = "../../crates/jrsonnet-evaluator", version = "0.3.8" }
jrsonnet-parser = { path = "../../crates/jrsonnet-parser", version = "0.3.8" }
gc = { version = "0.4.1", features = ["derive"] }
bindings/jsonnet/src/import.rsdiffbeforeafterboth--- a/bindings/jsonnet/src/import.rs
+++ b/bindings/jsonnet/src/import.rs
@@ -2,9 +2,8 @@
use jrsonnet_evaluator::{
error::{Error::*, Result},
- throw, EvaluationState, ImportResolver,
+ throw, EvaluationState, IStr, ImportResolver,
};
-use jrsonnet_interner::IStr;
use std::{
any::Any,
cell::RefCell,
@@ -13,7 +12,7 @@
fs::File,
io::Read,
os::raw::{c_char, c_int},
- path::PathBuf,
+ path::{Path, PathBuf},
ptr::null_mut,
rc::Rc,
};
@@ -34,7 +33,7 @@
out: RefCell<HashMap<PathBuf, IStr>>,
}
impl ImportResolver for CallbackImportResolver {
- fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>> {
+ fn resolve_file(&self, from: &Path, path: &Path) -> Result<Rc<Path>> {
let base = CString::new(from.to_str().unwrap()).unwrap().into_raw();
let rel = CString::new(path.to_str().unwrap()).unwrap().into_raw();
let found_here: *mut c_char = null_mut();
@@ -74,9 +73,9 @@
unsafe { CString::from_raw(result_ptr) };
}
- Ok(Rc::new(found_here_buf))
+ Ok(found_here_buf.into())
}
- fn load_file_contents(&self, resolved: &PathBuf) -> Result<IStr> {
+ fn load_file_contents(&self, resolved: &Path) -> Result<IStr> {
Ok(self.out.borrow().get(resolved).unwrap().clone())
}
unsafe fn as_any(&self) -> &dyn Any {
@@ -109,27 +108,27 @@
}
}
impl ImportResolver for NativeImportResolver {
- fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>> {
- let mut new_path = from.clone();
+ fn resolve_file(&self, from: &Path, path: &Path) -> Result<Rc<Path>> {
+ let mut new_path = from.to_owned();
new_path.push(path);
if new_path.exists() {
- Ok(Rc::new(new_path))
+ Ok(new_path.into())
} else {
for library_path in self.library_paths.borrow().iter() {
let mut cloned = library_path.clone();
cloned.push(path);
if cloned.exists() {
- return Ok(Rc::new(cloned));
+ return Ok(cloned.into());
}
}
- throw!(ImportFileNotFound(from.clone(), path.clone()))
+ throw!(ImportFileNotFound(from.to_owned(), path.to_owned()))
}
}
- fn load_file_contents(&self, id: &PathBuf) -> Result<IStr> {
- let mut file = File::open(id).map_err(|_e| ResolvedFileNotFound(id.clone()))?;
+ fn load_file_contents(&self, id: &Path) -> Result<IStr> {
+ let mut file = File::open(id).map_err(|_e| ResolvedFileNotFound(id.to_owned()))?;
let mut out = String::new();
file.read_to_string(&mut out)
- .map_err(|_e| ImportBadFileUtf8(id.clone()))?;
+ .map_err(|_e| ImportBadFileUtf8(id.to_owned()))?;
Ok(out.into())
}
unsafe fn as_any(&self) -> &dyn Any {
bindings/jsonnet/src/lib.rsdiffbeforeafterboth--- a/bindings/jsonnet/src/lib.rs
+++ b/bindings/jsonnet/src/lib.rs
@@ -9,14 +9,12 @@
pub mod vars_tlas;
use import::NativeImportResolver;
-use jrsonnet_evaluator::{EvaluationState, ManifestFormat, Val};
-use jrsonnet_interner::IStr;
+use jrsonnet_evaluator::{EvaluationState, IStr, ManifestFormat, Val};
use std::{
alloc::Layout,
ffi::{CStr, CString},
os::raw::{c_char, c_double, c_int, c_uint},
path::PathBuf,
- rc::Rc,
};
/// WASM stub
@@ -145,7 +143,7 @@
let snippet = CStr::from_ptr(snippet);
match vm
.evaluate_snippet_raw(
- Rc::new(PathBuf::from(filename.to_str().unwrap())),
+ PathBuf::from(filename.to_str().unwrap()).into(),
snippet.to_str().unwrap().into(),
)
.and_then(|v| vm.with_tla(v))
@@ -221,7 +219,7 @@
let snippet = CStr::from_ptr(snippet);
match vm
.evaluate_snippet_raw(
- Rc::new(PathBuf::from(filename.to_str().unwrap())),
+ PathBuf::from(filename.to_str().unwrap()).into(),
snippet.to_str().unwrap().into(),
)
.and_then(|v| vm.with_tla(v))
@@ -295,7 +293,7 @@
let snippet = CStr::from_ptr(snippet);
match vm
.evaluate_snippet_raw(
- Rc::new(PathBuf::from(filename.to_str().unwrap())),
+ PathBuf::from(filename.to_str().unwrap()).into(),
snippet.to_str().unwrap().into(),
)
.and_then(|v| vm.with_tla(v))
bindings/jsonnet/src/native.rsdiffbeforeafterboth--- a/bindings/jsonnet/src/native.rs
+++ b/bindings/jsonnet/src/native.rs
@@ -8,7 +8,7 @@
use std::{
ffi::{c_void, CStr},
os::raw::{c_char, c_int},
- path::PathBuf,
+ path::Path,
rc::Rc,
};
@@ -27,7 +27,7 @@
unsafe_empty_trace!();
}
impl NativeCallbackHandler for JsonnetNativeCallbackHandler {
- fn call(&self, _from: Option<Rc<PathBuf>>, args: &[Val]) -> Result<Val, LocError> {
+ fn call(&self, _from: Option<Rc<Path>>, args: &[Val]) -> Result<Val, LocError> {
let mut n_args = Vec::new();
for a in args {
n_args.push(Some(Box::new(a.clone())));
cmds/jrsonnet/src/main.rsdiffbeforeafterboth--- a/cmds/jrsonnet/src/main.rs
+++ b/cmds/jrsonnet/src/main.rs
@@ -6,7 +6,6 @@
io::Read,
io::Write,
path::PathBuf,
- rc::Rc,
str::FromStr,
};
@@ -134,14 +133,14 @@
let val = if opts.input.exec {
state.set_manifest_format(ManifestFormat::ToString);
state.evaluate_snippet_raw(
- Rc::new(PathBuf::from("args")),
+ PathBuf::from("args").into(),
(&opts.input.input as &str).into(),
)?
} else if opts.input.input == "-" {
let mut input = Vec::new();
std::io::stdin().read_to_end(&mut input)?;
let input_str = std::str::from_utf8(&input)?.into();
- state.evaluate_snippet_raw(Rc::new(PathBuf::from("<stdin>")), input_str)?
+ state.evaluate_snippet_raw(PathBuf::from("<stdin>").into(), input_str)?
} else {
state.evaluate_file_raw(&PathBuf::from(opts.input.input))?
};
crates/jrsonnet-evaluator/build.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/build.rs
+++ b/crates/jrsonnet-evaluator/build.rs
@@ -15,7 +15,7 @@
let parsed = parse(
STDLIB_STR,
&ParserSettings {
- file_name: Rc::new(PathBuf::from("std.jsonnet")),
+ file_name: PathBuf::from("std.jsonnet").into(),
loc_data: true,
},
)
crates/jrsonnet-evaluator/src/builtin/mod.rsdiffbeforeafterboth1use crate::{2 equals,3 error::{Error::*, Result},4 parse_args, primitive_equals, push, throw, with_state, ArrValue, Context, DebugGcTraceValue,5 EvaluationState, FuncVal, LazyVal, Val,6};7use format::{format_arr, format_obj};8use gc::Gc;9use jrsonnet_interner::IStr;10use jrsonnet_parser::{ArgsDesc, BinaryOpType, ExprLocation};11use jrsonnet_types::ty;12use std::{collections::HashMap, path::PathBuf, rc::Rc};1314pub mod stdlib;15pub use stdlib::*;1617use self::manifest::{escape_string_json, manifest_json_ex, ManifestJsonOptions, ManifestType};1819pub mod format;20pub mod manifest;21pub mod sort;2223fn std_format(str: IStr, vals: Val) -> Result<Val> {24 push(25 Some(&ExprLocation(Rc::from(PathBuf::from("std.jsonnet")), 0, 0)),26 || format!("std.format of {}", str),27 || {28 Ok(match vals {29 Val::Arr(vals) => Val::Str(format_arr(&str, &vals.evaluated()?)?.into()),30 Val::Obj(obj) => Val::Str(format_obj(&str, &obj)?.into()),31 o => Val::Str(format_arr(&str, &[o])?.into()),32 })33 },34 )35}3637type Builtin = fn(context: Context, loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val>;3839type BuiltinsType = HashMap<Box<str>, Builtin>;4041thread_local! {42 static BUILTINS: BuiltinsType = {43 [44 ("length".into(), builtin_length as Builtin),45 ("type".into(), builtin_type),46 ("makeArray".into(), builtin_make_array),47 ("codepoint".into(), builtin_codepoint),48 ("objectFieldsEx".into(), builtin_object_fields_ex),49 ("objectHasEx".into(), builtin_object_has_ex),50 ("slice".into(), builtin_slice),51 ("primitiveEquals".into(), builtin_primitive_equals),52 ("equals".into(), builtin_equals),53 ("modulo".into(), builtin_modulo),54 ("mod".into(), builtin_mod),55 ("floor".into(), builtin_floor),56 ("log".into(), builtin_log),57 ("pow".into(), builtin_pow),58 ("extVar".into(), builtin_ext_var),59 ("native".into(), builtin_native),60 ("filter".into(), builtin_filter),61 ("map".into(), builtin_map),62 ("foldl".into(), builtin_foldl),63 ("foldr".into(), builtin_foldr),64 ("sortImpl".into(), builtin_sort_impl),65 ("format".into(), builtin_format),66 ("range".into(), builtin_range),67 ("char".into(), builtin_char),68 ("encodeUTF8".into(), builtin_encode_utf8),69 ("md5".into(), builtin_md5),70 ("base64".into(), builtin_base64),71 ("trace".into(), builtin_trace),72 ("gc".into(), builtin_gc),73 ("gcTrace".into(), builtin_gc_trace),74 ("join".into(), builtin_join),75 ("escapeStringJson".into(), builtin_escape_string_json),76 ("manifestJsonEx".into(), builtin_manifest_json_ex),77 ("reverse".into(), builtin_reverse),78 ("id".into(), builtin_id),79 ("strReplace".into(), builtin_str_replace),80 ("parseJson".into(), builtin_parse_json),81 ].iter().cloned().collect()82 };83}8485fn builtin_length(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {86 parse_args!(context, "length", args, 1, [87 0, x: ty!((string | object | array));88 ], {89 Ok(match x {90 Val::Str(n) => Val::Num(n.chars().count() as f64),91 Val::Arr(a) => Val::Num(a.len() as f64),92 Val::Obj(o) => Val::Num(93 o.fields_visibility()94 .into_iter()95 .filter(|(_k, v)| *v)96 .count() as f64,97 ),98 _ => unreachable!(),99 })100 })101}102103fn builtin_type(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {104 parse_args!(context, "type", args, 1, [105 0, x: ty!(any);106 ], {107 Ok(Val::Str(x.value_type().name().into()))108 })109}110111fn builtin_make_array(112 context: Context,113 _loc: Option<&ExprLocation>,114 args: &ArgsDesc,115) -> Result<Val> {116 parse_args!(context, "makeArray", args, 2, [117 0, sz: ty!(BoundedNumber<(Some(0.0)), (None)>) => Val::Num;118 1, func: ty!(function) => Val::Func;119 ], {120 let mut out = Vec::with_capacity(sz as usize);121 for i in 0..sz as usize {122 out.push(LazyVal::new_resolved(func.evaluate_values(123 context.clone(),124 &[Val::Num(i as f64)]125 )?))126 }127 Ok(Val::Arr(out.into()))128 })129}130131fn builtin_codepoint(132 context: Context,133 _loc: Option<&ExprLocation>,134 args: &ArgsDesc,135) -> Result<Val> {136 parse_args!(context, "codepoint", args, 1, [137 0, str: ty!(char) => Val::Str;138 ], {139 Ok(Val::Num(str.chars().next().unwrap() as u32 as f64))140 })141}142143fn builtin_object_fields_ex(144 context: Context,145 _loc: Option<&ExprLocation>,146 args: &ArgsDesc,147) -> Result<Val> {148 parse_args!(context, "objectFieldsEx", args, 2, [149 0, obj: ty!(object) => Val::Obj;150 1, inc_hidden: ty!(boolean) => Val::Bool;151 ], {152 let out = obj.fields_ex(inc_hidden);153 Ok(Val::Arr(out.into_iter().map(Val::Str).collect::<Vec<_>>().into()))154 })155}156157fn builtin_object_has_ex(158 context: Context,159 _loc: Option<&ExprLocation>,160 args: &ArgsDesc,161) -> Result<Val> {162 parse_args!(context, "objectHasEx", args, 3, [163 0, obj: ty!(object) => Val::Obj;164 1, f: ty!(string) => Val::Str;165 2, inc_hidden: ty!(boolean) => Val::Bool;166 ], {167 Ok(Val::Bool(obj.has_field_ex(f, inc_hidden)))168 })169}170171fn builtin_parse_json(172 context: Context,173 _loc: Option<&ExprLocation>,174 args: &ArgsDesc,175) -> Result<Val> {176 parse_args!(context, "parseJson", args, 1, [177 0, s: ty!(string) => Val::Str;178 ], {179 let state = EvaluationState::default();180 let path = Rc::new(PathBuf::from("std.parseJson"));181 state.evaluate_snippet_raw(path ,s)182 })183}184185// faster186fn builtin_slice(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {187 parse_args!(context, "slice", args, 4, [188 0, indexable: ty!((string | array));189 1, index: ty!((number | null));190 2, end: ty!((number | null));191 3, step: ty!((number | null));192 ], {193 let index = match index {194 Val::Num(v) => v as usize,195 Val::Null => 0,196 _ => unreachable!(),197 };198 let end = match end {199 Val::Num(v) => v as usize,200 Val::Null => match &indexable {201 Val::Str(s) => s.chars().count(),202 Val::Arr(v) => v.len(),203 _ => unreachable!()204 },205 _ => unreachable!()206 };207 let step = match step {208 Val::Num(v) => v as usize,209 Val::Null => 1,210 _ => unreachable!()211 };212 match &indexable {213 Val::Str(s) => {214 Ok(Val::Str((s.chars().skip(index).take(end-index).step_by(step).collect::<String>()).into()))215 }216 Val::Arr(arr) => {217 Ok(Val::Arr((arr.iter().skip(index).take(end-index).step_by(step).collect::<Result<Vec<Val>>>()?).into()))218 }219 _ => unreachable!()220 }221 })222}223224// faster225fn builtin_primitive_equals(226 context: Context,227 _loc: Option<&ExprLocation>,228 args: &ArgsDesc,229) -> Result<Val> {230 parse_args!(context, "primitiveEquals", args, 2, [231 0, a: ty!(any);232 1, b: ty!(any);233 ], {234 Ok(Val::Bool(primitive_equals(&a, &b)?))235 })236}237238// faster239fn builtin_equals(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {240 parse_args!(context, "equals", args, 2, [241 0, a: ty!(any);242 1, b: ty!(any);243 ], {244 Ok(Val::Bool(equals(&a, &b)?))245 })246}247248fn builtin_modulo(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {249 parse_args!(context, "modulo", args, 2, [250 0, a: ty!(number) => Val::Num;251 1, b: ty!(number) => Val::Num;252 ], {253 Ok(Val::Num(a % b))254 })255}256257fn builtin_mod(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {258 parse_args!(context, "mod", args, 2, [259 0, a: ty!((number | string));260 1, b: ty!(any);261 ], {262 match (a, b) {263 (Val::Num(a), Val::Num(b)) => Ok(Val::Num(a % b)),264 (Val::Str(str), vals) => std_format(str, vals),265 (a, b) => throw!(BinaryOperatorDoesNotOperateOnValues(BinaryOpType::Mod, a.value_type(), b.value_type()))266 }267 })268}269270fn builtin_floor(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {271 parse_args!(context, "floor", args, 1, [272 0, x: ty!(number) => Val::Num;273 ], {274 Ok(Val::Num(x.floor()))275 })276}277278fn builtin_log(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {279 parse_args!(context, "log", args, 1, [280 0, n: ty!(number) => Val::Num;281 ], {282 Ok(Val::Num(n.ln()))283 })284}285286fn builtin_pow(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {287 parse_args!(context, "pow", args, 2, [288 0, x: ty!(number) => Val::Num;289 1, n: ty!(number) => Val::Num;290 ], {291 Ok(Val::Num(x.powf(n)))292 })293}294295fn builtin_ext_var(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {296 parse_args!(context, "extVar", args, 1, [297 0, x: ty!(string) => Val::Str;298 ], {299 Ok(with_state(|s| s.settings().ext_vars.get(&x).cloned()).ok_or(UndefinedExternalVariable(x))?)300 })301}302303fn builtin_native(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {304 parse_args!(context, "native", args, 1, [305 0, x: ty!(string) => Val::Str;306 ], {307 Ok(with_state(|s| s.settings().ext_natives.get(&x).cloned()).map(|v| Val::Func(Gc::new(FuncVal::NativeExt(x.clone(), v)))).ok_or(UndefinedExternalFunction(x))?)308 })309}310311fn builtin_filter(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {312 parse_args!(context, "filter", args, 2, [313 0, func: ty!(function) => Val::Func;314 1, arr: ty!(array) => Val::Arr;315 ], {316 Ok(Val::Arr(arr.filter(|val| func317 .evaluate_values(context.clone(), &[val.clone()])?318 .try_cast_bool("filter predicate"))?))319 })320}321322fn builtin_map(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {323 parse_args!(context, "map", args, 2, [324 0, func: ty!(function) => Val::Func;325 1, arr: ty!(array) => Val::Arr;326 ], {327 Ok(Val::Arr(arr.map(|val| func328 .evaluate_values(context.clone(), &[val]))?))329 })330}331332fn builtin_foldl(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {333 parse_args!(context, "foldl", args, 3, [334 0, func: ty!(function) => Val::Func;335 1, arr: ty!(array) => Val::Arr;336 2, init: ty!(any);337 ], {338 let mut acc = init;339 for i in arr.iter() {340 acc = func.evaluate_values(context.clone(), &[acc, i?])?;341 }342 Ok(acc)343 })344}345346fn builtin_foldr(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {347 parse_args!(context, "foldr", args, 3, [348 0, func: ty!(function) => Val::Func;349 1, arr: ty!(array) => Val::Arr;350 2, init: ty!(any);351 ], {352 let mut acc = init;353 for i in arr.iter().rev() {354 acc = func.evaluate_values(context.clone(), &[acc, i?])?;355 }356 Ok(acc)357 })358}359360#[allow(non_snake_case)]361fn builtin_sort_impl(362 context: Context,363 _loc: Option<&ExprLocation>,364 args: &ArgsDesc,365) -> Result<Val> {366 parse_args!(context, "sort", args, 2, [367 0, arr: ty!(array) => Val::Arr;368 1, keyF: ty!(function) => Val::Func;369 ], {370 if arr.len() <= 1 {371 return Ok(Val::Arr(arr))372 }373 Ok(Val::Arr(ArrValue::Eager(sort::sort(context, arr.evaluated()?, &keyF)?)))374 })375}376377// faster378fn builtin_format(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {379 parse_args!(context, "format", args, 2, [380 0, str: ty!(string) => Val::Str;381 1, vals: ty!(any)382 ], {383 std_format(str, vals)384 })385}386387fn builtin_range(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {388 parse_args!(context, "range", args, 2, [389 0, from: ty!(number) => Val::Num;390 1, to: ty!(number) => Val::Num;391 ], {392 if to < from {393 return Ok(Val::Arr(ArrValue::new_eager()))394 }395 let mut out = Vec::with_capacity((1+to as usize-from as usize).max(0));396 for i in from as usize..=to as usize {397 out.push(Val::Num(i as f64));398 }399 Ok(Val::Arr(out.into()))400 })401}402403fn builtin_char(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {404 parse_args!(context, "char", args, 1, [405 0, n: ty!(number) => Val::Num;406 ], {407 let mut out = String::new();408 out.push(std::char::from_u32(n as u32).ok_or_else(||409 InvalidUnicodeCodepointGot(n as u32)410 )?);411 Ok(Val::Str(out.into()))412 })413}414415fn builtin_encode_utf8(416 context: Context,417 _loc: Option<&ExprLocation>,418 args: &ArgsDesc,419) -> Result<Val> {420 parse_args!(context, "encodeUTF8", args, 1, [421 0, str: ty!(string) => Val::Str;422 ], {423 Ok(Val::Arr((str.bytes().map(|b| Val::Num(b as f64)).collect::<Vec<Val>>()).into()))424 })425}426427fn builtin_md5(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {428 parse_args!(context, "md5", args, 1, [429 0, str: ty!(string) => Val::Str;430 ], {431 Ok(Val::Str(format!("{:x}", md5::compute(&str.as_bytes())).into()))432 })433}434435fn builtin_trace(context: Context, loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {436 parse_args!(context, "trace", args, 2, [437 0, str: ty!(string) => Val::Str;438 1, rest: ty!(any);439 ], {440 eprint!("TRACE:");441 if let Some(loc) = loc {442 with_state(|s|{443 let locs = s.map_source_locations(&loc.0, &[loc.1]);444 eprint!(" {}:{}", loc.0.file_name().unwrap().to_str().unwrap(), locs[0].line);445 });446 }447 eprintln!(" {}", str);448 Ok(rest)449 })450}451452fn builtin_gc(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {453 parse_args!(context, "gc", args, 1, [454 0, rest: ty!(any);455 ], {456 println!("GC start");457 gc::force_collect();458 println!("GC done");459460 Ok(rest)461 })462}463464fn builtin_gc_trace(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {465 parse_args!(context, "gcTrace", args, 2, [466 0, name: ty!(string) => Val::Str;467 1, rest: ty!(any);468 ], {469 Ok(DebugGcTraceValue::create(name, rest))470 })471}472473fn builtin_base64(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {474 parse_args!(context, "base64", args, 1, [475 0, input: ty!((string | (Array<number>)));476 ], {477 Ok(Val::Str(match input {478 Val::Str(s) => {479 base64::encode(s.bytes().collect::<Vec<_>>()).into()480 },481 Val::Arr(a) => {482 base64::encode(a.iter().map(|v| {483 Ok(v?.unwrap_num()? as u8)484 }).collect::<Result<Vec<_>>>()?).into()485 },486 _ => unreachable!()487 }))488 })489}490491fn builtin_join(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {492 parse_args!(context, "join", args, 2, [493 0, sep: ty!((string | array));494 1, arr: ty!(array) => Val::Arr;495 ], {496 Ok(match sep {497 Val::Arr(joiner_items) => {498 let mut out = Vec::new();499500 let mut first = true;501 for item in arr.iter() {502 let item = item?.clone();503 if let Val::Arr(items) = item {504 if !first {505 out.reserve(joiner_items.len());506 // TODO: extend507 for item in joiner_items.iter() {508 out.push(item?);509 }510 }511 first = false;512 out.reserve(items.len());513 // TODO: extend514 for item in items.iter() {515 out.push(item?);516 }517 } else {518 throw!(RuntimeError("in std.join all items should be arrays".into()));519 }520 }521522 Val::Arr(out.into())523 },524 Val::Str(sep) => {525 let mut out = String::new();526527 let mut first = true;528 for item in arr.iter() {529 let item = item?.clone();530 if let Val::Str(item) = item {531 if !first {532 out += &sep;533 }534 first = false;535 out += &item;536 } else {537 throw!(RuntimeError("in std.join all items should be strings".into()));538 }539 }540541 Val::Str(out.into())542 },543 _ => unreachable!()544 })545 })546}547548// faster549fn builtin_escape_string_json(550 context: Context,551 _loc: Option<&ExprLocation>,552 args: &ArgsDesc,553) -> Result<Val> {554 parse_args!(context, "escapeStringJson", args, 1, [555 0, str_: ty!(string) => Val::Str;556 ], {557 Ok(Val::Str(escape_string_json(&str_).into()))558 })559}560561// faster562fn builtin_manifest_json_ex(563 context: Context,564 _loc: Option<&ExprLocation>,565 args: &ArgsDesc,566) -> Result<Val> {567 parse_args!(context, "manifestJsonEx", args, 2, [568 0, value: ty!(any);569 1, indent: ty!(string) => Val::Str;570 ], {571 Ok(Val::Str(manifest_json_ex(&value, &ManifestJsonOptions {572 padding: &indent,573 mtype: ManifestType::Std,574 })?.into()))575 })576}577578// faster579fn builtin_reverse(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {580 parse_args!(context, "reverse", args, 1, [581 0, value: ty!(array) => Val::Arr;582 ], {583 Ok(Val::Arr(value.reversed()))584 })585}586587fn builtin_id(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {588 parse_args!(context, "id", args, 1, [589 0, v: ty!(any);590 ], {591 Ok(v)592 })593}594595// faster596fn builtin_str_replace(597 context: Context,598 _loc: Option<&ExprLocation>,599 args: &ArgsDesc,600) -> Result<Val> {601 parse_args!(context, "strReplace", args, 3, [602 0, str: ty!(string) => Val::Str;603 1, from: ty!(string) => Val::Str;604 2, to: ty!(string) => Val::Str;605 ], {606 let mut out = String::new();607 let mut last_idx = 0;608 while let Some(idx) = (&str[last_idx..]).find(&from as &str) {609 out.push_str(&str[last_idx..last_idx+idx]);610 out.push_str(&to);611 last_idx += idx + from.len();612 }613 if last_idx == 0 {614 return Ok(Val::Str(str))615 }616 out.push_str(&str[last_idx..]);617 Ok(Val::Str(out.into()))618 })619}620621pub fn call_builtin(622 context: Context,623 loc: Option<&ExprLocation>,624 name: &str,625 args: &ArgsDesc,626) -> Result<Val> {627 BUILTINS628 .with(|builtins| builtins.get(name).copied())629 .ok_or_else(|| IntrinsicNotFound(name.into()))?(context, loc, args)630}1use crate::{2 equals,3 error::{Error::*, Result},4 parse_args, primitive_equals, push, throw, with_state, ArrValue, Context, DebugGcTraceValue,5 EvaluationState, FuncVal, LazyVal, Val,6};7use format::{format_arr, format_obj};8use gc::Gc;9use jrsonnet_interner::IStr;10use jrsonnet_parser::{ArgsDesc, BinaryOpType, ExprLocation};11use jrsonnet_types::ty;12use std::{collections::HashMap, path::PathBuf, rc::Rc};1314pub mod stdlib;15pub use stdlib::*;1617use self::manifest::{escape_string_json, manifest_json_ex, ManifestJsonOptions, ManifestType};1819pub mod format;20pub mod manifest;21pub mod sort;2223fn std_format(str: IStr, vals: Val) -> Result<Val> {24 push(25 Some(&ExprLocation(Rc::from(PathBuf::from("std.jsonnet")), 0, 0)),26 || format!("std.format of {}", str),27 || {28 Ok(match vals {29 Val::Arr(vals) => Val::Str(format_arr(&str, &vals.evaluated()?)?.into()),30 Val::Obj(obj) => Val::Str(format_obj(&str, &obj)?.into()),31 o => Val::Str(format_arr(&str, &[o])?.into()),32 })33 },34 )35}3637type Builtin = fn(context: Context, loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val>;3839type BuiltinsType = HashMap<Box<str>, Builtin>;4041thread_local! {42 static BUILTINS: BuiltinsType = {43 [44 ("length".into(), builtin_length as Builtin),45 ("type".into(), builtin_type),46 ("makeArray".into(), builtin_make_array),47 ("codepoint".into(), builtin_codepoint),48 ("objectFieldsEx".into(), builtin_object_fields_ex),49 ("objectHasEx".into(), builtin_object_has_ex),50 ("slice".into(), builtin_slice),51 ("primitiveEquals".into(), builtin_primitive_equals),52 ("equals".into(), builtin_equals),53 ("modulo".into(), builtin_modulo),54 ("mod".into(), builtin_mod),55 ("floor".into(), builtin_floor),56 ("log".into(), builtin_log),57 ("pow".into(), builtin_pow),58 ("extVar".into(), builtin_ext_var),59 ("native".into(), builtin_native),60 ("filter".into(), builtin_filter),61 ("map".into(), builtin_map),62 ("foldl".into(), builtin_foldl),63 ("foldr".into(), builtin_foldr),64 ("sortImpl".into(), builtin_sort_impl),65 ("format".into(), builtin_format),66 ("range".into(), builtin_range),67 ("char".into(), builtin_char),68 ("encodeUTF8".into(), builtin_encode_utf8),69 ("md5".into(), builtin_md5),70 ("base64".into(), builtin_base64),71 ("trace".into(), builtin_trace),72 ("gc".into(), builtin_gc),73 ("gcTrace".into(), builtin_gc_trace),74 ("join".into(), builtin_join),75 ("escapeStringJson".into(), builtin_escape_string_json),76 ("manifestJsonEx".into(), builtin_manifest_json_ex),77 ("reverse".into(), builtin_reverse),78 ("id".into(), builtin_id),79 ("strReplace".into(), builtin_str_replace),80 ("parseJson".into(), builtin_parse_json),81 ].iter().cloned().collect()82 };83}8485fn builtin_length(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {86 parse_args!(context, "length", args, 1, [87 0, x: ty!((string | object | array));88 ], {89 Ok(match x {90 Val::Str(n) => Val::Num(n.chars().count() as f64),91 Val::Arr(a) => Val::Num(a.len() as f64),92 Val::Obj(o) => Val::Num(93 o.fields_visibility()94 .into_iter()95 .filter(|(_k, v)| *v)96 .count() as f64,97 ),98 _ => unreachable!(),99 })100 })101}102103fn builtin_type(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {104 parse_args!(context, "type", args, 1, [105 0, x: ty!(any);106 ], {107 Ok(Val::Str(x.value_type().name().into()))108 })109}110111fn builtin_make_array(112 context: Context,113 _loc: Option<&ExprLocation>,114 args: &ArgsDesc,115) -> Result<Val> {116 parse_args!(context, "makeArray", args, 2, [117 0, sz: ty!(BoundedNumber<(Some(0.0)), (None)>) => Val::Num;118 1, func: ty!(function) => Val::Func;119 ], {120 let mut out = Vec::with_capacity(sz as usize);121 for i in 0..sz as usize {122 out.push(LazyVal::new_resolved(func.evaluate_values(123 context.clone(),124 &[Val::Num(i as f64)]125 )?))126 }127 Ok(Val::Arr(out.into()))128 })129}130131fn builtin_codepoint(132 context: Context,133 _loc: Option<&ExprLocation>,134 args: &ArgsDesc,135) -> Result<Val> {136 parse_args!(context, "codepoint", args, 1, [137 0, str: ty!(char) => Val::Str;138 ], {139 Ok(Val::Num(str.chars().next().unwrap() as u32 as f64))140 })141}142143fn builtin_object_fields_ex(144 context: Context,145 _loc: Option<&ExprLocation>,146 args: &ArgsDesc,147) -> Result<Val> {148 parse_args!(context, "objectFieldsEx", args, 2, [149 0, obj: ty!(object) => Val::Obj;150 1, inc_hidden: ty!(boolean) => Val::Bool;151 ], {152 let out = obj.fields_ex(inc_hidden);153 Ok(Val::Arr(out.into_iter().map(Val::Str).collect::<Vec<_>>().into()))154 })155}156157fn builtin_object_has_ex(158 context: Context,159 _loc: Option<&ExprLocation>,160 args: &ArgsDesc,161) -> Result<Val> {162 parse_args!(context, "objectHasEx", args, 3, [163 0, obj: ty!(object) => Val::Obj;164 1, f: ty!(string) => Val::Str;165 2, inc_hidden: ty!(boolean) => Val::Bool;166 ], {167 Ok(Val::Bool(obj.has_field_ex(f, inc_hidden)))168 })169}170171fn builtin_parse_json(172 context: Context,173 _loc: Option<&ExprLocation>,174 args: &ArgsDesc,175) -> Result<Val> {176 parse_args!(context, "parseJson", args, 1, [177 0, s: ty!(string) => Val::Str;178 ], {179 let state = EvaluationState::default();180 let path = PathBuf::from("std.parseJson").into();181 state.evaluate_snippet_raw(path ,s)182 })183}184185// faster186fn builtin_slice(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {187 parse_args!(context, "slice", args, 4, [188 0, indexable: ty!((string | array));189 1, index: ty!((number | null));190 2, end: ty!((number | null));191 3, step: ty!((number | null));192 ], {193 let index = match index {194 Val::Num(v) => v as usize,195 Val::Null => 0,196 _ => unreachable!(),197 };198 let end = match end {199 Val::Num(v) => v as usize,200 Val::Null => match &indexable {201 Val::Str(s) => s.chars().count(),202 Val::Arr(v) => v.len(),203 _ => unreachable!()204 },205 _ => unreachable!()206 };207 let step = match step {208 Val::Num(v) => v as usize,209 Val::Null => 1,210 _ => unreachable!()211 };212 match &indexable {213 Val::Str(s) => {214 Ok(Val::Str((s.chars().skip(index).take(end-index).step_by(step).collect::<String>()).into()))215 }216 Val::Arr(arr) => {217 Ok(Val::Arr((arr.iter().skip(index).take(end-index).step_by(step).collect::<Result<Vec<Val>>>()?).into()))218 }219 _ => unreachable!()220 }221 })222}223224// faster225fn builtin_primitive_equals(226 context: Context,227 _loc: Option<&ExprLocation>,228 args: &ArgsDesc,229) -> Result<Val> {230 parse_args!(context, "primitiveEquals", args, 2, [231 0, a: ty!(any);232 1, b: ty!(any);233 ], {234 Ok(Val::Bool(primitive_equals(&a, &b)?))235 })236}237238// faster239fn builtin_equals(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {240 parse_args!(context, "equals", args, 2, [241 0, a: ty!(any);242 1, b: ty!(any);243 ], {244 Ok(Val::Bool(equals(&a, &b)?))245 })246}247248fn builtin_modulo(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {249 parse_args!(context, "modulo", args, 2, [250 0, a: ty!(number) => Val::Num;251 1, b: ty!(number) => Val::Num;252 ], {253 Ok(Val::Num(a % b))254 })255}256257fn builtin_mod(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {258 parse_args!(context, "mod", args, 2, [259 0, a: ty!((number | string));260 1, b: ty!(any);261 ], {262 match (a, b) {263 (Val::Num(a), Val::Num(b)) => Ok(Val::Num(a % b)),264 (Val::Str(str), vals) => std_format(str, vals),265 (a, b) => throw!(BinaryOperatorDoesNotOperateOnValues(BinaryOpType::Mod, a.value_type(), b.value_type()))266 }267 })268}269270fn builtin_floor(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {271 parse_args!(context, "floor", args, 1, [272 0, x: ty!(number) => Val::Num;273 ], {274 Ok(Val::Num(x.floor()))275 })276}277278fn builtin_log(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {279 parse_args!(context, "log", args, 1, [280 0, n: ty!(number) => Val::Num;281 ], {282 Ok(Val::Num(n.ln()))283 })284}285286fn builtin_pow(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {287 parse_args!(context, "pow", args, 2, [288 0, x: ty!(number) => Val::Num;289 1, n: ty!(number) => Val::Num;290 ], {291 Ok(Val::Num(x.powf(n)))292 })293}294295fn builtin_ext_var(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {296 parse_args!(context, "extVar", args, 1, [297 0, x: ty!(string) => Val::Str;298 ], {299 Ok(with_state(|s| s.settings().ext_vars.get(&x).cloned()).ok_or(UndefinedExternalVariable(x))?)300 })301}302303fn builtin_native(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {304 parse_args!(context, "native", args, 1, [305 0, x: ty!(string) => Val::Str;306 ], {307 Ok(with_state(|s| s.settings().ext_natives.get(&x).cloned()).map(|v| Val::Func(Gc::new(FuncVal::NativeExt(x.clone(), v)))).ok_or(UndefinedExternalFunction(x))?)308 })309}310311fn builtin_filter(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {312 parse_args!(context, "filter", args, 2, [313 0, func: ty!(function) => Val::Func;314 1, arr: ty!(array) => Val::Arr;315 ], {316 Ok(Val::Arr(arr.filter(|val| func317 .evaluate_values(context.clone(), &[val.clone()])?318 .try_cast_bool("filter predicate"))?))319 })320}321322fn builtin_map(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {323 parse_args!(context, "map", args, 2, [324 0, func: ty!(function) => Val::Func;325 1, arr: ty!(array) => Val::Arr;326 ], {327 Ok(Val::Arr(arr.map(|val| func328 .evaluate_values(context.clone(), &[val]))?))329 })330}331332fn builtin_foldl(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {333 parse_args!(context, "foldl", args, 3, [334 0, func: ty!(function) => Val::Func;335 1, arr: ty!(array) => Val::Arr;336 2, init: ty!(any);337 ], {338 let mut acc = init;339 for i in arr.iter() {340 acc = func.evaluate_values(context.clone(), &[acc, i?])?;341 }342 Ok(acc)343 })344}345346fn builtin_foldr(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {347 parse_args!(context, "foldr", args, 3, [348 0, func: ty!(function) => Val::Func;349 1, arr: ty!(array) => Val::Arr;350 2, init: ty!(any);351 ], {352 let mut acc = init;353 for i in arr.iter().rev() {354 acc = func.evaluate_values(context.clone(), &[acc, i?])?;355 }356 Ok(acc)357 })358}359360#[allow(non_snake_case)]361fn builtin_sort_impl(362 context: Context,363 _loc: Option<&ExprLocation>,364 args: &ArgsDesc,365) -> Result<Val> {366 parse_args!(context, "sort", args, 2, [367 0, arr: ty!(array) => Val::Arr;368 1, keyF: ty!(function) => Val::Func;369 ], {370 if arr.len() <= 1 {371 return Ok(Val::Arr(arr))372 }373 Ok(Val::Arr(ArrValue::Eager(sort::sort(context, arr.evaluated()?, &keyF)?)))374 })375}376377// faster378fn builtin_format(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {379 parse_args!(context, "format", args, 2, [380 0, str: ty!(string) => Val::Str;381 1, vals: ty!(any)382 ], {383 std_format(str, vals)384 })385}386387fn builtin_range(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {388 parse_args!(context, "range", args, 2, [389 0, from: ty!(number) => Val::Num;390 1, to: ty!(number) => Val::Num;391 ], {392 if to < from {393 return Ok(Val::Arr(ArrValue::new_eager()))394 }395 let mut out = Vec::with_capacity((1+to as usize-from as usize).max(0));396 for i in from as usize..=to as usize {397 out.push(Val::Num(i as f64));398 }399 Ok(Val::Arr(out.into()))400 })401}402403fn builtin_char(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {404 parse_args!(context, "char", args, 1, [405 0, n: ty!(number) => Val::Num;406 ], {407 let mut out = String::new();408 out.push(std::char::from_u32(n as u32).ok_or_else(||409 InvalidUnicodeCodepointGot(n as u32)410 )?);411 Ok(Val::Str(out.into()))412 })413}414415fn builtin_encode_utf8(416 context: Context,417 _loc: Option<&ExprLocation>,418 args: &ArgsDesc,419) -> Result<Val> {420 parse_args!(context, "encodeUTF8", args, 1, [421 0, str: ty!(string) => Val::Str;422 ], {423 Ok(Val::Arr((str.bytes().map(|b| Val::Num(b as f64)).collect::<Vec<Val>>()).into()))424 })425}426427fn builtin_md5(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {428 parse_args!(context, "md5", args, 1, [429 0, str: ty!(string) => Val::Str;430 ], {431 Ok(Val::Str(format!("{:x}", md5::compute(&str.as_bytes())).into()))432 })433}434435fn builtin_trace(context: Context, loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {436 parse_args!(context, "trace", args, 2, [437 0, str: ty!(string) => Val::Str;438 1, rest: ty!(any);439 ], {440 eprint!("TRACE:");441 if let Some(loc) = loc {442 with_state(|s|{443 let locs = s.map_source_locations(&loc.0, &[loc.1]);444 eprint!(" {}:{}", loc.0.file_name().unwrap().to_str().unwrap(), locs[0].line);445 });446 }447 eprintln!(" {}", str);448 Ok(rest)449 })450}451452fn builtin_gc(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {453 parse_args!(context, "gc", args, 1, [454 0, rest: ty!(any);455 ], {456 println!("GC start");457 gc::force_collect();458 println!("GC done");459460 Ok(rest)461 })462}463464fn builtin_gc_trace(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {465 parse_args!(context, "gcTrace", args, 2, [466 0, name: ty!(string) => Val::Str;467 1, rest: ty!(any);468 ], {469 Ok(DebugGcTraceValue::create(name, rest))470 })471}472473fn builtin_base64(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {474 parse_args!(context, "base64", args, 1, [475 0, input: ty!((string | (Array<number>)));476 ], {477 Ok(Val::Str(match input {478 Val::Str(s) => {479 base64::encode(s.bytes().collect::<Vec<_>>()).into()480 },481 Val::Arr(a) => {482 base64::encode(a.iter().map(|v| {483 Ok(v?.unwrap_num()? as u8)484 }).collect::<Result<Vec<_>>>()?).into()485 },486 _ => unreachable!()487 }))488 })489}490491fn builtin_join(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {492 parse_args!(context, "join", args, 2, [493 0, sep: ty!((string | array));494 1, arr: ty!(array) => Val::Arr;495 ], {496 Ok(match sep {497 Val::Arr(joiner_items) => {498 let mut out = Vec::new();499500 let mut first = true;501 for item in arr.iter() {502 let item = item?.clone();503 if let Val::Arr(items) = item {504 if !first {505 out.reserve(joiner_items.len());506 // TODO: extend507 for item in joiner_items.iter() {508 out.push(item?);509 }510 }511 first = false;512 out.reserve(items.len());513 // TODO: extend514 for item in items.iter() {515 out.push(item?);516 }517 } else {518 throw!(RuntimeError("in std.join all items should be arrays".into()));519 }520 }521522 Val::Arr(out.into())523 },524 Val::Str(sep) => {525 let mut out = String::new();526527 let mut first = true;528 for item in arr.iter() {529 let item = item?.clone();530 if let Val::Str(item) = item {531 if !first {532 out += &sep;533 }534 first = false;535 out += &item;536 } else {537 throw!(RuntimeError("in std.join all items should be strings".into()));538 }539 }540541 Val::Str(out.into())542 },543 _ => unreachable!()544 })545 })546}547548// faster549fn builtin_escape_string_json(550 context: Context,551 _loc: Option<&ExprLocation>,552 args: &ArgsDesc,553) -> Result<Val> {554 parse_args!(context, "escapeStringJson", args, 1, [555 0, str_: ty!(string) => Val::Str;556 ], {557 Ok(Val::Str(escape_string_json(&str_).into()))558 })559}560561// faster562fn builtin_manifest_json_ex(563 context: Context,564 _loc: Option<&ExprLocation>,565 args: &ArgsDesc,566) -> Result<Val> {567 parse_args!(context, "manifestJsonEx", args, 2, [568 0, value: ty!(any);569 1, indent: ty!(string) => Val::Str;570 ], {571 Ok(Val::Str(manifest_json_ex(&value, &ManifestJsonOptions {572 padding: &indent,573 mtype: ManifestType::Std,574 })?.into()))575 })576}577578// faster579fn builtin_reverse(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {580 parse_args!(context, "reverse", args, 1, [581 0, value: ty!(array) => Val::Arr;582 ], {583 Ok(Val::Arr(value.reversed()))584 })585}586587fn builtin_id(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {588 parse_args!(context, "id", args, 1, [589 0, v: ty!(any);590 ], {591 Ok(v)592 })593}594595// faster596fn builtin_str_replace(597 context: Context,598 _loc: Option<&ExprLocation>,599 args: &ArgsDesc,600) -> Result<Val> {601 parse_args!(context, "strReplace", args, 3, [602 0, str: ty!(string) => Val::Str;603 1, from: ty!(string) => Val::Str;604 2, to: ty!(string) => Val::Str;605 ], {606 let mut out = String::new();607 let mut last_idx = 0;608 while let Some(idx) = (&str[last_idx..]).find(&from as &str) {609 out.push_str(&str[last_idx..last_idx+idx]);610 out.push_str(&to);611 last_idx += idx + from.len();612 }613 if last_idx == 0 {614 return Ok(Val::Str(str))615 }616 out.push_str(&str[last_idx..]);617 Ok(Val::Str(out.into()))618 })619}620621pub fn call_builtin(622 context: Context,623 loc: Option<&ExprLocation>,624 name: &str,625 args: &ArgsDesc,626) -> Result<Val> {627 BUILTINS628 .with(|builtins| builtins.get(name).copied())629 .ok_or_else(|| IntrinsicNotFound(name.into()))?(context, loc, args)630}crates/jrsonnet-evaluator/src/builtin/stdlib.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/builtin/stdlib.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/stdlib.rs
@@ -1,5 +1,5 @@
use jrsonnet_parser::{LocExpr, ParserSettings};
-use std::{path::PathBuf, rc::Rc};
+use std::path::PathBuf;
thread_local! {
/// To avoid parsing again when issued from the same thread
@@ -25,7 +25,7 @@
jrsonnet_stdlib::STDLIB_STR,
&ParserSettings {
loc_data: true,
- file_name: Rc::new(PathBuf::from("std.jsonnet")),
+ file_name: PathBuf::from("std.jsonnet").into(),
},
)
.unwrap()
crates/jrsonnet-evaluator/src/error.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/error.rs
+++ b/crates/jrsonnet-evaluator/src/error.rs
@@ -6,7 +6,10 @@
use jrsonnet_interner::IStr;
use jrsonnet_parser::{BinaryOpType, ExprLocation, UnaryOpType};
use jrsonnet_types::ValType;
-use std::{path::PathBuf, rc::Rc};
+use std::{
+ path::{Path, PathBuf},
+ rc::Rc,
+};
use thiserror::Error;
#[derive(Error, Debug, Clone, Trace, Finalize)]
@@ -87,7 +90,7 @@
.source_code.chars().nth(error.location.offset).map(|c| c.to_string()).unwrap_or_else(|| "EOF".into())
)]
ImportSyntaxError {
- path: Rc<PathBuf>,
+ path: Rc<Path>,
source_code: IStr,
#[unsafe_ignore_trace]
error: Box<jrsonnet_parser::ParseError>,
crates/jrsonnet-evaluator/src/evaluate.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/evaluate.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate.rs
@@ -12,7 +12,7 @@
};
use jrsonnet_types::ValType;
use rustc_hash::{FxHashMap, FxHasher};
-use std::{collections::HashMap, hash::BuildHasherDefault, rc::Rc};
+use std::{collections::HashMap, hash::BuildHasherDefault};
pub fn evaluate_binding_in_future(
b: &BindSpec,
@@ -843,26 +843,26 @@
}
}
Import(path) => {
- let mut tmp = loc
+ let tmp = loc
.clone()
.expect("imports cannot be used without loc_data")
.0;
- let import_location = Rc::make_mut(&mut tmp);
+ let mut import_location = tmp.to_path_buf();
import_location.pop();
push(
loc.as_ref(),
|| format!("import {:?}", path),
- || with_state(|s| s.import_file(import_location, path)),
+ || with_state(|s| s.import_file(&import_location, path)),
)?
}
ImportStr(path) => {
- let mut tmp = loc
+ let tmp = loc
.clone()
.expect("imports cannot be used without loc_data")
.0;
- let import_location = Rc::make_mut(&mut tmp);
+ let mut import_location = tmp.to_path_buf();
import_location.pop();
- Val::Str(with_state(|s| s.import_file_str(import_location, path))?)
+ Val::Str(with_state(|s| s.import_file_str(&import_location, path))?)
}
})
}
crates/jrsonnet-evaluator/src/import.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/import.rs
+++ b/crates/jrsonnet-evaluator/src/import.rs
@@ -6,17 +6,23 @@
use jrsonnet_interner::IStr;
use std::fs;
use std::io::Read;
-use std::{any::Any, cell::RefCell, collections::HashMap, path::PathBuf, rc::Rc};
+use std::{
+ any::Any,
+ cell::RefCell,
+ collections::HashMap,
+ path::{Path, PathBuf},
+ rc::Rc,
+};
/// Implements file resolution logic for `import` and `importStr`
pub trait ImportResolver {
/// Resolves real file path, e.g. `(/home/user/manifests, b.libjsonnet)` can correspond
/// both to `/home/user/manifests/b.libjsonnet` and to `/home/user/${vendor}/b.libjsonnet`
/// where `${vendor}` is a library path.
- fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>>;
+ fn resolve_file(&self, from: &Path, path: &Path) -> Result<Rc<Path>>;
/// Reads file from filesystem, should be used only with path received from `resolve_file`
- fn load_file_contents(&self, resolved: &PathBuf) -> Result<IStr>;
+ fn load_file_contents(&self, resolved: &Path) -> Result<IStr>;
/// # Safety
///
@@ -29,11 +35,11 @@
/// Dummy resolver, can't resolve/load any file
pub struct DummyImportResolver;
impl ImportResolver for DummyImportResolver {
- fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>> {
- throw!(ImportNotSupported(from.clone(), path.clone()))
+ fn resolve_file(&self, from: &Path, path: &Path) -> Result<Rc<Path>> {
+ throw!(ImportNotSupported(from.into(), path.into()))
}
- fn load_file_contents(&self, _resolved: &PathBuf) -> Result<IStr> {
+ fn load_file_contents(&self, _resolved: &Path) -> Result<IStr> {
// Can be only caused by library direct consumer, not by supplied jsonnet
panic!("dummy resolver can't load any file")
}
@@ -57,27 +63,27 @@
pub library_paths: Vec<PathBuf>,
}
impl ImportResolver for FileImportResolver {
- fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>> {
- let mut new_path = from.clone();
- new_path.push(path);
- if new_path.exists() {
- Ok(Rc::new(new_path))
+ fn resolve_file(&self, from: &Path, path: &Path) -> Result<Rc<Path>> {
+ let mut direct = from.to_path_buf();
+ direct.push(path);
+ if direct.exists() {
+ Ok(direct.into())
} else {
for library_path in self.library_paths.iter() {
let mut cloned = library_path.clone();
cloned.push(path);
if cloned.exists() {
- return Ok(Rc::new(cloned));
+ return Ok(cloned.into());
}
}
- throw!(ImportFileNotFound(from.clone(), path.clone()))
+ throw!(ImportFileNotFound(from.to_owned(), path.to_owned()))
}
}
- fn load_file_contents(&self, id: &PathBuf) -> Result<IStr> {
- let mut file = File::open(id).map_err(|_e| ResolvedFileNotFound(id.clone()))?;
+ fn load_file_contents(&self, id: &Path) -> Result<IStr> {
+ let mut file = File::open(id).map_err(|_e| ResolvedFileNotFound(id.to_owned()))?;
let mut out = String::new();
file.read_to_string(&mut out)
- .map_err(|_e| ImportBadFileUtf8(id.clone()))?;
+ .map_err(|_e| ImportBadFileUtf8(id.to_owned()))?;
Ok(out.into())
}
unsafe fn as_any(&self) -> &dyn Any {
@@ -89,23 +95,23 @@
/// Caches results of the underlying resolver
pub struct CachingImportResolver {
- resolution_cache: RefCell<HashMap<ResolutionData, Result<Rc<PathBuf>>>>,
+ resolution_cache: RefCell<HashMap<ResolutionData, Result<Rc<Path>>>>,
loading_cache: RefCell<HashMap<PathBuf, Result<IStr>>>,
inner: Box<dyn ImportResolver>,
}
impl ImportResolver for CachingImportResolver {
- fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>> {
+ fn resolve_file(&self, from: &Path, path: &Path) -> Result<Rc<Path>> {
self.resolution_cache
.borrow_mut()
- .entry((from.clone(), path.clone()))
+ .entry((from.to_owned(), path.to_owned()))
.or_insert_with(|| self.inner.resolve_file(from, path))
.clone()
}
- fn load_file_contents(&self, resolved: &PathBuf) -> Result<IStr> {
+ fn load_file_contents(&self, resolved: &Path) -> Result<IStr> {
self.loading_cache
.borrow_mut()
- .entry(resolved.clone())
+ .entry(resolved.to_owned())
.or_insert_with(|| self.inner.load_file_contents(resolved))
.clone()
}
crates/jrsonnet-evaluator/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/lib.rs
+++ b/crates/jrsonnet-evaluator/src/lib.rs
@@ -27,7 +27,7 @@
pub use function::parse_function_call;
use gc::{Finalize, Gc, Trace};
pub use import::*;
-use jrsonnet_interner::IStr;
+pub use jrsonnet_interner::IStr;
use jrsonnet_parser::*;
use native::NativeCallback;
pub use obj::*;
@@ -37,7 +37,7 @@
collections::HashMap,
fmt::Debug,
hash::BuildHasherDefault,
- path::PathBuf,
+ path::{Path, PathBuf},
rc::Rc,
};
use trace::{offset_to_location, CodeLocation, CompactFormat, TraceFormat};
@@ -110,8 +110,8 @@
/// Used for stack overflow detection, stacktrace is populated on unwind
stack_depth: usize,
/// Contains file source codes and evaluation results for imports and pretty-printed stacktraces
- files: HashMap<Rc<PathBuf>, FileData>,
- str_files: HashMap<Rc<PathBuf>, IStr>,
+ files: HashMap<Rc<Path>, FileData>,
+ str_files: HashMap<Rc<Path>, IStr>,
}
pub struct FileData {
@@ -157,7 +157,7 @@
impl EvaluationState {
/// Parses and adds file as loaded
- pub fn add_file(&self, path: Rc<PathBuf>, source_code: IStr) -> Result<()> {
+ pub fn add_file(&self, path: Rc<Path>, source_code: IStr) -> Result<()> {
self.add_parsed_file(
path.clone(),
source_code.clone(),
@@ -170,7 +170,7 @@
)
.map_err(|error| ImportSyntaxError {
error: Box::new(error),
- path,
+ path: path.to_owned(),
source_code,
})?,
)?;
@@ -181,7 +181,7 @@
/// Adds file by source code and parsed expr
pub fn add_parsed_file(
&self,
- name: Rc<PathBuf>,
+ name: Rc<Path>,
source_code: IStr,
parsed: LocExpr,
) -> Result<()> {
@@ -196,20 +196,20 @@
Ok(())
}
- pub fn get_source(&self, name: &PathBuf) -> Option<IStr> {
+ pub fn get_source(&self, name: &Path) -> Option<IStr> {
let ro_map = &self.data().files;
ro_map.get(name).map(|value| value.source_code.clone())
}
- pub fn map_source_locations(&self, file: &PathBuf, locs: &[usize]) -> Vec<CodeLocation> {
+ pub fn map_source_locations(&self, file: &Path, locs: &[usize]) -> Vec<CodeLocation> {
offset_to_location(&self.get_source(file).unwrap(), locs)
}
- pub(crate) fn import_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Val> {
+ pub(crate) fn import_file(&self, from: &Path, path: &Path) -> Result<Val> {
let file_path = self.resolve_file(from, path)?;
{
let data = self.data();
let files = &data.files;
- if files.contains_key(&file_path) {
+ if files.contains_key(&file_path as &Path) {
drop(data);
return self.evaluate_loaded_file_raw(&file_path);
}
@@ -218,7 +218,7 @@
self.add_file(file_path.clone(), contents)?;
self.evaluate_loaded_file_raw(&file_path)
}
- pub(crate) fn import_file_str(&self, from: &PathBuf, path: &PathBuf) -> Result<IStr> {
+ pub(crate) fn import_file_str(&self, from: &Path, path: &Path) -> Result<IStr> {
let path = self.resolve_file(from, path)?;
if !self.data().str_files.contains_key(&path) {
let file_str = self.load_file_contents(&path)?;
@@ -227,7 +227,7 @@
Ok(self.data().str_files.get(&path).cloned().unwrap())
}
- fn evaluate_loaded_file_raw(&self, name: &PathBuf) -> Result<Val> {
+ fn evaluate_loaded_file_raw(&self, name: &Path) -> Result<Val> {
let expr: LocExpr = {
let ro_map = &self.data().files;
let value = ro_map
@@ -253,7 +253,7 @@
/// Adds standard library global variable (std) to this evaluator
pub fn with_stdlib(&self) -> &Self {
use jrsonnet_stdlib::STDLIB_STR;
- let std_path = Rc::new(PathBuf::from("std.jsonnet"));
+ let std_path: Rc<Path> = PathBuf::from("std.jsonnet").into();
self.run_in_state(|| {
self.add_parsed_file(
std_path.clone(),
@@ -381,14 +381,14 @@
/// Raw methods evaluate passed values but don't perform TLA execution
impl EvaluationState {
- pub fn evaluate_file_raw(&self, name: &PathBuf) -> Result<Val> {
+ pub fn evaluate_file_raw(&self, name: &Path) -> Result<Val> {
self.run_in_state(|| self.import_file(&std::env::current_dir().expect("cwd"), name))
}
- pub fn evaluate_file_raw_nocwd(&self, name: &PathBuf) -> Result<Val> {
+ pub fn evaluate_file_raw_nocwd(&self, name: &Path) -> Result<Val> {
self.run_in_state(|| self.import_file(&PathBuf::from("."), name))
}
/// Parses and evaluates the given snippet
- pub fn evaluate_snippet_raw(&self, source: Rc<PathBuf>, code: IStr) -> Result<Val> {
+ pub fn evaluate_snippet_raw(&self, source: Rc<Path>, code: IStr) -> Result<Val> {
let parsed = parse(
&code,
&ParserSettings {
@@ -420,7 +420,7 @@
}
pub fn add_ext_code(&self, name: IStr, code: IStr) -> Result<()> {
let value =
- self.evaluate_snippet_raw(Rc::new(PathBuf::from(format!("ext_code {}", name))), code)?;
+ self.evaluate_snippet_raw(PathBuf::from(format!("ext_code {}", name)).into(), code)?;
self.add_ext_var(name, value);
Ok(())
}
@@ -433,15 +433,15 @@
}
pub fn add_tla_code(&self, name: IStr, code: IStr) -> Result<()> {
let value =
- self.evaluate_snippet_raw(Rc::new(PathBuf::from(format!("tla_code {}", name))), code)?;
+ self.evaluate_snippet_raw(PathBuf::from(format!("tla_code {}", name)).into(), code)?;
self.add_tla(name, value);
Ok(())
}
- pub fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>> {
+ pub fn resolve_file(&self, from: &Path, path: &Path) -> Result<Rc<Path>> {
self.settings().import_resolver.resolve_file(from, path)
}
- pub fn load_file_contents(&self, path: &PathBuf) -> Result<IStr> {
+ pub fn load_file_contents(&self, path: &Path) -> Result<IStr> {
self.settings().import_resolver.load_file_contents(path)
}
@@ -494,7 +494,10 @@
use gc::Gc;
use jrsonnet_interner::IStr;
use jrsonnet_parser::*;
- use std::{path::PathBuf, rc::Rc};
+ use std::{
+ path::{Path, PathBuf},
+ rc::Rc,
+ };
#[test]
#[should_panic]
@@ -503,19 +506,11 @@
state.run_in_state(|| {
state
.push(
- Some(&ExprLocation(
- Rc::new(PathBuf::from("test1.jsonnet")),
- 10,
- 20,
- )),
+ Some(&ExprLocation(PathBuf::from("test1.jsonnet").into(), 10, 20)),
|| "outer".to_owned(),
|| {
state.push(
- Some(&ExprLocation(
- Rc::new(PathBuf::from("test2.jsonnet")),
- 30,
- 40,
- )),
+ Some(&ExprLocation(PathBuf::from("test2.jsonnet").into(), 30, 40)),
|| "inner".to_owned(),
|| Err(RuntimeError("".into()).into()),
)?;
@@ -533,7 +528,7 @@
assert!(primitive_equals(
&state
.evaluate_snippet_raw(
- Rc::new(PathBuf::from("raw.jsonnet")),
+ PathBuf::from("raw.jsonnet").into(),
r#"std.assertEqual(std.base64("test"), "dGVzdA==")"#.into()
)
.unwrap(),
@@ -546,7 +541,7 @@
($str: expr) => {
EvaluationState::default()
.with_stdlib()
- .evaluate_snippet_raw(Rc::new(PathBuf::from("raw.jsonnet")), $str.into())
+ .evaluate_snippet_raw(PathBuf::from("raw.jsonnet").into(), $str.into())
.unwrap()
};
}
@@ -556,7 +551,7 @@
evaluator.with_stdlib();
evaluator.run_in_state(|| {
evaluator
- .evaluate_snippet_raw(Rc::new(PathBuf::from("raw.jsonnet")), $str.into())
+ .evaluate_snippet_raw(PathBuf::from("raw.jsonnet").into(), $str.into())
.unwrap()
.to_json(0)
.unwrap()
@@ -913,7 +908,10 @@
"{:?}",
jrsonnet_parser::parse(
"{ x: 1, y: 2 } == { x: 1, y: 2 }",
- &ParserSettings::default()
+ &ParserSettings {
+ file_name: PathBuf::from("equality").into(),
+ loc_data: true,
+ }
)
);
assert_eval!("{ x: 1, y: 2 } == { x: 1, y: 2 }")
@@ -929,10 +927,10 @@
#[derive(gc::Trace, gc::Finalize)]
struct NativeAdd;
impl NativeCallbackHandler for NativeAdd {
- fn call(&self, from: Option<Rc<PathBuf>>, args: &[Val]) -> crate::error::Result<Val> {
+ fn call(&self, from: Option<Rc<Path>>, args: &[Val]) -> crate::error::Result<Val> {
assert_eq!(
- from.unwrap(),
- Rc::new(PathBuf::from("native_caller.jsonnet"))
+ &from.unwrap() as &Path,
+ &PathBuf::from("native_caller.jsonnet")
);
match (&args[0], &args[1]) {
(Val::Num(a), Val::Num(b)) => Ok(Val::Num(a + b)),
@@ -951,7 +949,7 @@
)),
);
evaluator.evaluate_snippet_raw(
- Rc::new(PathBuf::from("native_caller.jsonnet")),
+ PathBuf::from("native_caller.jsonnet").into(),
"std.assertEqual(std.native(\"native_add\")(1, 2), 3)".into(),
)?;
Ok(())
@@ -1003,11 +1001,11 @@
struct TestImportResolver(IStr);
impl crate::import::ImportResolver for TestImportResolver {
- fn resolve_file(&self, _: &PathBuf, _: &PathBuf) -> crate::error::Result<Rc<PathBuf>> {
- Ok(Rc::new(PathBuf::from("/test")))
+ fn resolve_file(&self, _: &Path, _: &Path) -> crate::error::Result<Rc<Path>> {
+ Ok(PathBuf::from("/test").into())
}
- fn load_file_contents(&self, _: &PathBuf) -> crate::error::Result<IStr> {
+ fn load_file_contents(&self, _: &Path) -> crate::error::Result<IStr> {
Ok(self.0.clone())
}
@@ -1030,7 +1028,7 @@
let error = state
.evaluate_snippet_raw(
- Rc::new(PathBuf::from("issue40.jsonnet")),
+ PathBuf::from("issue40.jsonnet").into(),
r#"
local conf = {
n: ""
crates/jrsonnet-evaluator/src/native.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/native.rs
+++ b/crates/jrsonnet-evaluator/src/native.rs
@@ -4,11 +4,11 @@
use gc::{Finalize, Trace};
use jrsonnet_parser::ParamsDesc;
use std::fmt::Debug;
-use std::path::PathBuf;
+use std::path::Path;
use std::rc::Rc;
pub trait NativeCallbackHandler: Trace {
- fn call(&self, from: Option<Rc<PathBuf>>, args: &[Val]) -> Result<Val>;
+ fn call(&self, from: Option<Rc<Path>>, args: &[Val]) -> Result<Val>;
}
#[derive(Trace, Finalize)]
@@ -20,7 +20,7 @@
pub fn new(params: ParamsDesc, handler: Box<dyn NativeCallbackHandler>) -> Self {
Self { params, handler }
}
- pub fn call(&self, caller: Option<Rc<PathBuf>>, args: &[Val]) -> Result<Val> {
+ pub fn call(&self, caller: Option<Rc<Path>>, args: &[Val]) -> Result<Val> {
self.handler.call(caller, args)
}
}
crates/jrsonnet-evaluator/src/trace/mod.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/trace/mod.rs
+++ b/crates/jrsonnet-evaluator/src/trace/mod.rs
@@ -2,7 +2,7 @@
use crate::{error::Error, EvaluationState, LocError};
pub use location::*;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
/// The way paths should be displayed
pub enum PathResolver {
@@ -15,7 +15,7 @@
}
impl PathResolver {
- pub fn resolve(&self, from: &PathBuf) -> String {
+ pub fn resolve(&self, from: &Path) -> String {
match self {
Self::FileName => from.file_name().unwrap().to_string_lossy().into_owned(),
Self::Absolute => from.to_string_lossy().into_owned(),
@@ -255,7 +255,7 @@
&self,
out: &mut dyn std::fmt::Write,
source: &str,
- origin: &PathBuf,
+ origin: &Path,
start: &CodeLocation,
end: &CodeLocation,
desc: &str,
crates/jrsonnet-parser/src/expr.rsdiffbeforeafterboth--- a/crates/jrsonnet-parser/src/expr.rs
+++ b/crates/jrsonnet-parser/src/expr.rs
@@ -7,7 +7,7 @@
use std::{
fmt::{Debug, Display},
ops::Deref,
- path::PathBuf,
+ path::{Path, PathBuf},
rc::Rc,
};
@@ -405,7 +405,7 @@
#[cfg_attr(feature = "serialize", derive(Serialize))]
#[cfg_attr(feature = "deserialize", derive(Deserialize))]
#[derive(Clone, PartialEq)]
-pub struct ExprLocation(pub Rc<PathBuf>, pub usize, pub usize);
+pub struct ExprLocation(pub Rc<Path>, pub usize, pub usize);
impl Finalize for ExprLocation {}
unsafe impl Trace for ExprLocation {
unsafe_empty_trace!();
crates/jrsonnet-parser/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-parser/src/lib.rs
+++ b/crates/jrsonnet-parser/src/lib.rs
@@ -1,15 +1,17 @@
#![allow(clippy::redundant_closure_call)]
use peg::parser;
-use std::{path::PathBuf, rc::Rc};
+use std::{
+ path::{Path, PathBuf},
+ rc::Rc,
+};
mod expr;
pub use expr::*;
pub use peg;
-#[derive(Default)]
pub struct ParserSettings {
pub loc_data: bool,
- pub file_name: Rc<PathBuf>,
+ pub file_name: Rc<Path>,
}
parser! {
@@ -304,7 +306,6 @@
use super::{expr::*, parse};
use crate::ParserSettings;
use std::path::PathBuf;
- use std::rc::Rc;
macro_rules! parse {
($s:expr) => {
@@ -312,7 +313,7 @@
$s,
&ParserSettings {
loc_data: false,
- file_name: Rc::new(PathBuf::from("/test.jsonnet")),
+ file_name: PathBuf::from("/test.jsonnet").into(),
},
)
.unwrap()