difftreelog
style fix clippy warnings
in: master
4 files changed
crates/jrsonnet-evaluator/src/builtin/mod.rsdiffbeforeafterboth1use std::{2 collections::HashMap,3 convert::{TryFrom, TryInto},4};56use format::{format_arr, format_obj};7use gcmodule::Cc;8use jrsonnet_interner::IStr;9use serde::Deserialize;10use serde_yaml::DeserializingQuirks;1112use crate::{13 builtin::manifest::{manifest_yaml_ex, ManifestYamlOptions},14 error::{Error::*, Result},15 function::{CallLocation, StaticBuiltin},16 operator::evaluate_mod_op,17 push_frame, throw,18 typed::{Any, BoundedUsize, Bytes, Either2, Either4, PositiveF64, VecVal, M1},19 val::{equals, primitive_equals, ArrValue, FuncVal, IndexableVal, Slice},20 with_state, Either, ObjValue, Val,21};2223pub mod stdlib;24pub use stdlib::*;2526use self::manifest::{escape_string_json, manifest_json_ex, ManifestJsonOptions, ManifestType};2728pub mod format;29pub mod manifest;30pub mod sort;3132pub fn std_format(str: IStr, vals: Val) -> Result<String> {33 push_frame(34 CallLocation::native(),35 || format!("std.format of {}", str),36 || {37 Ok(match vals {38 Val::Arr(vals) => format_arr(&str, &vals.evaluated()?)?,39 Val::Obj(obj) => format_obj(&str, &obj)?,40 o => format_arr(&str, &[o])?,41 })42 },43 )44}4546pub fn std_slice(47 indexable: IndexableVal,48 index: Option<BoundedUsize<0, { i32::MAX as usize }>>,49 end: Option<BoundedUsize<0, { i32::MAX as usize }>>,50 step: Option<BoundedUsize<1, { i32::MAX as usize }>>,51) -> Result<Val> {52 match &indexable {53 IndexableVal::Str(s) => {54 let index = index.as_deref().copied().unwrap_or(0);55 let end = end.as_deref().copied().unwrap_or(usize::MAX);56 let step = step.as_deref().copied().unwrap_or(1);5758 if index >= end {59 return Ok(Val::Str("".into()));60 }6162 Ok(Val::Str(63 (s.chars()64 .skip(index)65 .take(end - index)66 .step_by(step)67 .collect::<String>())68 .into(),69 ))70 }71 IndexableVal::Arr(arr) => {72 let index = index.as_deref().copied().unwrap_or(0);73 let end = end.as_deref().copied().unwrap_or(usize::MAX).min(arr.len());74 let step = step.as_deref().copied().unwrap_or(1);7576 if index >= end {77 return Ok(Val::Arr(ArrValue::new_eager()));78 }7980 Ok(Val::Arr(ArrValue::Slice(Box::new(Slice {81 inner: arr.clone(),82 from: index as u32,83 to: end as u32,84 step: step as u32,85 }))))86 }87 }88}8990type BuiltinsType = HashMap<IStr, &'static dyn StaticBuiltin>;9192thread_local! {93 pub static BUILTINS: BuiltinsType = {94 [95 ("length".into(), builtin_length::INST),96 ("type".into(), builtin_type::INST),97 ("makeArray".into(), builtin_make_array::INST),98 ("codepoint".into(), builtin_codepoint::INST),99 ("objectFieldsEx".into(), builtin_object_fields_ex::INST),100 ("objectHasEx".into(), builtin_object_has_ex::INST),101 ("slice".into(), builtin_slice::INST),102 ("substr".into(), builtin_substr::INST),103 ("primitiveEquals".into(), builtin_primitive_equals::INST),104 ("equals".into(), builtin_equals::INST),105 ("modulo".into(), builtin_modulo::INST),106 ("mod".into(), builtin_mod::INST),107 ("floor".into(), builtin_floor::INST),108 ("ceil".into(), builtin_ceil::INST),109 ("log".into(), builtin_log::INST),110 ("pow".into(), builtin_pow::INST),111 ("sqrt".into(), builtin_sqrt::INST),112 ("sin".into(), builtin_sin::INST),113 ("cos".into(), builtin_cos::INST),114 ("tan".into(), builtin_tan::INST),115 ("asin".into(), builtin_asin::INST),116 ("acos".into(), builtin_acos::INST),117 ("atan".into(), builtin_atan::INST),118 ("exp".into(), builtin_exp::INST),119 ("mantissa".into(), builtin_mantissa::INST),120 ("exponent".into(), builtin_exponent::INST),121 ("extVar".into(), builtin_ext_var::INST),122 ("native".into(), builtin_native::INST),123 ("filter".into(), builtin_filter::INST),124 ("map".into(), builtin_map::INST),125 ("flatMap".into(), builtin_flatmap::INST),126 ("foldl".into(), builtin_foldl::INST),127 ("foldr".into(), builtin_foldr::INST),128 ("sort".into(), builtin_sort::INST),129 ("format".into(), builtin_format::INST),130 ("range".into(), builtin_range::INST),131 ("char".into(), builtin_char::INST),132 ("encodeUTF8".into(), builtin_encode_utf8::INST),133 ("decodeUTF8".into(), builtin_decode_utf8::INST),134 ("md5".into(), builtin_md5::INST),135 ("base64".into(), builtin_base64::INST),136 ("base64DecodeBytes".into(), builtin_base64_decode_bytes::INST),137 ("base64Decode".into(), builtin_base64_decode::INST),138 ("trace".into(), builtin_trace::INST),139 ("join".into(), builtin_join::INST),140 ("escapeStringJson".into(), builtin_escape_string_json::INST),141 ("manifestJsonEx".into(), builtin_manifest_json_ex::INST),142 ("manifestYamlDoc".into(), builtin_manifest_yaml_doc::INST),143 ("reverse".into(), builtin_reverse::INST),144 ("id".into(), builtin_id::INST),145 ("strReplace".into(), builtin_str_replace::INST),146 ("splitLimit".into(), builtin_splitlimit::INST),147 ("parseJson".into(), builtin_parse_json::INST),148 ("parseYaml".into(), builtin_parse_yaml::INST),149 ("asciiUpper".into(), builtin_ascii_upper::INST),150 ("asciiLower".into(), builtin_ascii_lower::INST),151 ("member".into(), builtin_member::INST),152 ("count".into(), builtin_count::INST),153 ("any".into(), builtin_any::INST),154 ("all".into(), builtin_all::INST),155 ].iter().cloned().collect()156 };157}158159#[jrsonnet_macros::builtin]160fn builtin_length(x: Either![IStr, ArrValue, ObjValue, FuncVal]) -> Result<usize> {161 use Either4::*;162 Ok(match x {163 A(x) => x.chars().count(),164 B(x) => x.len(),165 C(x) => x.len(),166 D(f) => f.args_len(),167 })168}169170#[jrsonnet_macros::builtin]171fn builtin_type(x: Any) -> Result<IStr> {172 Ok(x.0.value_type().name().into())173}174175#[jrsonnet_macros::builtin]176fn builtin_make_array(sz: usize, func: FuncVal) -> Result<VecVal> {177 let mut out = Vec::with_capacity(sz);178 for i in 0..sz {179 out.push(func.evaluate_simple(&[i as f64].as_slice())?)180 }181 Ok(VecVal(Cc::new(out)))182}183184#[jrsonnet_macros::builtin]185const fn builtin_codepoint(str: char) -> Result<u32> {186 Ok(str as u32)187}188189#[jrsonnet_macros::builtin]190fn builtin_object_fields_ex(191 obj: ObjValue,192 inc_hidden: bool,193 #[cfg(feature = "exp-preserve-order")] preserve_order: Option<bool>,194) -> Result<VecVal> {195 #[cfg(not(feature = "exp-preserve-order"))]196 let preserve_order = false;197 #[cfg(feature = "exp-preserve-order")]198 let preserve_order = preserve_order.unwrap_or(false);199 let out = obj.fields_ex(200 inc_hidden,201 #[cfg(feature = "exp-preserve-order")]202 preserve_order,203 );204 Ok(VecVal(Cc::new(205 out.into_iter().map(Val::Str).collect::<Vec<_>>(),206 )))207}208209#[jrsonnet_macros::builtin]210fn builtin_object_has_ex(obj: ObjValue, f: IStr, inc_hidden: bool) -> Result<bool> {211 Ok(obj.has_field_ex(f, inc_hidden))212}213214#[jrsonnet_macros::builtin]215fn builtin_parse_json(s: IStr) -> Result<Any> {216 let value: serde_json::Value = serde_json::from_str(&s)217 .map_err(|e| RuntimeError(format!("failed to parse json: {}", e).into()))?;218 Ok(Any(Val::try_from(&value)?))219}220221#[jrsonnet_macros::builtin]222fn builtin_parse_yaml(s: IStr) -> Result<Any> {223 let value = serde_yaml::Deserializer::from_str_with_quirks(224 &s,225 DeserializingQuirks { old_octals: true },226 );227 let mut out = vec![];228 for item in value {229 let value = serde_json::Value::deserialize(item)230 .map_err(|e| RuntimeError(format!("failed to parse yaml: {}", e).into()))?;231 let val = Val::try_from(&value)?;232 out.push(val);233 }234 Ok(Any(if out.is_empty() {235 Val::Null236 } else if out.len() == 1 {237 out.into_iter().next().unwrap()238 } else {239 Val::Arr(out.into())240 }))241}242243#[jrsonnet_macros::builtin]244fn builtin_slice(245 indexable: IndexableVal,246 index: Option<BoundedUsize<0, { i32::MAX as usize }>>,247 end: Option<BoundedUsize<0, { i32::MAX as usize }>>,248 step: Option<BoundedUsize<1, { i32::MAX as usize }>>,249) -> Result<Any> {250 std_slice(indexable, index, end, step).map(Any)251}252253#[jrsonnet_macros::builtin]254fn builtin_substr(str: IStr, from: usize, len: usize) -> Result<String> {255 Ok(str.chars().skip(from as usize).take(len as usize).collect())256}257258#[jrsonnet_macros::builtin]259fn builtin_primitive_equals(a: Any, b: Any) -> Result<bool> {260 primitive_equals(&a.0, &b.0)261}262263#[jrsonnet_macros::builtin]264fn builtin_equals(a: Any, b: Any) -> Result<bool> {265 equals(&a.0, &b.0)266}267268#[jrsonnet_macros::builtin]269fn builtin_modulo(a: f64, b: f64) -> Result<f64> {270 Ok(a % b)271}272273#[jrsonnet_macros::builtin]274fn builtin_mod(a: Either![f64, IStr], b: Any) -> Result<Any> {275 use Either2::*;276 Ok(Any(evaluate_mod_op(277 &match a {278 A(v) => Val::Num(v),279 B(s) => Val::Str(s),280 },281 &b.0,282 )?))283}284285#[jrsonnet_macros::builtin]286fn builtin_floor(x: f64) -> Result<f64> {287 Ok(x.floor())288}289290#[jrsonnet_macros::builtin]291fn builtin_ceil(x: f64) -> Result<f64> {292 Ok(x.ceil())293}294295#[jrsonnet_macros::builtin]296fn builtin_log(n: f64) -> Result<f64> {297 Ok(n.ln())298}299300#[jrsonnet_macros::builtin]301fn builtin_pow(x: f64, n: f64) -> Result<f64> {302 Ok(x.powf(n))303}304305#[jrsonnet_macros::builtin]306fn builtin_sqrt(x: PositiveF64) -> Result<f64> {307 Ok(x.0.sqrt())308}309310#[jrsonnet_macros::builtin]311fn builtin_sin(x: f64) -> Result<f64> {312 Ok(x.sin())313}314315#[jrsonnet_macros::builtin]316fn builtin_cos(x: f64) -> Result<f64> {317 Ok(x.cos())318}319320#[jrsonnet_macros::builtin]321fn builtin_tan(x: f64) -> Result<f64> {322 Ok(x.tan())323}324325#[jrsonnet_macros::builtin]326fn builtin_asin(x: f64) -> Result<f64> {327 Ok(x.asin())328}329330#[jrsonnet_macros::builtin]331fn builtin_acos(x: f64) -> Result<f64> {332 Ok(x.acos())333}334335#[jrsonnet_macros::builtin]336fn builtin_atan(x: f64) -> Result<f64> {337 Ok(x.atan())338}339340#[jrsonnet_macros::builtin]341fn builtin_exp(x: f64) -> Result<f64> {342 Ok(x.exp())343}344345fn frexp(s: f64) -> (f64, i16) {346 if 0.0 == s {347 (s, 0)348 } else {349 let lg = s.abs().log2();350 let x = (lg - lg.floor() - 1.0).exp2();351 let exp = lg.floor() + 1.0;352 (s.signum() * x, exp as i16)353 }354}355356#[jrsonnet_macros::builtin]357fn builtin_mantissa(x: f64) -> Result<f64> {358 Ok(frexp(x).0)359}360361#[jrsonnet_macros::builtin]362fn builtin_exponent(x: f64) -> Result<i16> {363 Ok(frexp(x).1)364}365366#[jrsonnet_macros::builtin]367fn builtin_ext_var(x: IStr) -> Result<Any> {368 Ok(Any(with_state(|s| s.settings().ext_vars.get(&x).cloned())369 .ok_or(UndefinedExternalVariable(x))?))370}371372#[jrsonnet_macros::builtin]373fn builtin_native(name: IStr) -> Result<FuncVal> {374 Ok(with_state(|s| s.settings().ext_natives.get(&name).cloned())375 .map(|v| FuncVal::Builtin(v.clone()))376 .ok_or(UndefinedExternalFunction(name))?)377}378379#[jrsonnet_macros::builtin]380fn builtin_filter(func: FuncVal, arr: ArrValue) -> Result<ArrValue> {381 arr.filter(|val| bool::try_from(func.evaluate_simple(&[Any(val.clone())].as_slice())?))382}383384#[jrsonnet_macros::builtin]385fn builtin_map(func: FuncVal, arr: ArrValue) -> Result<ArrValue> {386 arr.map(|val| func.evaluate_simple(&[Any(val)].as_slice()))387}388389#[jrsonnet_macros::builtin]390fn builtin_flatmap(func: FuncVal, arr: IndexableVal) -> Result<IndexableVal> {391 match arr {392 IndexableVal::Str(s) => {393 let mut out = String::new();394 for c in s.chars() {395 match func.evaluate_simple(&[c.to_string()].as_slice())? {396 Val::Str(o) => out.push_str(&o),397 _ => throw!(RuntimeError(398 "in std.join all items should be strings".into()399 )),400 };401 }402 Ok(IndexableVal::Str(out.into()))403 }404 IndexableVal::Arr(a) => {405 let mut out = Vec::new();406 for el in a.iter() {407 let el = el?;408 match func.evaluate_simple(&[Any(el)].as_slice())? {409 Val::Arr(o) => {410 for oe in o.iter() {411 out.push(oe?)412 }413 }414 _ => throw!(RuntimeError(415 "in std.join all items should be arrays".into()416 )),417 };418 }419 Ok(IndexableVal::Arr(out.into()))420 }421 }422}423424#[jrsonnet_macros::builtin]425fn builtin_foldl(func: FuncVal, arr: ArrValue, init: Any) -> Result<Any> {426 let mut acc = init.0;427 for i in arr.iter() {428 acc = func.evaluate_simple(&[Any(acc), Any(i?)].as_slice())?;429 }430 Ok(Any(acc))431}432433#[jrsonnet_macros::builtin]434fn builtin_foldr(func: FuncVal, arr: ArrValue, init: Any) -> Result<Any> {435 let mut acc = init.0;436 for i in arr.iter().rev() {437 acc = func.evaluate_simple(&[Any(i?), Any(acc)].as_slice())?;438 }439 Ok(Any(acc))440}441442#[jrsonnet_macros::builtin]443#[allow(non_snake_case)]444fn builtin_sort(arr: ArrValue, keyF: Option<FuncVal>) -> Result<ArrValue> {445 if arr.len() <= 1 {446 return Ok(arr);447 }448 Ok(ArrValue::Eager(sort::sort(449 arr.evaluated()?,450 keyF.as_ref(),451 )?))452}453454#[jrsonnet_macros::builtin]455fn builtin_format(str: IStr, vals: Any) -> Result<String> {456 std_format(str, vals.0)457}458459#[jrsonnet_macros::builtin]460fn builtin_range(from: i32, to: i32) -> Result<ArrValue> {461 if to < from {462 return Ok(ArrValue::new_eager());463 }464 Ok(ArrValue::new_range(from, to))465}466467#[jrsonnet_macros::builtin]468fn builtin_char(n: u32) -> Result<char> {469 Ok(std::char::from_u32(n as u32).ok_or(InvalidUnicodeCodepointGot(n as u32))?)470}471472#[jrsonnet_macros::builtin]473fn builtin_encode_utf8(str: IStr) -> Result<Bytes> {474 Ok(Bytes(str.bytes().collect::<Vec<u8>>().into()))475}476477#[jrsonnet_macros::builtin]478fn builtin_decode_utf8(arr: Bytes) -> Result<IStr> {479 Ok(std::str::from_utf8(&arr.0)480 .map_err(|_| RuntimeError("bad utf8".into()))?481 .into())482}483484#[jrsonnet_macros::builtin]485fn builtin_md5(str: IStr) -> Result<String> {486 Ok(format!("{:x}", md5::compute(&str.as_bytes())))487}488489#[jrsonnet_macros::builtin]490fn builtin_trace(loc: CallLocation, str: IStr, rest: Any) -> Result<Any> {491 eprint!("TRACE:");492 if let Some(loc) = loc.0 {493 with_state(|s| {494 let locs = s.map_source_locations(&loc.0, &[loc.1]);495 eprint!(496 " {}:{}",497 loc.0.file_name().unwrap().to_str().unwrap(),498 locs[0].line499 );500 });501 }502 eprintln!(" {}", str);503 Ok(rest) as Result<Any>504}505506#[jrsonnet_macros::builtin]507fn builtin_base64(input: Either![Bytes, IStr]) -> Result<String> {508 use Either2::*;509 Ok(match input {510 A(a) => base64::encode(a.0),511 B(l) => base64::encode(l.bytes().collect::<Vec<_>>()),512 })513}514515#[jrsonnet_macros::builtin]516fn builtin_base64_decode_bytes(input: IStr) -> Result<Bytes> {517 Ok(Bytes(518 base64::decode(&input.as_bytes())519 .map_err(|_| RuntimeError("bad base64".into()))?520 .into(),521 ))522}523524#[jrsonnet_macros::builtin]525fn builtin_base64_decode(input: IStr) -> Result<String> {526 let bytes = base64::decode(&input.as_bytes()).map_err(|_| RuntimeError("bad base64".into()))?;527 Ok(String::from_utf8(bytes).map_err(|_| RuntimeError("bad utf8".into()))?)528}529530#[jrsonnet_macros::builtin]531fn builtin_join(sep: IndexableVal, arr: ArrValue) -> Result<IndexableVal> {532 Ok(match sep {533 IndexableVal::Arr(joiner_items) => {534 let mut out = Vec::new();535536 let mut first = true;537 for item in arr.iter() {538 let item = item?.clone();539 if let Val::Arr(items) = item {540 if !first {541 out.reserve(joiner_items.len());542 // TODO: extend543 for item in joiner_items.iter() {544 out.push(item?);545 }546 }547 first = false;548 out.reserve(items.len());549 // TODO: extend550 for item in items.iter() {551 out.push(item?);552 }553 } else {554 throw!(RuntimeError(555 "in std.join all items should be arrays".into()556 ));557 }558 }559560 IndexableVal::Arr(out.into())561 }562 IndexableVal::Str(sep) => {563 let mut out = String::new();564565 let mut first = true;566 for item in arr.iter() {567 let item = item?.clone();568 if let Val::Str(item) = item {569 if !first {570 out += &sep;571 }572 first = false;573 out += &item;574 } else {575 throw!(RuntimeError(576 "in std.join all items should be strings".into()577 ));578 }579 }580581 IndexableVal::Str(out.into())582 }583 })584}585586#[jrsonnet_macros::builtin]587fn builtin_escape_string_json(str_: IStr) -> Result<String> {588 Ok(escape_string_json(&str_))589}590591#[jrsonnet_macros::builtin]592fn builtin_manifest_json_ex(593 value: Any,594 indent: IStr,595 newline: Option<IStr>,596 key_val_sep: Option<IStr>,597 #[cfg(feature = "exp-preserve-order")] preserve_order: Option<bool>,598) -> Result<String> {599 let newline = newline.as_deref().unwrap_or("\n");600 let key_val_sep = key_val_sep.as_deref().unwrap_or(": ");601 manifest_json_ex(602 &value.0,603 &ManifestJsonOptions {604 padding: &indent,605 mtype: ManifestType::Std,606 newline,607 key_val_sep,608 #[cfg(feature = "exp-preserve-order")]609 preserve_order: preserve_order.unwrap_or(false),610 },611 )612}613614#[jrsonnet_macros::builtin]615fn builtin_manifest_yaml_doc(616 value: Any,617 indent_array_in_object: Option<bool>,618 quote_keys: Option<bool>,619 #[cfg(feature = "exp-preserve-order")] preserve_order: Option<bool>,620) -> Result<String> {621 manifest_yaml_ex(622 &value.0,623 &ManifestYamlOptions {624 padding: " ",625 arr_element_padding: if indent_array_in_object.unwrap_or(false) {626 " "627 } else {628 ""629 },630 quote_keys: quote_keys.unwrap_or(true),631 #[cfg(feature = "exp-preserve-order")]632 preserve_order: preserve_order.unwrap_or(false),633 },634 )635}636637#[jrsonnet_macros::builtin]638fn builtin_reverse(value: ArrValue) -> Result<ArrValue> {639 Ok(value.reversed())640}641642#[jrsonnet_macros::builtin]643const fn builtin_id(v: Any) -> Result<Any> {644 Ok(v)645}646647#[jrsonnet_macros::builtin]648fn builtin_str_replace(str: String, from: IStr, to: IStr) -> Result<String> {649 Ok(str.replace(&from as &str, &to as &str))650}651652#[jrsonnet_macros::builtin]653fn builtin_splitlimit(str: IStr, c: IStr, maxsplits: Either![usize, M1]) -> Result<VecVal> {654 use Either2::*;655 Ok(VecVal(Cc::new(match maxsplits {656 A(n) => str657 .splitn(n + 1, &c as &str)658 .map(|s| Val::Str(s.into()))659 .collect(),660 B(_) => str.split(&c as &str).map(|s| Val::Str(s.into())).collect(),661 })))662}663664#[jrsonnet_macros::builtin]665fn builtin_ascii_upper(str: IStr) -> Result<String> {666 Ok(str.to_ascii_uppercase())667}668669#[jrsonnet_macros::builtin]670fn builtin_ascii_lower(str: IStr) -> Result<String> {671 Ok(str.to_ascii_lowercase())672}673674#[jrsonnet_macros::builtin]675fn builtin_member(arr: IndexableVal, x: Any) -> Result<bool> {676 match arr {677 IndexableVal::Str(s) => {678 let x: IStr = IStr::try_from(x.0)?;679 Ok(!x.is_empty() && s.contains(&*x))680 }681 IndexableVal::Arr(a) => {682 for item in a.iter() {683 let item = item?;684 if equals(&item, &x.0)? {685 return Ok(true);686 }687 }688 Ok(false)689 }690 }691}692693#[jrsonnet_macros::builtin]694fn builtin_count(arr: Vec<Any>, v: Any) -> Result<usize> {695 let mut count = 0;696 for item in arr.iter() {697 if equals(&item.0, &v.0)? {698 count += 1;699 }700 }701 Ok(count)702}703704#[jrsonnet_macros::builtin]705fn builtin_any(arr: ArrValue) -> Result<bool> {706 for v in arr.iter() {707 let v: bool = v?.try_into()?;708 if v {709 return Ok(true);710 }711 }712 Ok(false)713}714715#[jrsonnet_macros::builtin]716fn builtin_all(arr: ArrValue) -> Result<bool> {717 for v in arr.iter() {718 let v: bool = v?.try_into()?;719 if !v {720 return Ok(false);721 }722 }723 Ok(true)724}1use std::{2 collections::HashMap,3 convert::{TryFrom, TryInto},4};56use format::{format_arr, format_obj};7use gcmodule::Cc;8use jrsonnet_interner::IStr;9use serde::Deserialize;10use serde_yaml::DeserializingQuirks;1112use crate::{13 builtin::manifest::{manifest_yaml_ex, ManifestYamlOptions},14 error::{Error::*, Result},15 function::{CallLocation, StaticBuiltin},16 operator::evaluate_mod_op,17 push_frame, throw,18 typed::{Any, BoundedUsize, Bytes, Either2, Either4, PositiveF64, VecVal, M1},19 val::{equals, primitive_equals, ArrValue, FuncVal, IndexableVal, Slice},20 with_state, Either, ObjValue, Val,21};2223pub mod stdlib;24pub use stdlib::*;2526use self::manifest::{escape_string_json, manifest_json_ex, ManifestJsonOptions, ManifestType};2728pub mod format;29pub mod manifest;30pub mod sort;3132pub fn std_format(str: IStr, vals: Val) -> Result<String> {33 push_frame(34 CallLocation::native(),35 || format!("std.format of {}", str),36 || {37 Ok(match vals {38 Val::Arr(vals) => format_arr(&str, &vals.evaluated()?)?,39 Val::Obj(obj) => format_obj(&str, &obj)?,40 o => format_arr(&str, &[o])?,41 })42 },43 )44}4546pub fn std_slice(47 indexable: IndexableVal,48 index: Option<BoundedUsize<0, { i32::MAX as usize }>>,49 end: Option<BoundedUsize<0, { i32::MAX as usize }>>,50 step: Option<BoundedUsize<1, { i32::MAX as usize }>>,51) -> Result<Val> {52 match &indexable {53 IndexableVal::Str(s) => {54 let index = index.as_deref().copied().unwrap_or(0);55 let end = end.as_deref().copied().unwrap_or(usize::MAX);56 let step = step.as_deref().copied().unwrap_or(1);5758 if index >= end {59 return Ok(Val::Str("".into()));60 }6162 Ok(Val::Str(63 (s.chars()64 .skip(index)65 .take(end - index)66 .step_by(step)67 .collect::<String>())68 .into(),69 ))70 }71 IndexableVal::Arr(arr) => {72 let index = index.as_deref().copied().unwrap_or(0);73 let end = end.as_deref().copied().unwrap_or(usize::MAX).min(arr.len());74 let step = step.as_deref().copied().unwrap_or(1);7576 if index >= end {77 return Ok(Val::Arr(ArrValue::new_eager()));78 }7980 Ok(Val::Arr(ArrValue::Slice(Box::new(Slice {81 inner: arr.clone(),82 from: index as u32,83 to: end as u32,84 step: step as u32,85 }))))86 }87 }88}8990type BuiltinsType = HashMap<IStr, &'static dyn StaticBuiltin>;9192thread_local! {93 pub static BUILTINS: BuiltinsType = {94 [95 ("length".into(), builtin_length::INST),96 ("type".into(), builtin_type::INST),97 ("makeArray".into(), builtin_make_array::INST),98 ("codepoint".into(), builtin_codepoint::INST),99 ("objectFieldsEx".into(), builtin_object_fields_ex::INST),100 ("objectHasEx".into(), builtin_object_has_ex::INST),101 ("slice".into(), builtin_slice::INST),102 ("substr".into(), builtin_substr::INST),103 ("primitiveEquals".into(), builtin_primitive_equals::INST),104 ("equals".into(), builtin_equals::INST),105 ("modulo".into(), builtin_modulo::INST),106 ("mod".into(), builtin_mod::INST),107 ("floor".into(), builtin_floor::INST),108 ("ceil".into(), builtin_ceil::INST),109 ("log".into(), builtin_log::INST),110 ("pow".into(), builtin_pow::INST),111 ("sqrt".into(), builtin_sqrt::INST),112 ("sin".into(), builtin_sin::INST),113 ("cos".into(), builtin_cos::INST),114 ("tan".into(), builtin_tan::INST),115 ("asin".into(), builtin_asin::INST),116 ("acos".into(), builtin_acos::INST),117 ("atan".into(), builtin_atan::INST),118 ("exp".into(), builtin_exp::INST),119 ("mantissa".into(), builtin_mantissa::INST),120 ("exponent".into(), builtin_exponent::INST),121 ("extVar".into(), builtin_ext_var::INST),122 ("native".into(), builtin_native::INST),123 ("filter".into(), builtin_filter::INST),124 ("map".into(), builtin_map::INST),125 ("flatMap".into(), builtin_flatmap::INST),126 ("foldl".into(), builtin_foldl::INST),127 ("foldr".into(), builtin_foldr::INST),128 ("sort".into(), builtin_sort::INST),129 ("format".into(), builtin_format::INST),130 ("range".into(), builtin_range::INST),131 ("char".into(), builtin_char::INST),132 ("encodeUTF8".into(), builtin_encode_utf8::INST),133 ("decodeUTF8".into(), builtin_decode_utf8::INST),134 ("md5".into(), builtin_md5::INST),135 ("base64".into(), builtin_base64::INST),136 ("base64DecodeBytes".into(), builtin_base64_decode_bytes::INST),137 ("base64Decode".into(), builtin_base64_decode::INST),138 ("trace".into(), builtin_trace::INST),139 ("join".into(), builtin_join::INST),140 ("escapeStringJson".into(), builtin_escape_string_json::INST),141 ("manifestJsonEx".into(), builtin_manifest_json_ex::INST),142 ("manifestYamlDoc".into(), builtin_manifest_yaml_doc::INST),143 ("reverse".into(), builtin_reverse::INST),144 ("id".into(), builtin_id::INST),145 ("strReplace".into(), builtin_str_replace::INST),146 ("splitLimit".into(), builtin_splitlimit::INST),147 ("parseJson".into(), builtin_parse_json::INST),148 ("parseYaml".into(), builtin_parse_yaml::INST),149 ("asciiUpper".into(), builtin_ascii_upper::INST),150 ("asciiLower".into(), builtin_ascii_lower::INST),151 ("member".into(), builtin_member::INST),152 ("count".into(), builtin_count::INST),153 ("any".into(), builtin_any::INST),154 ("all".into(), builtin_all::INST),155 ].iter().cloned().collect()156 };157}158159#[jrsonnet_macros::builtin]160fn builtin_length(x: Either![IStr, ArrValue, ObjValue, FuncVal]) -> Result<usize> {161 use Either4::*;162 Ok(match x {163 A(x) => x.chars().count(),164 B(x) => x.len(),165 C(x) => x.len(),166 D(f) => f.args_len(),167 })168}169170#[jrsonnet_macros::builtin]171fn builtin_type(x: Any) -> Result<IStr> {172 Ok(x.0.value_type().name().into())173}174175#[jrsonnet_macros::builtin]176fn builtin_make_array(sz: usize, func: FuncVal) -> Result<VecVal> {177 let mut out = Vec::with_capacity(sz);178 for i in 0..sz {179 out.push(func.evaluate_simple(&[i as f64].as_slice())?)180 }181 Ok(VecVal(Cc::new(out)))182}183184#[jrsonnet_macros::builtin]185const fn builtin_codepoint(str: char) -> Result<u32> {186 Ok(str as u32)187}188189#[jrsonnet_macros::builtin]190fn builtin_object_fields_ex(191 obj: ObjValue,192 inc_hidden: bool,193 #[cfg(feature = "exp-preserve-order")] preserve_order: Option<bool>,194) -> Result<VecVal> {195 #[cfg(feature = "exp-preserve-order")]196 let preserve_order = preserve_order.unwrap_or(false);197 let out = obj.fields_ex(198 inc_hidden,199 #[cfg(feature = "exp-preserve-order")]200 preserve_order,201 );202 Ok(VecVal(Cc::new(203 out.into_iter().map(Val::Str).collect::<Vec<_>>(),204 )))205}206207#[jrsonnet_macros::builtin]208fn builtin_object_has_ex(obj: ObjValue, f: IStr, inc_hidden: bool) -> Result<bool> {209 Ok(obj.has_field_ex(f, inc_hidden))210}211212#[jrsonnet_macros::builtin]213fn builtin_parse_json(s: IStr) -> Result<Any> {214 let value: serde_json::Value = serde_json::from_str(&s)215 .map_err(|e| RuntimeError(format!("failed to parse json: {}", e).into()))?;216 Ok(Any(Val::try_from(&value)?))217}218219#[jrsonnet_macros::builtin]220fn builtin_parse_yaml(s: IStr) -> Result<Any> {221 let value = serde_yaml::Deserializer::from_str_with_quirks(222 &s,223 DeserializingQuirks { old_octals: true },224 );225 let mut out = vec![];226 for item in value {227 let value = serde_json::Value::deserialize(item)228 .map_err(|e| RuntimeError(format!("failed to parse yaml: {}", e).into()))?;229 let val = Val::try_from(&value)?;230 out.push(val);231 }232 Ok(Any(if out.is_empty() {233 Val::Null234 } else if out.len() == 1 {235 out.into_iter().next().unwrap()236 } else {237 Val::Arr(out.into())238 }))239}240241#[jrsonnet_macros::builtin]242fn builtin_slice(243 indexable: IndexableVal,244 index: Option<BoundedUsize<0, { i32::MAX as usize }>>,245 end: Option<BoundedUsize<0, { i32::MAX as usize }>>,246 step: Option<BoundedUsize<1, { i32::MAX as usize }>>,247) -> Result<Any> {248 std_slice(indexable, index, end, step).map(Any)249}250251#[jrsonnet_macros::builtin]252fn builtin_substr(str: IStr, from: usize, len: usize) -> Result<String> {253 Ok(str.chars().skip(from as usize).take(len as usize).collect())254}255256#[jrsonnet_macros::builtin]257fn builtin_primitive_equals(a: Any, b: Any) -> Result<bool> {258 primitive_equals(&a.0, &b.0)259}260261#[jrsonnet_macros::builtin]262fn builtin_equals(a: Any, b: Any) -> Result<bool> {263 equals(&a.0, &b.0)264}265266#[jrsonnet_macros::builtin]267fn builtin_modulo(a: f64, b: f64) -> Result<f64> {268 Ok(a % b)269}270271#[jrsonnet_macros::builtin]272fn builtin_mod(a: Either![f64, IStr], b: Any) -> Result<Any> {273 use Either2::*;274 Ok(Any(evaluate_mod_op(275 &match a {276 A(v) => Val::Num(v),277 B(s) => Val::Str(s),278 },279 &b.0,280 )?))281}282283#[jrsonnet_macros::builtin]284fn builtin_floor(x: f64) -> Result<f64> {285 Ok(x.floor())286}287288#[jrsonnet_macros::builtin]289fn builtin_ceil(x: f64) -> Result<f64> {290 Ok(x.ceil())291}292293#[jrsonnet_macros::builtin]294fn builtin_log(n: f64) -> Result<f64> {295 Ok(n.ln())296}297298#[jrsonnet_macros::builtin]299fn builtin_pow(x: f64, n: f64) -> Result<f64> {300 Ok(x.powf(n))301}302303#[jrsonnet_macros::builtin]304fn builtin_sqrt(x: PositiveF64) -> Result<f64> {305 Ok(x.0.sqrt())306}307308#[jrsonnet_macros::builtin]309fn builtin_sin(x: f64) -> Result<f64> {310 Ok(x.sin())311}312313#[jrsonnet_macros::builtin]314fn builtin_cos(x: f64) -> Result<f64> {315 Ok(x.cos())316}317318#[jrsonnet_macros::builtin]319fn builtin_tan(x: f64) -> Result<f64> {320 Ok(x.tan())321}322323#[jrsonnet_macros::builtin]324fn builtin_asin(x: f64) -> Result<f64> {325 Ok(x.asin())326}327328#[jrsonnet_macros::builtin]329fn builtin_acos(x: f64) -> Result<f64> {330 Ok(x.acos())331}332333#[jrsonnet_macros::builtin]334fn builtin_atan(x: f64) -> Result<f64> {335 Ok(x.atan())336}337338#[jrsonnet_macros::builtin]339fn builtin_exp(x: f64) -> Result<f64> {340 Ok(x.exp())341}342343fn frexp(s: f64) -> (f64, i16) {344 if 0.0 == s {345 (s, 0)346 } else {347 let lg = s.abs().log2();348 let x = (lg - lg.floor() - 1.0).exp2();349 let exp = lg.floor() + 1.0;350 (s.signum() * x, exp as i16)351 }352}353354#[jrsonnet_macros::builtin]355fn builtin_mantissa(x: f64) -> Result<f64> {356 Ok(frexp(x).0)357}358359#[jrsonnet_macros::builtin]360fn builtin_exponent(x: f64) -> Result<i16> {361 Ok(frexp(x).1)362}363364#[jrsonnet_macros::builtin]365fn builtin_ext_var(x: IStr) -> Result<Any> {366 Ok(Any(with_state(|s| s.settings().ext_vars.get(&x).cloned())367 .ok_or(UndefinedExternalVariable(x))?))368}369370#[jrsonnet_macros::builtin]371fn builtin_native(name: IStr) -> Result<FuncVal> {372 Ok(with_state(|s| s.settings().ext_natives.get(&name).cloned())373 .map(|v| FuncVal::Builtin(v.clone()))374 .ok_or(UndefinedExternalFunction(name))?)375}376377#[jrsonnet_macros::builtin]378fn builtin_filter(func: FuncVal, arr: ArrValue) -> Result<ArrValue> {379 arr.filter(|val| bool::try_from(func.evaluate_simple(&[Any(val.clone())].as_slice())?))380}381382#[jrsonnet_macros::builtin]383fn builtin_map(func: FuncVal, arr: ArrValue) -> Result<ArrValue> {384 arr.map(|val| func.evaluate_simple(&[Any(val)].as_slice()))385}386387#[jrsonnet_macros::builtin]388fn builtin_flatmap(func: FuncVal, arr: IndexableVal) -> Result<IndexableVal> {389 match arr {390 IndexableVal::Str(s) => {391 let mut out = String::new();392 for c in s.chars() {393 match func.evaluate_simple(&[c.to_string()].as_slice())? {394 Val::Str(o) => out.push_str(&o),395 _ => throw!(RuntimeError(396 "in std.join all items should be strings".into()397 )),398 };399 }400 Ok(IndexableVal::Str(out.into()))401 }402 IndexableVal::Arr(a) => {403 let mut out = Vec::new();404 for el in a.iter() {405 let el = el?;406 match func.evaluate_simple(&[Any(el)].as_slice())? {407 Val::Arr(o) => {408 for oe in o.iter() {409 out.push(oe?)410 }411 }412 _ => throw!(RuntimeError(413 "in std.join all items should be arrays".into()414 )),415 };416 }417 Ok(IndexableVal::Arr(out.into()))418 }419 }420}421422#[jrsonnet_macros::builtin]423fn builtin_foldl(func: FuncVal, arr: ArrValue, init: Any) -> Result<Any> {424 let mut acc = init.0;425 for i in arr.iter() {426 acc = func.evaluate_simple(&[Any(acc), Any(i?)].as_slice())?;427 }428 Ok(Any(acc))429}430431#[jrsonnet_macros::builtin]432fn builtin_foldr(func: FuncVal, arr: ArrValue, init: Any) -> Result<Any> {433 let mut acc = init.0;434 for i in arr.iter().rev() {435 acc = func.evaluate_simple(&[Any(i?), Any(acc)].as_slice())?;436 }437 Ok(Any(acc))438}439440#[jrsonnet_macros::builtin]441#[allow(non_snake_case)]442fn builtin_sort(arr: ArrValue, keyF: Option<FuncVal>) -> Result<ArrValue> {443 if arr.len() <= 1 {444 return Ok(arr);445 }446 Ok(ArrValue::Eager(sort::sort(447 arr.evaluated()?,448 keyF.as_ref(),449 )?))450}451452#[jrsonnet_macros::builtin]453fn builtin_format(str: IStr, vals: Any) -> Result<String> {454 std_format(str, vals.0)455}456457#[jrsonnet_macros::builtin]458fn builtin_range(from: i32, to: i32) -> Result<ArrValue> {459 if to < from {460 return Ok(ArrValue::new_eager());461 }462 Ok(ArrValue::new_range(from, to))463}464465#[jrsonnet_macros::builtin]466fn builtin_char(n: u32) -> Result<char> {467 Ok(std::char::from_u32(n as u32).ok_or(InvalidUnicodeCodepointGot(n as u32))?)468}469470#[jrsonnet_macros::builtin]471fn builtin_encode_utf8(str: IStr) -> Result<Bytes> {472 Ok(Bytes(str.bytes().collect::<Vec<u8>>().into()))473}474475#[jrsonnet_macros::builtin]476fn builtin_decode_utf8(arr: Bytes) -> Result<IStr> {477 Ok(std::str::from_utf8(&arr.0)478 .map_err(|_| RuntimeError("bad utf8".into()))?479 .into())480}481482#[jrsonnet_macros::builtin]483fn builtin_md5(str: IStr) -> Result<String> {484 Ok(format!("{:x}", md5::compute(&str.as_bytes())))485}486487#[jrsonnet_macros::builtin]488fn builtin_trace(loc: CallLocation, str: IStr, rest: Any) -> Result<Any> {489 eprint!("TRACE:");490 if let Some(loc) = loc.0 {491 with_state(|s| {492 let locs = s.map_source_locations(&loc.0, &[loc.1]);493 eprint!(494 " {}:{}",495 loc.0.file_name().unwrap().to_str().unwrap(),496 locs[0].line497 );498 });499 }500 eprintln!(" {}", str);501 Ok(rest) as Result<Any>502}503504#[jrsonnet_macros::builtin]505fn builtin_base64(input: Either![Bytes, IStr]) -> Result<String> {506 use Either2::*;507 Ok(match input {508 A(a) => base64::encode(a.0),509 B(l) => base64::encode(l.bytes().collect::<Vec<_>>()),510 })511}512513#[jrsonnet_macros::builtin]514fn builtin_base64_decode_bytes(input: IStr) -> Result<Bytes> {515 Ok(Bytes(516 base64::decode(&input.as_bytes())517 .map_err(|_| RuntimeError("bad base64".into()))?518 .into(),519 ))520}521522#[jrsonnet_macros::builtin]523fn builtin_base64_decode(input: IStr) -> Result<String> {524 let bytes = base64::decode(&input.as_bytes()).map_err(|_| RuntimeError("bad base64".into()))?;525 Ok(String::from_utf8(bytes).map_err(|_| RuntimeError("bad utf8".into()))?)526}527528#[jrsonnet_macros::builtin]529fn builtin_join(sep: IndexableVal, arr: ArrValue) -> Result<IndexableVal> {530 Ok(match sep {531 IndexableVal::Arr(joiner_items) => {532 let mut out = Vec::new();533534 let mut first = true;535 for item in arr.iter() {536 let item = item?.clone();537 if let Val::Arr(items) = item {538 if !first {539 out.reserve(joiner_items.len());540 // TODO: extend541 for item in joiner_items.iter() {542 out.push(item?);543 }544 }545 first = false;546 out.reserve(items.len());547 // TODO: extend548 for item in items.iter() {549 out.push(item?);550 }551 } else {552 throw!(RuntimeError(553 "in std.join all items should be arrays".into()554 ));555 }556 }557558 IndexableVal::Arr(out.into())559 }560 IndexableVal::Str(sep) => {561 let mut out = String::new();562563 let mut first = true;564 for item in arr.iter() {565 let item = item?.clone();566 if let Val::Str(item) = item {567 if !first {568 out += &sep;569 }570 first = false;571 out += &item;572 } else {573 throw!(RuntimeError(574 "in std.join all items should be strings".into()575 ));576 }577 }578579 IndexableVal::Str(out.into())580 }581 })582}583584#[jrsonnet_macros::builtin]585fn builtin_escape_string_json(str_: IStr) -> Result<String> {586 Ok(escape_string_json(&str_))587}588589#[jrsonnet_macros::builtin]590fn builtin_manifest_json_ex(591 value: Any,592 indent: IStr,593 newline: Option<IStr>,594 key_val_sep: Option<IStr>,595 #[cfg(feature = "exp-preserve-order")] preserve_order: Option<bool>,596) -> Result<String> {597 let newline = newline.as_deref().unwrap_or("\n");598 let key_val_sep = key_val_sep.as_deref().unwrap_or(": ");599 manifest_json_ex(600 &value.0,601 &ManifestJsonOptions {602 padding: &indent,603 mtype: ManifestType::Std,604 newline,605 key_val_sep,606 #[cfg(feature = "exp-preserve-order")]607 preserve_order: preserve_order.unwrap_or(false),608 },609 )610}611612#[jrsonnet_macros::builtin]613fn builtin_manifest_yaml_doc(614 value: Any,615 indent_array_in_object: Option<bool>,616 quote_keys: Option<bool>,617 #[cfg(feature = "exp-preserve-order")] preserve_order: Option<bool>,618) -> Result<String> {619 manifest_yaml_ex(620 &value.0,621 &ManifestYamlOptions {622 padding: " ",623 arr_element_padding: if indent_array_in_object.unwrap_or(false) {624 " "625 } else {626 ""627 },628 quote_keys: quote_keys.unwrap_or(true),629 #[cfg(feature = "exp-preserve-order")]630 preserve_order: preserve_order.unwrap_or(false),631 },632 )633}634635#[jrsonnet_macros::builtin]636fn builtin_reverse(value: ArrValue) -> Result<ArrValue> {637 Ok(value.reversed())638}639640#[jrsonnet_macros::builtin]641const fn builtin_id(v: Any) -> Result<Any> {642 Ok(v)643}644645#[jrsonnet_macros::builtin]646fn builtin_str_replace(str: String, from: IStr, to: IStr) -> Result<String> {647 Ok(str.replace(&from as &str, &to as &str))648}649650#[jrsonnet_macros::builtin]651fn builtin_splitlimit(str: IStr, c: IStr, maxsplits: Either![usize, M1]) -> Result<VecVal> {652 use Either2::*;653 Ok(VecVal(Cc::new(match maxsplits {654 A(n) => str655 .splitn(n + 1, &c as &str)656 .map(|s| Val::Str(s.into()))657 .collect(),658 B(_) => str.split(&c as &str).map(|s| Val::Str(s.into())).collect(),659 })))660}661662#[jrsonnet_macros::builtin]663fn builtin_ascii_upper(str: IStr) -> Result<String> {664 Ok(str.to_ascii_uppercase())665}666667#[jrsonnet_macros::builtin]668fn builtin_ascii_lower(str: IStr) -> Result<String> {669 Ok(str.to_ascii_lowercase())670}671672#[jrsonnet_macros::builtin]673fn builtin_member(arr: IndexableVal, x: Any) -> Result<bool> {674 match arr {675 IndexableVal::Str(s) => {676 let x: IStr = IStr::try_from(x.0)?;677 Ok(!x.is_empty() && s.contains(&*x))678 }679 IndexableVal::Arr(a) => {680 for item in a.iter() {681 let item = item?;682 if equals(&item, &x.0)? {683 return Ok(true);684 }685 }686 Ok(false)687 }688 }689}690691#[jrsonnet_macros::builtin]692fn builtin_count(arr: Vec<Any>, v: Any) -> Result<usize> {693 let mut count = 0;694 for item in arr.iter() {695 if equals(&item.0, &v.0)? {696 count += 1;697 }698 }699 Ok(count)700}701702#[jrsonnet_macros::builtin]703fn builtin_any(arr: ArrValue) -> Result<bool> {704 for v in arr.iter() {705 let v: bool = v?.try_into()?;706 if v {707 return Ok(true);708 }709 }710 Ok(false)711}712713#[jrsonnet_macros::builtin]714fn builtin_all(arr: ArrValue) -> Result<bool> {715 for v in arr.iter() {716 let v: bool = v?.try_into()?;717 if !v {718 return Ok(false);719 }720 }721 Ok(true)722}crates/jrsonnet-evaluator/src/evaluate/mod.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/evaluate/mod.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/mod.rs
@@ -680,7 +680,7 @@
Ok(Some(push_frame(
loc,
|| format!("slice {}", desc),
- || Ok(evaluate(context.clone(), value)?.try_into()?),
+ || evaluate(context.clone(), value)?.try_into(),
)?))
} else {
Ok(None)
crates/jrsonnet-evaluator/src/obj.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/obj.rs
+++ b/crates/jrsonnet-evaluator/src/obj.rs
@@ -19,13 +19,13 @@
};
#[cfg(not(feature = "exp-preserve-order"))]
-pub(crate) mod ordering {
+mod ordering {
use gcmodule::Trace;
#[derive(Clone, Copy, Default, Debug, Trace)]
pub struct FieldIndex;
impl FieldIndex {
- pub fn next(self) -> Self {
+ pub const fn next(self) -> Self {
Self
}
}
@@ -33,7 +33,7 @@
#[derive(Clone, Copy, Default, Debug, Trace)]
pub struct SuperDepth;
impl SuperDepth {
- pub fn deeper(self) -> Self {
+ pub const fn deeper(self) -> Self {
Self
}
}
@@ -41,7 +41,7 @@
#[derive(Clone, Copy)]
pub struct FieldSortKey;
impl FieldSortKey {
- pub fn new(_: SuperDepth, _: FieldIndex) -> Self {
+ pub const fn new(_: SuperDepth, _: FieldIndex) -> Self {
Self
}
}
@@ -87,7 +87,7 @@
}
}
-pub(crate) use ordering::*;
+use ordering::*;
#[derive(Debug, Trace)]
pub struct ObjMember {
@@ -594,7 +594,7 @@
pub fn bindable(self, bindable: TraceBox<dyn Bindable>) {
self.binding(LazyBinding::Bindable(Cc::new(bindable)))
}
- pub fn binding(self, binding: LazyBinding) -> () {
+ pub fn binding(self, binding: LazyBinding) {
let (receiver, name, member) = self.build_member(binding);
let new = receiver.0.clone();
*receiver.0 = new.extend_with_raw_member(name, member)
crates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -201,16 +201,16 @@
pub(crate) step: u32,
}
impl Slice {
- fn from(&self) -> usize {
+ const fn from(&self) -> usize {
self.from as usize
}
- fn to(&self) -> usize {
+ const fn to(&self) -> usize {
self.to as usize
}
- fn step(&self) -> usize {
+ const fn step(&self) -> usize {
self.step as usize
}
- fn len(&self) -> usize {
+ const fn len(&self) -> usize {
// TODO: use div_ceil
let diff = self.to() - self.from();
let rem = diff % self.step();