difftreelog
style switch clippy to pedantic
in: master
25 files changed
crates/jrsonnet-evaluator/src/builtin/format.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/builtin/format.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/format.rs
@@ -86,6 +86,7 @@
}
}
+#[allow(clippy::struct_excessive_bools)]
#[derive(Default, Debug)]
pub struct CFlags {
pub alt: bool,
@@ -270,12 +271,12 @@
return Ok(out);
}
str = &str[offset + 1..];
- let (code, nstr) = parse_code(str)?;
- str = nstr;
+ let code;
+ (code, str) = parse_code(str)?;
bytes = str.as_bytes();
offset = 0;
- out.push(Element::Code(code))
+ out.push(Element::Code(code));
}
}
@@ -313,7 +314,7 @@
.saturating_sub(prefix.len() + digits.len());
if neg {
- out.push('-')
+ out.push('-');
} else if sign {
out.push('+');
} else if blank {
@@ -340,7 +341,7 @@
blank: bool,
sign: bool,
) {
- render_integer(out, iv, padding, precision, blank, sign, 10, "", false)
+ render_integer(out, iv, padding, precision, blank, sign, 10, "", false);
}
pub fn render_octal(
out: &mut String,
@@ -361,8 +362,10 @@
8,
if alt && iv != 0 { "0" } else { "" },
false,
- )
+ );
}
+
+#[allow(clippy::fn_params_excessive_bools)]
pub fn render_hexadecimal(
out: &mut String,
iv: i64,
@@ -387,9 +390,10 @@
(false, _) => "",
},
caps,
- )
+ );
}
+#[allow(clippy::fn_params_excessive_bools)]
pub fn render_float(
out: &mut String,
n: f64,
@@ -431,6 +435,7 @@
}
}
+#[allow(clippy::fn_params_excessive_bools)]
pub fn render_float_sci(
out: &mut String,
n: f64,
@@ -461,6 +466,7 @@
out.push_str(&exponent_str);
}
+#[allow(clippy::too_many_lines)]
pub fn format_code(
s: State,
out: &mut String,
crates/jrsonnet-evaluator/src/builtin/manifest.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/builtin/manifest.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/manifest.rs
@@ -158,7 +158,7 @@
'\r' => buf.push_str("\\r"),
'\t' => buf.push_str("\\t"),
c if c < 32 as char || (c >= 127 as char && c <= 159 as char) => {
- write!(buf, "\\u{:04x}", c as u32).unwrap()
+ write!(buf, "\\u{:04x}", c as u32).unwrap();
}
c => buf.push(c),
}
@@ -194,7 +194,7 @@
pub preserve_order: bool,
}
-/// From https://github.com/chyh1990/yaml-rust/blob/da52a68615f2ecdd6b7e4567019f280c433c1521/src/emitter.rs#L289
+/// From <https://github.com/chyh1990/yaml-rust/blob/da52a68615f2ecdd6b7e4567019f280c433c1521/src/emitter.rs#L289>
/// With added date check
fn yaml_needs_quotes(string: &str) -> bool {
fn need_quotes_spaces(string: &str) -> bool {
@@ -227,6 +227,8 @@
manifest_yaml_ex_buf(s, val, &mut out, &mut String::new(), options)?;
Ok(out)
}
+
+#[allow(clippy::too_many_lines)]
fn manifest_yaml_ex_buf(
s: State,
val: &Val,
@@ -238,9 +240,9 @@
match val {
Val::Bool(v) => {
if *v {
- buf.push_str("true")
+ buf.push_str("true");
} else {
- buf.push_str("false")
+ buf.push_str("false");
}
}
Val::Null => buf.push_str("null"),
crates/jrsonnet-evaluator/src/builtin/mod.rsdiffbeforeafterboth1use std::collections::HashMap;23use format::{format_arr, format_obj};4use gcmodule::Cc;5use jrsonnet_interner::IStr;6use serde::Deserialize;7use serde_yaml::DeserializingQuirks;89use crate::{10 builtin::manifest::{manifest_yaml_ex, ManifestYamlOptions},11 error::{Error::*, Result},12 function::{CallLocation, StaticBuiltin},13 operator::evaluate_mod_op,14 throw,15 typed::{Any, BoundedUsize, Bytes, Either2, Either4, PositiveF64, Typed, VecVal, M1},16 val::{equals, primitive_equals, ArrValue, FuncVal, IndexableVal, Slice},17 Either, ObjValue, State, Val,18};1920pub mod stdlib;21pub use stdlib::*;2223use self::manifest::{escape_string_json, manifest_json_ex, ManifestJsonOptions, ManifestType};2425pub mod format;26pub mod manifest;27pub mod sort;2829pub fn std_format(s: State, str: IStr, vals: Val) -> Result<String> {30 s.push(31 CallLocation::native(),32 || format!("std.format of {}", str),33 || {34 Ok(match vals {35 Val::Arr(vals) => format_arr(s.clone(), &str, &vals.evaluated(s.clone())?)?,36 Val::Obj(obj) => format_obj(s.clone(), &str, &obj)?,37 o => format_arr(s.clone(), &str, &[o])?,38 })39 },40 )41}4243pub fn std_slice(44 indexable: IndexableVal,45 index: Option<BoundedUsize<0, { i32::MAX as usize }>>,46 end: Option<BoundedUsize<0, { i32::MAX as usize }>>,47 step: Option<BoundedUsize<1, { i32::MAX as usize }>>,48) -> Result<Val> {49 match &indexable {50 IndexableVal::Str(s) => {51 let index = index.as_deref().copied().unwrap_or(0);52 let end = end.as_deref().copied().unwrap_or(usize::MAX);53 let step = step.as_deref().copied().unwrap_or(1);5455 if index >= end {56 return Ok(Val::Str("".into()));57 }5859 Ok(Val::Str(60 (s.chars()61 .skip(index)62 .take(end - index)63 .step_by(step)64 .collect::<String>())65 .into(),66 ))67 }68 IndexableVal::Arr(arr) => {69 let index = index.as_deref().copied().unwrap_or(0);70 let end = end.as_deref().copied().unwrap_or(usize::MAX).min(arr.len());71 let step = step.as_deref().copied().unwrap_or(1);7273 if index >= end {74 return Ok(Val::Arr(ArrValue::new_eager()));75 }7677 Ok(Val::Arr(ArrValue::Slice(Box::new(Slice {78 inner: arr.clone(),79 from: index as u32,80 to: end as u32,81 step: step as u32,82 }))))83 }84 }85}8687type BuiltinsType = HashMap<IStr, &'static dyn StaticBuiltin>;8889thread_local! {90 pub static BUILTINS: BuiltinsType = {91 [92 ("length".into(), builtin_length::INST),93 ("type".into(), builtin_type::INST),94 ("makeArray".into(), builtin_make_array::INST),95 ("codepoint".into(), builtin_codepoint::INST),96 ("objectFieldsEx".into(), builtin_object_fields_ex::INST),97 ("objectHasEx".into(), builtin_object_has_ex::INST),98 ("slice".into(), builtin_slice::INST),99 ("substr".into(), builtin_substr::INST),100 ("primitiveEquals".into(), builtin_primitive_equals::INST),101 ("equals".into(), builtin_equals::INST),102 ("modulo".into(), builtin_modulo::INST),103 ("mod".into(), builtin_mod::INST),104 ("floor".into(), builtin_floor::INST),105 ("ceil".into(), builtin_ceil::INST),106 ("log".into(), builtin_log::INST),107 ("pow".into(), builtin_pow::INST),108 ("sqrt".into(), builtin_sqrt::INST),109 ("sin".into(), builtin_sin::INST),110 ("cos".into(), builtin_cos::INST),111 ("tan".into(), builtin_tan::INST),112 ("asin".into(), builtin_asin::INST),113 ("acos".into(), builtin_acos::INST),114 ("atan".into(), builtin_atan::INST),115 ("exp".into(), builtin_exp::INST),116 ("mantissa".into(), builtin_mantissa::INST),117 ("exponent".into(), builtin_exponent::INST),118 ("extVar".into(), builtin_ext_var::INST),119 ("native".into(), builtin_native::INST),120 ("filter".into(), builtin_filter::INST),121 ("map".into(), builtin_map::INST),122 ("flatMap".into(), builtin_flatmap::INST),123 ("foldl".into(), builtin_foldl::INST),124 ("foldr".into(), builtin_foldr::INST),125 ("sort".into(), builtin_sort::INST),126 ("format".into(), builtin_format::INST),127 ("range".into(), builtin_range::INST),128 ("char".into(), builtin_char::INST),129 ("encodeUTF8".into(), builtin_encode_utf8::INST),130 ("decodeUTF8".into(), builtin_decode_utf8::INST),131 ("md5".into(), builtin_md5::INST),132 ("base64".into(), builtin_base64::INST),133 ("base64DecodeBytes".into(), builtin_base64_decode_bytes::INST),134 ("base64Decode".into(), builtin_base64_decode::INST),135 ("trace".into(), builtin_trace::INST),136 ("join".into(), builtin_join::INST),137 ("escapeStringJson".into(), builtin_escape_string_json::INST),138 ("manifestJsonEx".into(), builtin_manifest_json_ex::INST),139 ("manifestYamlDoc".into(), builtin_manifest_yaml_doc::INST),140 ("reverse".into(), builtin_reverse::INST),141 ("id".into(), builtin_id::INST),142 ("strReplace".into(), builtin_str_replace::INST),143 ("splitLimit".into(), builtin_splitlimit::INST),144 ("parseJson".into(), builtin_parse_json::INST),145 ("parseYaml".into(), builtin_parse_yaml::INST),146 ("asciiUpper".into(), builtin_ascii_upper::INST),147 ("asciiLower".into(), builtin_ascii_lower::INST),148 ("member".into(), builtin_member::INST),149 ("count".into(), builtin_count::INST),150 ("any".into(), builtin_any::INST),151 ("all".into(), builtin_all::INST),152 ].iter().cloned().collect()153 };154}155156#[jrsonnet_macros::builtin]157fn builtin_length(x: Either![IStr, ArrValue, ObjValue, FuncVal]) -> Result<usize> {158 use Either4::*;159 Ok(match x {160 A(x) => x.chars().count(),161 B(x) => x.len(),162 C(x) => x.len(),163 D(f) => f.args_len(),164 })165}166167#[jrsonnet_macros::builtin]168fn builtin_type(x: Any) -> Result<IStr> {169 Ok(x.0.value_type().name().into())170}171172#[jrsonnet_macros::builtin]173fn builtin_make_array(s: State, sz: usize, func: FuncVal) -> Result<VecVal> {174 let mut out = Vec::with_capacity(sz);175 for i in 0..sz {176 out.push(func.evaluate_simple(s.clone(), &[i as f64].as_slice())?)177 }178 Ok(VecVal(Cc::new(out)))179}180181#[jrsonnet_macros::builtin]182const fn builtin_codepoint(str: char) -> Result<u32> {183 Ok(str as u32)184}185186#[jrsonnet_macros::builtin]187fn builtin_object_fields_ex(188 obj: ObjValue,189 inc_hidden: bool,190 #[cfg(feature = "exp-preserve-order")] preserve_order: Option<bool>,191) -> Result<VecVal> {192 #[cfg(feature = "exp-preserve-order")]193 let preserve_order = preserve_order.unwrap_or(false);194 let out = obj.fields_ex(195 inc_hidden,196 #[cfg(feature = "exp-preserve-order")]197 preserve_order,198 );199 Ok(VecVal(Cc::new(200 out.into_iter().map(Val::Str).collect::<Vec<_>>(),201 )))202}203204#[jrsonnet_macros::builtin]205fn builtin_object_has_ex(obj: ObjValue, f: IStr, inc_hidden: bool) -> Result<bool> {206 Ok(obj.has_field_ex(f, inc_hidden))207}208209#[jrsonnet_macros::builtin]210fn builtin_parse_json(st: State, s: IStr) -> Result<Any> {211 use serde_json::Value;212 let value: Value = serde_json::from_str(&s)213 .map_err(|e| RuntimeError(format!("failed to parse json: {}", e).into()))?;214 Ok(Any(Value::into_untyped(value, st)?))215}216217#[jrsonnet_macros::builtin]218fn builtin_parse_yaml(st: State, s: IStr) -> Result<Any> {219 use serde_json::Value;220 let value = serde_yaml::Deserializer::from_str_with_quirks(221 &s,222 DeserializingQuirks { old_octals: true },223 );224 let mut out = vec![];225 for item in value {226 let value = Value::deserialize(item)227 .map_err(|e| RuntimeError(format!("failed to parse yaml: {}", e).into()))?;228 let val = Value::into_untyped(value, st.clone())?;229 out.push(val);230 }231 Ok(Any(if out.is_empty() {232 Val::Null233 } else if out.len() == 1 {234 out.into_iter().next().unwrap()235 } else {236 Val::Arr(out.into())237 }))238}239240#[jrsonnet_macros::builtin]241fn builtin_slice(242 indexable: IndexableVal,243 index: Option<BoundedUsize<0, { i32::MAX as usize }>>,244 end: Option<BoundedUsize<0, { i32::MAX as usize }>>,245 step: Option<BoundedUsize<1, { i32::MAX as usize }>>,246) -> Result<Any> {247 std_slice(indexable, index, end, step).map(Any)248}249250#[jrsonnet_macros::builtin]251fn builtin_substr(str: IStr, from: usize, len: usize) -> Result<String> {252 Ok(str.chars().skip(from as usize).take(len as usize).collect())253}254255#[jrsonnet_macros::builtin]256fn builtin_primitive_equals(a: Any, b: Any) -> Result<bool> {257 primitive_equals(&a.0, &b.0)258}259260#[jrsonnet_macros::builtin]261fn builtin_equals(s: State, a: Any, b: Any) -> Result<bool> {262 equals(s, &a.0, &b.0)263}264265#[jrsonnet_macros::builtin]266fn builtin_modulo(a: f64, b: f64) -> Result<f64> {267 Ok(a % b)268}269270#[jrsonnet_macros::builtin]271fn builtin_mod(s: State, a: Either![f64, IStr], b: Any) -> Result<Any> {272 use Either2::*;273 Ok(Any(evaluate_mod_op(274 s,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(s: State, x: IStr) -> Result<Any> {366 Ok(Any(s367 .settings()368 .ext_vars369 .get(&x)370 .cloned()371 .ok_or(UndefinedExternalVariable(x))?))372}373374#[jrsonnet_macros::builtin]375fn builtin_native(s: State, name: IStr) -> Result<FuncVal> {376 Ok(s.settings()377 .ext_natives378 .get(&name)379 .cloned()380 .map(|v| FuncVal::Builtin(v.clone()))381 .ok_or(UndefinedExternalFunction(name))?)382}383384#[jrsonnet_macros::builtin]385fn builtin_filter(s: State, func: FuncVal, arr: ArrValue) -> Result<ArrValue> {386 arr.filter(s.clone(), |val| {387 bool::from_untyped(388 func.evaluate_simple(s.clone(), &[Any(val.clone())].as_slice())?,389 s.clone(),390 )391 })392}393394#[jrsonnet_macros::builtin]395fn builtin_map(s: State, func: FuncVal, arr: ArrValue) -> Result<ArrValue> {396 arr.map(s.clone(), |val| {397 func.evaluate_simple(s.clone(), &[Any(val)].as_slice())398 })399}400401#[jrsonnet_macros::builtin]402fn builtin_flatmap(s: State, func: FuncVal, arr: IndexableVal) -> Result<IndexableVal> {403 match arr {404 IndexableVal::Str(str) => {405 let mut out = String::new();406 for c in str.chars() {407 match func.evaluate_simple(s.clone(), &[c.to_string()].as_slice())? {408 Val::Str(o) => out.push_str(&o),409 _ => throw!(RuntimeError(410 "in std.join all items should be strings".into()411 )),412 };413 }414 Ok(IndexableVal::Str(out.into()))415 }416 IndexableVal::Arr(a) => {417 let mut out = Vec::new();418 for el in a.iter(s.clone()) {419 let el = el?;420 match func.evaluate_simple(s.clone(), &[Any(el)].as_slice())? {421 Val::Arr(o) => {422 for oe in o.iter(s.clone()) {423 out.push(oe?)424 }425 }426 _ => throw!(RuntimeError(427 "in std.join all items should be arrays".into()428 )),429 };430 }431 Ok(IndexableVal::Arr(out.into()))432 }433 }434}435436#[jrsonnet_macros::builtin]437fn builtin_foldl(s: State, func: FuncVal, arr: ArrValue, init: Any) -> Result<Any> {438 let mut acc = init.0;439 for i in arr.iter(s.clone()) {440 acc = func.evaluate_simple(s.clone(), &[Any(acc), Any(i?)].as_slice())?;441 }442 Ok(Any(acc))443}444445#[jrsonnet_macros::builtin]446fn builtin_foldr(s: State, func: FuncVal, arr: ArrValue, init: Any) -> Result<Any> {447 let mut acc = init.0;448 for i in arr.iter(s.clone()).rev() {449 acc = func.evaluate_simple(s.clone(), &[Any(i?), Any(acc)].as_slice())?;450 }451 Ok(Any(acc))452}453454#[jrsonnet_macros::builtin]455#[allow(non_snake_case)]456fn builtin_sort(s: State, arr: ArrValue, keyF: Option<FuncVal>) -> Result<ArrValue> {457 if arr.len() <= 1 {458 return Ok(arr);459 }460 Ok(ArrValue::Eager(sort::sort(461 s.clone(),462 arr.evaluated(s)?,463 keyF.as_ref(),464 )?))465}466467#[jrsonnet_macros::builtin]468fn builtin_format(s: State, str: IStr, vals: Any) -> Result<String> {469 std_format(s, str, vals.0)470}471472#[jrsonnet_macros::builtin]473fn builtin_range(from: i32, to: i32) -> Result<ArrValue> {474 if to < from {475 return Ok(ArrValue::new_eager());476 }477 Ok(ArrValue::new_range(from, to))478}479480#[jrsonnet_macros::builtin]481fn builtin_char(n: u32) -> Result<char> {482 Ok(std::char::from_u32(n as u32).ok_or(InvalidUnicodeCodepointGot(n as u32))?)483}484485#[jrsonnet_macros::builtin]486fn builtin_encode_utf8(str: IStr) -> Result<Bytes> {487 Ok(Bytes(str.bytes().collect::<Vec<u8>>().into()))488}489490#[jrsonnet_macros::builtin]491fn builtin_decode_utf8(arr: Bytes) -> Result<IStr> {492 Ok(std::str::from_utf8(&arr.0)493 .map_err(|_| RuntimeError("bad utf8".into()))?494 .into())495}496497#[jrsonnet_macros::builtin]498fn builtin_md5(str: IStr) -> Result<String> {499 Ok(format!("{:x}", md5::compute(&str.as_bytes())))500}501502#[jrsonnet_macros::builtin]503fn builtin_trace(s: State, loc: CallLocation, str: IStr, rest: Any) -> Result<Any> {504 eprint!("TRACE:");505 if let Some(loc) = loc.0 {506 let locs = s.map_source_locations(&loc.0, &[loc.1]);507 eprint!(508 " {}:{}",509 loc.0.file_name().unwrap().to_str().unwrap(),510 locs[0].line511 );512 }513 eprintln!(" {}", str);514 Ok(rest) as Result<Any>515}516517#[jrsonnet_macros::builtin]518fn builtin_base64(input: Either![Bytes, IStr]) -> Result<String> {519 use Either2::*;520 Ok(match input {521 A(a) => base64::encode(a.0),522 B(l) => base64::encode(l.bytes().collect::<Vec<_>>()),523 })524}525526#[jrsonnet_macros::builtin]527fn builtin_base64_decode_bytes(input: IStr) -> Result<Bytes> {528 Ok(Bytes(529 base64::decode(&input.as_bytes())530 .map_err(|_| RuntimeError("bad base64".into()))?531 .into(),532 ))533}534535#[jrsonnet_macros::builtin]536fn builtin_base64_decode(input: IStr) -> Result<String> {537 let bytes = base64::decode(&input.as_bytes()).map_err(|_| RuntimeError("bad base64".into()))?;538 Ok(String::from_utf8(bytes).map_err(|_| RuntimeError("bad utf8".into()))?)539}540541#[jrsonnet_macros::builtin]542fn builtin_join(s: State, sep: IndexableVal, arr: ArrValue) -> Result<IndexableVal> {543 Ok(match sep {544 IndexableVal::Arr(joiner_items) => {545 let mut out = Vec::new();546547 let mut first = true;548 for item in arr.iter(s.clone()) {549 let item = item?.clone();550 if let Val::Arr(items) = item {551 if !first {552 out.reserve(joiner_items.len());553 // TODO: extend554 for item in joiner_items.iter(s.clone()) {555 out.push(item?);556 }557 }558 first = false;559 out.reserve(items.len());560 for item in items.iter(s.clone()) {561 out.push(item?);562 }563 } else {564 throw!(RuntimeError(565 "in std.join all items should be arrays".into()566 ));567 }568 }569570 IndexableVal::Arr(out.into())571 }572 IndexableVal::Str(sep) => {573 let mut out = String::new();574575 let mut first = true;576 for item in arr.iter(s) {577 let item = item?.clone();578 if let Val::Str(item) = item {579 if !first {580 out += &sep;581 }582 first = false;583 out += &item;584 } else {585 throw!(RuntimeError(586 "in std.join all items should be strings".into()587 ));588 }589 }590591 IndexableVal::Str(out.into())592 }593 })594}595596#[jrsonnet_macros::builtin]597fn builtin_escape_string_json(str_: IStr) -> Result<String> {598 Ok(escape_string_json(&str_))599}600601#[jrsonnet_macros::builtin]602fn builtin_manifest_json_ex(603 s: State,604 value: Any,605 indent: IStr,606 newline: Option<IStr>,607 key_val_sep: Option<IStr>,608 #[cfg(feature = "exp-preserve-order")] preserve_order: Option<bool>,609) -> Result<String> {610 let newline = newline.as_deref().unwrap_or("\n");611 let key_val_sep = key_val_sep.as_deref().unwrap_or(": ");612 manifest_json_ex(613 s,614 &value.0,615 &ManifestJsonOptions {616 padding: &indent,617 mtype: ManifestType::Std,618 newline,619 key_val_sep,620 #[cfg(feature = "exp-preserve-order")]621 preserve_order: preserve_order.unwrap_or(false),622 },623 )624}625626#[jrsonnet_macros::builtin]627fn builtin_manifest_yaml_doc(628 s: State,629 value: Any,630 indent_array_in_object: Option<bool>,631 quote_keys: Option<bool>,632 #[cfg(feature = "exp-preserve-order")] preserve_order: Option<bool>,633) -> Result<String> {634 manifest_yaml_ex(635 s,636 &value.0,637 &ManifestYamlOptions {638 padding: " ",639 arr_element_padding: if indent_array_in_object.unwrap_or(false) {640 " "641 } else {642 ""643 },644 quote_keys: quote_keys.unwrap_or(true),645 #[cfg(feature = "exp-preserve-order")]646 preserve_order: preserve_order.unwrap_or(false),647 },648 )649}650651#[jrsonnet_macros::builtin]652fn builtin_reverse(value: ArrValue) -> Result<ArrValue> {653 Ok(value.reversed())654}655656#[jrsonnet_macros::builtin]657const fn builtin_id(v: Any) -> Result<Any> {658 Ok(v)659}660661#[jrsonnet_macros::builtin]662fn builtin_str_replace(str: String, from: IStr, to: IStr) -> Result<String> {663 Ok(str.replace(&from as &str, &to as &str))664}665666#[jrsonnet_macros::builtin]667fn builtin_splitlimit(str: IStr, c: IStr, maxsplits: Either![usize, M1]) -> Result<VecVal> {668 use Either2::*;669 Ok(VecVal(Cc::new(match maxsplits {670 A(n) => str671 .splitn(n + 1, &c as &str)672 .map(|s| Val::Str(s.into()))673 .collect(),674 B(_) => str.split(&c as &str).map(|s| Val::Str(s.into())).collect(),675 })))676}677678#[jrsonnet_macros::builtin]679fn builtin_ascii_upper(str: IStr) -> Result<String> {680 Ok(str.to_ascii_uppercase())681}682683#[jrsonnet_macros::builtin]684fn builtin_ascii_lower(str: IStr) -> Result<String> {685 Ok(str.to_ascii_lowercase())686}687688#[jrsonnet_macros::builtin]689fn builtin_member(s: State, arr: IndexableVal, x: Any) -> Result<bool> {690 match arr {691 IndexableVal::Str(str) => {692 let x: IStr = IStr::from_untyped(x.0, s)?;693 Ok(!x.is_empty() && str.contains(&*x))694 }695 IndexableVal::Arr(a) => {696 for item in a.iter(s.clone()) {697 let item = item?;698 if equals(s.clone(), &item, &x.0)? {699 return Ok(true);700 }701 }702 Ok(false)703 }704 }705}706707#[jrsonnet_macros::builtin]708fn builtin_count(s: State, arr: Vec<Any>, v: Any) -> Result<usize> {709 let mut count = 0;710 for item in arr.iter() {711 if equals(s.clone(), &item.0, &v.0)? {712 count += 1;713 }714 }715 Ok(count)716}717718#[jrsonnet_macros::builtin]719fn builtin_any(s: State, arr: ArrValue) -> Result<bool> {720 for v in arr.iter(s.clone()) {721 let v = bool::from_untyped(v?, s.clone())?;722 if v {723 return Ok(true);724 }725 }726 Ok(false)727}728729#[jrsonnet_macros::builtin]730fn builtin_all(s: State, arr: ArrValue) -> Result<bool> {731 for v in arr.iter(s.clone()) {732 let v = bool::from_untyped(v?, s.clone())?;733 if !v {734 return Ok(false);735 }736 }737 Ok(true)738}crates/jrsonnet-evaluator/src/builtin/sort.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/builtin/sort.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/sort.rs
@@ -53,10 +53,10 @@
match (i, sort_type) {
(Val::Str(_), SortKeyType::Unknown) => sort_type = SortKeyType::String,
(Val::Num(_), SortKeyType::Unknown) => sort_type = SortKeyType::Number,
- (Val::Str(_), SortKeyType::String) => {}
- (Val::Str(_), _) => throw!(SortError::SortElementsShouldHaveEqualType),
- (Val::Num(_), SortKeyType::Number) => {}
- (Val::Num(_), _) => throw!(SortError::SortElementsShouldHaveEqualType),
+ (Val::Str(_), SortKeyType::String) | (Val::Num(_), SortKeyType::Number) => {}
+ (Val::Str(_) | Val::Num(_), _) => {
+ throw!(SortError::SortElementsShouldHaveEqualType)
+ }
_ => throw!(SortError::SortKeyShouldBeStringOrNumber),
}
}
@@ -91,19 +91,19 @@
Ok(Cc::new(vk.into_iter().map(|v| v.0).collect()))
} else {
// Fast path, identity key getter
- let mut mvalues = (*values).clone();
- let sort_type = get_sort_type(&mut mvalues, |k| k)?;
+ let mut values = (*values).clone();
+ let sort_type = get_sort_type(&mut values, |k| k)?;
match sort_type {
- SortKeyType::Number => mvalues.sort_unstable_by_key(|v| match v {
+ SortKeyType::Number => values.sort_unstable_by_key(|v| match v {
Val::Num(n) => NonNaNf64(*n),
_ => unreachable!(),
}),
- SortKeyType::String => mvalues.sort_unstable_by_key(|v| match v {
+ SortKeyType::String => values.sort_unstable_by_key(|v| match v {
Val::Str(s) => s.clone(),
_ => unreachable!(),
}),
SortKeyType::Unknown => unreachable!(),
};
- Ok(Cc::new(mvalues))
+ Ok(Cc::new(values))
}
}
crates/jrsonnet-evaluator/src/builtin/stdlib.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/builtin/stdlib.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/stdlib.rs
@@ -24,5 +24,5 @@
}
pub fn get_parsed_stdlib() -> LocExpr {
- PARSED_STDLIB.with(|t| t.clone())
+ PARSED_STDLIB.with(Clone::clone)
}
crates/jrsonnet-evaluator/src/ctx.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/ctx.rs
+++ b/crates/jrsonnet-evaluator/src/ctx.rs
@@ -79,6 +79,7 @@
pub fn contains_binding(&self, name: IStr) -> bool {
self.0.bindings.contains_key(&name)
}
+ #[must_use]
pub fn into_future(self, ctx: FutureWrapper<Self>) -> Self {
{
ctx.0.borrow_mut().replace(self);
@@ -86,16 +87,19 @@
ctx.unwrap()
}
+ #[must_use]
pub fn with_var(self, name: IStr, value: Val) -> Self {
let mut new_bindings = GcHashMap::with_capacity(1);
new_bindings.insert(name, LazyVal::new_resolved(value));
self.extend(new_bindings, None, None, None)
}
+ #[must_use]
pub fn with_this_super(self, new_this: ObjValue, new_super_obj: Option<ObjValue>) -> Self {
self.extend(GcHashMap::new(), None, Some(new_this), new_super_obj)
}
+ #[must_use]
pub fn extend(
self,
new_bindings: GcHashMap<IStr, LazyVal>,
@@ -119,6 +123,7 @@
bindings,
}))
}
+ #[must_use]
pub fn extend_bound(self, new_bindings: GcHashMap<IStr, LazyVal>) -> Self {
let new_this = self.0.this.clone();
let new_super_obj = self.0.super_obj.clone();
@@ -135,7 +140,7 @@
let this = new_this.or_else(|| self.0.this.clone());
let super_obj = new_super_obj.or_else(|| self.0.super_obj.clone());
let mut new = GcHashMap::with_capacity(new_bindings.len());
- for (k, v) in new_bindings.0.into_iter() {
+ for (k, v) in new_bindings.0 {
new.insert(k, v.evaluate(s.clone(), this.clone(), super_obj.clone())?);
}
Ok(self.extend(new, new_dollar, this, super_obj))
crates/jrsonnet-evaluator/src/dynamic.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/dynamic.rs
+++ b/crates/jrsonnet-evaluator/src/dynamic.rs
@@ -8,12 +8,16 @@
pub fn new() -> Self {
Self(Cc::new(RefCell::new(None)))
}
+ /// # Panics
+ /// If wrapper is filled already
pub fn fill(self, value: T) {
assert!(self.0.borrow().is_none(), "wrapper is filled already");
self.0.borrow_mut().replace(value);
}
}
impl<T: Clone + Trace + 'static> FutureWrapper<T> {
+ /// # Panics
+ /// If wrapper is not yet filled
pub fn unwrap(&self) -> T {
self.0.borrow().as_ref().cloned().unwrap()
}
crates/jrsonnet-evaluator/src/error.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/error.rs
+++ b/crates/jrsonnet-evaluator/src/error.rs
@@ -96,7 +96,8 @@
#[error(
"syntax error: expected {}, got {:?}",
.error.expected,
- .source_code.chars().nth(error.location.offset).map(|c| c.to_string()).unwrap_or_else(|| "EOF".into())
+ .source_code.chars().nth(error.location.offset)
+ .map_or_else(|| "EOF".into(), |c| c.to_string())
)]
ImportSyntaxError {
#[skip_trace]
@@ -190,7 +191,7 @@
impl Debug for LocError {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
writeln!(f, "{}", self.0 .0)?;
- for el in self.0 .1 .0.iter() {
+ for el in &self.0 .1 .0 {
writeln!(f, "\t{:?}", el)?;
}
Ok(())
crates/jrsonnet-evaluator/src/evaluate/mod.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/evaluate/mod.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/mod.rs
@@ -23,8 +23,6 @@
pub fn evaluate_binding_in_future(b: &BindSpec, fctx: FutureWrapper<Context>) -> LazyVal {
let b = b.clone();
if let Some(params) = &b.params {
- let params = params.clone();
-
#[derive(Trace)]
struct LazyMethodBinding {
fctx: FutureWrapper<Context>,
@@ -43,6 +41,8 @@
}
}
+ let params = params.clone();
+
LazyVal::new(TraceBox(Box::new(LazyMethodBinding {
fctx,
name: b.name.clone(),
@@ -69,11 +69,10 @@
}
}
+#[allow(clippy::too_many_lines)]
pub fn evaluate_binding(b: &BindSpec, cctx: ContextCreator) -> (IStr, LazyBinding) {
let b = b.clone();
if let Some(params) = &b.params {
- let params = params.clone();
-
#[derive(Trace)]
struct BindableMethodLazyVal {
this: Option<ObjValue>,
@@ -121,6 +120,8 @@
}
}
+ let params = params.clone();
+
(
b.name.clone(),
LazyBinding::Bindable(Cc::new(TraceBox(Box::new(BindableMethod {
@@ -227,7 +228,7 @@
None => callback(ctx)?,
Some(CompSpec::IfSpec(IfSpecData(cond))) => {
if bool::from_untyped(evaluate(s.clone(), ctx.clone(), cond)?, s.clone())? {
- evaluate_comp(s, ctx, &specs[1..], callback)?
+ evaluate_comp(s, ctx, &specs[1..], callback)?;
}
}
Some(CompSpec::ForSpec(ForSpecData(var, expr))) => {
@@ -239,7 +240,7 @@
ctx.clone().with_var(var.clone(), item?.clone()),
&specs[1..],
callback,
- )?
+ )?;
}
}
_ => throw!(InComprehensionCanOnlyIterateOverArray),
@@ -249,6 +250,7 @@
Ok(())
}
+#[allow(clippy::too_many_lines)]
pub fn evaluate_member_list_object(s: State, ctx: Context, members: &[Member]) -> Result<ObjValue> {
let new_bindings = FutureWrapper::new();
let future_this = FutureWrapper::new();
@@ -278,12 +280,6 @@
visibility,
value,
}) => {
- let name = evaluate_field_name(s.clone(), ctx.clone(), name)?;
- if name.is_none() {
- continue;
- }
- let name = name.unwrap();
-
#[derive(Trace)]
struct ObjMemberBinding {
cctx: ContextCreator,
@@ -305,6 +301,14 @@
)?))
}
}
+
+ let name = evaluate_field_name(s.clone(), ctx.clone(), name)?;
+ let name = if let Some(name) = name {
+ name
+ } else {
+ continue;
+ };
+
builder
.member(name.clone())
.with_add(*plus)
@@ -325,11 +329,6 @@
value,
..
}) => {
- let name = evaluate_field_name(s.clone(), ctx.clone(), name)?;
- if name.is_none() {
- continue;
- }
- let name = name.unwrap();
#[derive(Trace)]
struct ObjMemberBinding {
cctx: ContextCreator,
@@ -352,6 +351,13 @@
)))
}
}
+
+ let name = if let Some(name) = evaluate_field_name(s.clone(), ctx.clone(), name)? {
+ name
+ } else {
+ continue;
+ };
+
builder
.member(name.clone())
.hide()
@@ -505,24 +511,24 @@
throw!(AssertionFailed(
evaluate(s.clone(), ctx, msg)?.to_string(s.clone())?
));
- } else {
- throw!(AssertionFailed(Val::Null.to_string(s.clone())?));
}
+ throw!(AssertionFailed(Val::Null.to_string(s.clone())?));
},
- )?
+ )?;
}
Ok(())
}
-pub fn evaluate_named(s: State, ctx: Context, lexpr: &LocExpr, name: IStr) -> Result<Val> {
+pub fn evaluate_named(s: State, ctx: Context, expr: &LocExpr, name: IStr) -> Result<Val> {
use Expr::*;
- let LocExpr(expr, _loc) = lexpr;
- Ok(match &**expr {
+ let LocExpr(raw_expr, _loc) = expr;
+ Ok(match &**raw_expr {
Function(params, body) => evaluate_method(ctx, name, params.clone(), body.clone()),
- _ => evaluate(s, ctx, lexpr)?,
+ _ => evaluate(s, ctx, expr)?,
})
}
+#[allow(clippy::too_many_lines)]
pub fn evaluate(s: State, ctx: Context, expr: &LocExpr) -> Result<Val> {
use Expr::*;
let LocExpr(expr, loc) = expr;
@@ -532,10 +538,11 @@
Val::Obj(ctx.this().clone().ok_or(CantUseSelfOutsideOfObject)?)
}
Literal(LiteralType::Super) => Val::Obj(
- ctx.super_obj()
- .clone()
- .ok_or(NoSuperFound)?
- .with_this(ctx.this().clone().unwrap()),
+ ctx.super_obj().clone().ok_or(NoSuperFound)?.with_this(
+ ctx.this()
+ .clone()
+ .expect("if super exists - then this should to"),
+ ),
),
Literal(LiteralType::Dollar) => {
Val::Obj(ctx.dollar().clone().ok_or(NoTopLevelObjectFound)?)
@@ -699,9 +706,6 @@
}
}
Slice(value, desc) => {
- let indexable = evaluate(s.clone(), ctx.clone(), value)?;
- let loc = CallLocation::new(loc);
-
fn parse_idx<T: Typed>(
loc: CallLocation,
s: State,
@@ -720,6 +724,9 @@
}
}
+ let indexable = evaluate(s.clone(), ctx.clone(), value)?;
+ let loc = CallLocation::new(loc);
+
let start = parse_idx(loc, s.clone(), &ctx, &desc.start, "start")?;
let end = parse_idx(loc, s.clone(), &ctx, &desc.end, "end")?;
let step = parse_idx(loc, s, &ctx, &desc.step, "step")?;
crates/jrsonnet-evaluator/src/evaluate/operator.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/evaluate/operator.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/operator.rs
@@ -1,3 +1,5 @@
+use std::cmp::Ordering;
+
use jrsonnet_parser::{BinaryOpType, LocExpr, UnaryOpType};
use crate::{
@@ -11,7 +13,7 @@
Ok(match (op, b) {
(Not, Bool(v)) => Bool(!v),
(Minus, Num(n)) => Num(-*n),
- (BitNot, Num(n)) => Num(!(*n as i32) as f64),
+ (BitNot, Num(n)) => Num(f64::from(!(*n as i32))),
(op, o) => throw!(UnaryOperatorDoesNotOperateOnType(op, o.value_type())),
})
}
@@ -22,8 +24,8 @@
(Str(v1), Str(v2)) => Str(((**v1).to_owned() + v2).into()),
// Can't use generic json serialization way, because it depends on number to string concatenation (std.jsonnet:890)
- (Num(n), Str(o)) => Str(format!("{}{}", n, o).into()),
- (Str(o), Num(n)) => Str(format!("{}{}", o, n).into()),
+ (Num(a), Str(b)) => Str(format!("{a}{b}").into()),
+ (Str(a), Num(b)) => Str(format!("{a}{b}").into()),
(Str(a), o) => Str(format!("{}{}", a, o.clone().to_string(s)?).into()),
(o, Str(a)) => Str(format!("{}{}", o.clone().to_string(s)?, a).into()),
@@ -47,7 +49,12 @@
pub fn evaluate_mod_op(s: State, a: &Val, b: &Val) -> Result<Val> {
use Val::*;
match (a, b) {
- (Num(a), Num(b)) => Ok(Num(a % b)),
+ (Num(a), Num(b)) => {
+ if *b == 0.0 {
+ throw!(DivisionByZero)
+ }
+ Ok(Num(a % b))
+ }
(Str(str), vals) => {
String::into_untyped(std_format(s.clone(), str.clone(), vals.clone())?, s)
}
@@ -75,6 +82,32 @@
})
}
+pub fn evaluate_compare_op(s: State, a: &Val, op: BinaryOpType, b: &Val) -> Result<Ordering> {
+ use Val::*;
+ Ok(match (a, b) {
+ (Str(a), Str(b)) => a.cmp(b),
+ (Num(a), Num(b)) => a.partial_cmp(b).expect("jsonnet numbers are non NaN"),
+ (Arr(a), Arr(b)) => {
+ let ai = a.iter(s.clone());
+ let bi = b.iter(s.clone());
+
+ for (a, b) in ai.zip(bi) {
+ let ord = evaluate_compare_op(s.clone(), &a?, op, &b?)?;
+ if !ord.is_eq() {
+ return Ok(ord);
+ }
+ }
+
+ a.len().cmp(&b.len())
+ }
+ (_, _) => throw!(BinaryOperatorDoesNotOperateOnValues(
+ op,
+ a.value_type(),
+ b.value_type()
+ )),
+ })
+}
+
pub fn evaluate_binary_op_normal(s: State, a: &Val, op: BinaryOpType, b: &Val) -> Result<Val> {
use BinaryOpType::*;
use Val::*;
@@ -84,6 +117,11 @@
(a, Eq, b) => Bool(equals(s, a, b)?),
(a, Neq, b) => Bool(!equals(s, a, b)?),
+ (a, Lt, b) => Bool(evaluate_compare_op(s, a, Lt, b)?.is_lt()),
+ (a, Gt, b) => Bool(evaluate_compare_op(s, a, Gt, b)?.is_gt()),
+ (a, Lte, b) => Bool(evaluate_compare_op(s, a, Lte, b)?.is_le()),
+ (a, Gte, b) => Bool(evaluate_compare_op(s, a, Gte, b)?.is_ge()),
+
(Str(a), In, Obj(obj)) => Bool(obj.has_field_ex(a.clone(), true)),
(a, Mod, b) => evaluate_mod_op(s, a, b)?,
@@ -92,17 +130,11 @@
// Bool X Bool
(Bool(a), And, Bool(b)) => Bool(*a && *b),
(Bool(a), Or, Bool(b)) => Bool(*a || *b),
-
- // Str X Str
- (Str(v1), Lt, Str(v2)) => Bool(v1 < v2),
- (Str(v1), Gt, Str(v2)) => Bool(v1 > v2),
- (Str(v1), Lte, Str(v2)) => Bool(v1 <= v2),
- (Str(v1), Gte, Str(v2)) => Bool(v1 >= v2),
// Num X Num
(Num(v1), Mul, Num(v2)) => Val::new_checked_num(v1 * v2)?,
(Num(v1), Div, Num(v2)) => {
- if *v2 <= f64::EPSILON {
+ if *v2 == 0.0 {
throw!(DivisionByZero)
}
Val::new_checked_num(v1 / v2)?
@@ -110,25 +142,20 @@
(Num(v1), Sub, Num(v2)) => Val::new_checked_num(v1 - v2)?,
- (Num(v1), Lt, Num(v2)) => Bool(v1 < v2),
- (Num(v1), Gt, Num(v2)) => Bool(v1 > v2),
- (Num(v1), Lte, Num(v2)) => Bool(v1 <= v2),
- (Num(v1), Gte, Num(v2)) => Bool(v1 >= v2),
-
- (Num(v1), BitAnd, Num(v2)) => Num(((*v1 as i32) & (*v2 as i32)) as f64),
- (Num(v1), BitOr, Num(v2)) => Num(((*v1 as i32) | (*v2 as i32)) as f64),
- (Num(v1), BitXor, Num(v2)) => Num(((*v1 as i32) ^ (*v2 as i32)) as f64),
+ (Num(v1), BitAnd, Num(v2)) => Num(f64::from((*v1 as i32) & (*v2 as i32))),
+ (Num(v1), BitOr, Num(v2)) => Num(f64::from((*v1 as i32) | (*v2 as i32))),
+ (Num(v1), BitXor, Num(v2)) => Num(f64::from((*v1 as i32) ^ (*v2 as i32))),
(Num(v1), Lhs, Num(v2)) => {
if *v2 < 0.0 {
throw!(RuntimeError("shift by negative exponent".into()))
}
- Num(((*v1 as i32) << (*v2 as i32)) as f64)
+ Num(f64::from((*v1 as i32) << (*v2 as i32)))
}
(Num(v1), Rhs, Num(v2)) => {
if *v2 < 0.0 {
throw!(RuntimeError("shift by negative exponent".into()))
}
- Num(((*v1 as i32) >> (*v2 as i32)) as f64)
+ Num(f64::from((*v1 as i32) >> (*v2 as i32)))
}
_ => throw!(BinaryOperatorDoesNotOperateOnValues(
crates/jrsonnet-evaluator/src/function.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/function.rs
+++ b/crates/jrsonnet-evaluator/src/function.rs
@@ -145,7 +145,7 @@
tailstrict: bool,
handler: &mut dyn FnMut(&IStr, LazyVal) -> Result<()>,
) -> Result<()> {
- for (name, arg) in self.named.iter() {
+ for (name, arg) in &self.named {
handler(
name,
if tailstrict {
@@ -162,8 +162,8 @@
}
fn named_names(&self, handler: &mut dyn FnMut(&IStr)) {
- for (name, _) in self.named.iter() {
- handler(name)
+ for (name, _) in &self.named {
+ handler(name);
}
}
}
@@ -231,7 +231,7 @@
}
}
-impl<A: ArgLike> ArgsLike for HashMap<IStr, A> {
+impl<A: ArgLike, S> ArgsLike for HashMap<IStr, A, S> {
fn unnamed_len(&self) -> usize {
0
}
@@ -325,7 +325,7 @@
}
fn named_names(&self, handler: &mut dyn FnMut(&IStr)) {
- (*self).named_names(handler)
+ (*self).named_names(handler);
}
}
@@ -381,18 +381,13 @@
if passed_args.contains_key(¶m.0.clone()) {
continue;
}
- LazyVal::new(TraceBox(Box::new(EvaluateNamedLazyVal {
- ctx: fctx.clone(),
- name: param.0.clone(),
- value: param.1.clone().unwrap(),
- })));
defaults.insert(
param.0.clone(),
LazyVal::new(TraceBox(Box::new(EvaluateNamedLazyVal {
ctx: fctx.clone(),
name: param.0.clone(),
- value: param.1.clone().unwrap(),
+ value: param.1.clone().expect("default exists"),
}))),
);
filled_args += 1;
@@ -447,7 +442,7 @@
// const INST: &'static Self;
}
-/// You shouldn't probally use this function, use jrsonnet_macros::builtin instead
+/// You shouldn't probally use this function, use `jrsonnet_macros::builtin` instead
///
/// ## Parameters
/// * `ctx`: used for passed argument expressions' execution and for body execution (if `body_ctx` is not set)
@@ -518,10 +513,6 @@
/// Creates Context, which has all argument default values applied
/// and with unbound values causing error to be returned
pub fn parse_default_function_call(body_ctx: Context, params: &ParamsDesc) -> Context {
- let fctx = Context::new_future();
-
- let mut bindings = GcHashMap::new();
-
#[derive(Trace)]
struct DependsOnUnbound(IStr);
impl LazyValValue for DependsOnUnbound {
@@ -530,6 +521,10 @@
}
}
+ let fctx = Context::new_future();
+
+ let mut bindings = GcHashMap::new();
+
for param in params.iter() {
if let Some(v) = ¶m.1 {
bindings.insert(
crates/jrsonnet-evaluator/src/gc.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/gc.rs
+++ b/crates/jrsonnet-evaluator/src/gc.rs
@@ -1,6 +1,7 @@
/// Macros to help deal with Gc
use std::{
borrow::{Borrow, BorrowMut},
+ collections::{HashMap, HashSet},
hash::BuildHasherDefault,
ops::{Deref, DerefMut},
};
@@ -14,7 +15,7 @@
impl<T: ?Sized + Trace> Trace for TraceBox<T> {
fn trace(&self, tracer: &mut Tracer) {
- self.0.trace(tracer)
+ self.0.trace(tracer);
}
fn is_type_tracked() -> bool {
@@ -70,7 +71,7 @@
pub struct GcHashSet<V>(pub FxHashSet<V>);
impl<V> GcHashSet<V> {
pub fn new() -> Self {
- Self(Default::default())
+ Self(HashSet::default())
}
pub fn with_capacity(capacity: usize) -> Self {
Self(FxHashSet::with_capacity_and_hasher(
@@ -111,7 +112,7 @@
pub struct GcHashMap<K, V>(pub FxHashMap<K, V>);
impl<K, V> GcHashMap<K, V> {
pub fn new() -> Self {
- Self(Default::default())
+ Self(HashMap::default())
}
pub fn with_capacity(capacity: usize) -> Self {
Self(FxHashMap::with_capacity_and_hasher(
crates/jrsonnet-evaluator/src/import.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/import.rs
+++ b/crates/jrsonnet-evaluator/src/import.rs
@@ -79,7 +79,7 @@
if direct.exists() {
Ok(direct.into())
} else {
- for library_path in self.library_paths.iter() {
+ for library_path in &self.library_paths {
let mut cloned = library_path.clone();
cloned.push(path);
if cloned.exists() {
crates/jrsonnet-evaluator/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/lib.rs
+++ b/crates/jrsonnet-evaluator/src/lib.rs
@@ -1,7 +1,22 @@
-#![warn(clippy::all, clippy::nursery)]
+#![warn(clippy::all, clippy::nursery, clippy::pedantic)]
#![allow(
macro_expanded_macro_exports_accessed_by_absolute_paths,
- clippy::ptr_arg
+ clippy::ptr_arg,
+ // Too verbose
+ clippy::must_use_candidate,
+ // A lot of functions pass around errors thrown by code
+ clippy::missing_errors_doc,
+ // A lot of pointers have interior Rc
+ clippy::needless_pass_by_value,
+ // Its fine
+ clippy::wildcard_imports,
+ clippy::enum_glob_use,
+ clippy::module_name_repetitions,
+ // TODO: fix individual issues, however this works as intended almost everywhere
+ clippy::cast_precision_loss,
+ clippy::cast_possible_wrap,
+ clippy::cast_possible_truncation,
+ clippy::cast_sign_loss,
)]
// For jrsonnet-macros
@@ -105,10 +120,10 @@
Self {
max_stack: 200,
max_trace: 20,
- globals: Default::default(),
- ext_vars: Default::default(),
- ext_natives: Default::default(),
- tla_vars: Default::default(),
+ globals: HashMap::default(),
+ ext_vars: HashMap::default(),
+ ext_natives: HashMap::default(),
+ tla_vars: HashMap::default(),
import_resolver: Box::new(DummyImportResolver),
manifest_format: ManifestFormat::Json {
padding: 4,
@@ -161,7 +176,7 @@
if self.0.is_empty() {
return result;
}
- for item in self.0.iter() {
+ for item in &self.0 {
if item.loc.belongs_to(loc) {
let mut collected = item.collected.borrow_mut();
let (depth, vals) = collected.entry(stack_generation).or_default();
@@ -198,7 +213,7 @@
)
.map_err(|error| ImportSyntaxError {
error: Box::new(error),
- path: path.to_owned(),
+ path: path.clone(),
source_code: source_code.clone(),
})?;
self.add_parsed_file(path, source_code, parsed.clone())?;
@@ -210,7 +225,7 @@
self.data_mut()
.files
.get_mut(name)
- .unwrap()
+ .expect("file not found")
.evaluated
.take();
}
@@ -246,7 +261,11 @@
line: usize,
column: usize,
) -> Option<usize> {
- location_to_offset(&self.get_source(file).unwrap(), line, column)
+ location_to_offset(
+ &self.get_source(file).expect("file not found"),
+ line,
+ column,
+ )
}
pub fn import_file(&self, from: &Path, path: &Path) -> Result<Val> {
let file_path = self.resolve_file(from, path)?;
@@ -312,8 +331,10 @@
STDLIB_STR.to_owned().into(),
builtin::get_parsed_stdlib(),
)
- .unwrap();
- let val = self.evaluate_loaded_file_raw(&std_path).unwrap();
+ .expect("stdlib is correct");
+ let val = self
+ .evaluate_loaded_file_raw(&std_path)
+ .expect("stdlib is correct");
self.settings_mut().globals.insert("std".into(), val);
self
}
@@ -342,9 +363,8 @@
// Error creation uses data, so i drop guard here
drop(data);
throw!(StackOverflow);
- } else {
- *stack_depth += 1;
}
+ *stack_depth += 1;
}
let result = f();
{
@@ -376,9 +396,8 @@
// Error creation uses data, so i drop guard here
drop(data);
throw!(StackOverflow);
- } else {
- *stack_depth += 1;
}
+ *stack_depth += 1;
}
let mut result = f();
{
@@ -411,9 +430,8 @@
// Error creation uses data, so i drop guard here
drop(data);
throw!(StackOverflow);
- } else {
- *stack_depth += 1;
}
+ *stack_depth += 1;
}
let result = f();
{
@@ -431,6 +449,8 @@
result
}
+ /// # Panics
+ /// In case of formatting failure
pub fn stringify_err(&self, e: &LocError) -> String {
let mut out = String::new();
self.settings()
@@ -1232,49 +1252,5 @@
assert_eval!(r#"std.assertEqual(std.count([], ""), 0)"#);
assert_eval!(r#"std.assertEqual(std.count(["a", "b", "a"], "d"), 0)"#);
assert_eval!(r#"std.assertEqual(std.count(["a", "b", "a"], "a"), 2)"#);
- }
-
- mod derive_typed {
- use std::path::PathBuf;
-
- use crate::{typed::Typed, State};
-
- #[derive(PartialEq, Debug, Typed)]
- struct MyTyped {
- a: u32,
- #[typed(rename = "b")]
- c: String,
- }
-
- #[test]
- fn test() {
- let es = State::default();
- let val = eval!("{a: 14, b: 'Hello, world!'}");
- let typed = MyTyped::try_from(val).unwrap();
-
- assert_eq!(
- typed,
- MyTyped {
- a: 14,
- c: "Hello, world!".to_string()
- }
- );
- es.settings_mut()
- .globals
- .insert("mytyped".into(), typed.try_into().unwrap());
-
- let v = es
- .evaluate_snippet_raw(
- PathBuf::from("raw.jsonnet").into(),
- "
- mytyped == {a: 14, b: 'Hello, world!'}
- "
- .into(),
- )
- .unwrap()
- .as_bool()
- .unwrap();
- assert!(v)
- }
}
}
crates/jrsonnet-evaluator/src/map.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/map.rs
+++ b/crates/jrsonnet-evaluator/src/map.rs
@@ -34,8 +34,7 @@
.0
.parent
.as_ref()
- .map(|p| p.contains_key(key))
- .unwrap_or(false)
+ .map_or(false, |p| p.contains_key(key))
}
}
crates/jrsonnet-evaluator/src/native.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/native.rs
+++ b/crates/jrsonnet-evaluator/src/native.rs
@@ -37,7 +37,7 @@
fn call(&self, s: State, ctx: Context, loc: CallLocation, args: &dyn ArgsLike) -> Result<Val> {
let args = parse_builtin_call(s.clone(), ctx, &self.params, args, true)?;
let mut out_args = Vec::with_capacity(self.params.len());
- for p in self.params.iter() {
+ for p in &self.params {
out_args.push(args[&p.name].evaluate(s.clone())?);
}
self.handler.call(s, loc.0.map(|l| l.0.clone()), &out_args)
crates/jrsonnet-evaluator/src/obj.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/obj.rs
+++ b/crates/jrsonnet-evaluator/src/obj.rs
@@ -2,6 +2,7 @@
cell::RefCell,
fmt::Debug,
hash::{Hash, Hasher},
+ ptr::addr_of,
};
use gcmodule::{Cc, Trace, Weak};
@@ -20,6 +21,11 @@
#[cfg(not(feature = "exp-preserve-order"))]
mod ordering {
+ #![allow(
+ // This module works as stub for preserve-order feature
+ clippy::unused_self,
+ )]
+
use gcmodule::Trace;
#[derive(Clone, Copy, Default, Debug, Trace)]
@@ -89,6 +95,7 @@
use ordering::*;
+#[allow(clippy::module_name_repetitions)]
#[derive(Debug, Trace)]
pub struct ObjMember {
pub add: bool,
@@ -113,6 +120,7 @@
Errored(LocError),
}
+#[allow(clippy::module_name_repetitions)]
#[derive(Trace)]
#[force_tracking]
pub struct ObjValueInternals {
@@ -136,10 +144,11 @@
impl Eq for WeakObjValue {}
impl Hash for WeakObjValue {
fn hash<H: Hasher>(&self, hasher: &mut H) {
- hasher.write_usize(weak_raw(self.0.clone()) as usize)
+ hasher.write_usize(weak_raw(self.0.clone()) as usize);
}
}
+#[allow(clippy::module_name_repetitions)]
#[derive(Clone, Trace)]
pub struct ObjValue(pub(crate) Cc<ObjValueInternals>);
impl Debug for ObjValue {
@@ -178,6 +187,7 @@
pub fn new_empty() -> Self {
Self::new(None, Cc::new(GcHashMap::new()), Cc::new(Vec::new()))
}
+ #[must_use]
pub fn extend_from(&self, super_obj: Self) -> Self {
match &self.0.super_obj {
None => Self::new(
@@ -200,6 +210,8 @@
pub fn extend_field(&mut self, name: IStr) -> ObjMemberBuilder<ExtendBuilder> {
ObjMemberBuilder::new(ExtendBuilder(self), name, FieldIndex::default())
}
+
+ #[must_use]
pub fn with_this(&self, this_obj: Self) -> Self {
Self(Cc::new(ObjValueInternals {
super_obj: self.0.super_obj.clone(),
@@ -222,11 +234,7 @@
if !self.0.this_entries.is_empty() {
return false;
}
- self.0
- .super_obj
- .as_ref()
- .map(|s| s.is_empty())
- .unwrap_or(true)
+ self.0.super_obj.as_ref().map_or(true, Self::is_empty)
}
/// Run callback for every field found in object
@@ -254,15 +262,15 @@
let new_sort_key = FieldSortKey::new(depth, member.original_index);
match member.visibility {
Visibility::Normal => {
- let entry = out.entry(name.to_owned());
+ let entry = out.entry(name.clone());
let v = entry.or_insert((true, new_sort_key));
v.1 = new_sort_key;
}
Visibility::Hidden => {
- out.insert(name.to_owned(), (false, new_sort_key));
+ out.insert(name.clone(), (false, new_sort_key));
}
Visibility::Unhide => {
- out.insert(name.to_owned(), (true, new_sort_key));
+ out.insert(name.clone(), (true, new_sort_key));
}
};
false
@@ -356,8 +364,7 @@
}
pub fn has_field(&self, name: IStr) -> bool {
self.field_visibility(name)
- .map(|v| v.is_visible())
- .unwrap_or(false)
+ .map_or(false, |v| v.is_visible())
}
pub fn get(&self, s: State, key: IStr) -> Result<Option<Val>> {
@@ -459,10 +466,11 @@
impl Eq for ObjValue {}
impl Hash for ObjValue {
fn hash<H: Hasher>(&self, hasher: &mut H) {
- hasher.write_usize(&*self.0 as *const _ as usize)
+ hasher.write_usize(addr_of!(*self.0) as usize);
}
}
+#[allow(clippy::module_name_repetitions)]
pub struct ObjValueBuilder {
super_obj: Option<ObjValue>,
map: GcHashMap<IStr, ObjMember>,
@@ -510,6 +518,7 @@
}
}
+#[allow(clippy::module_name_repetitions)]
#[must_use = "value not added unless binding() was called"]
pub struct ObjMemberBuilder<Kind> {
kind: Kind,
@@ -583,7 +592,7 @@
CallLocation(location.as_ref()),
|| format!("field <{}> initializtion", name.clone()),
|| throw!(DuplicateFieldName(name.clone())),
- )?
+ )?;
}
Ok(())
}
@@ -592,14 +601,14 @@
pub struct ExtendBuilder<'v>(&'v mut ObjValue);
impl<'v> ObjMemberBuilder<ExtendBuilder<'v>> {
pub fn value(self, value: Val) {
- self.binding(LazyBinding::Bound(LazyVal::new_resolved(value)))
+ self.binding(LazyBinding::Bound(LazyVal::new_resolved(value)));
}
pub fn bindable(self, bindable: TraceBox<dyn Bindable>) {
- self.binding(LazyBinding::Bindable(Cc::new(bindable)))
+ self.binding(LazyBinding::Bindable(Cc::new(bindable)));
}
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)
+ *receiver.0 = new.extend_with_raw_member(name, member);
}
}
crates/jrsonnet-evaluator/src/trace/location.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/trace/location.rs
+++ b/crates/jrsonnet-evaluator/src/trace/location.rs
@@ -1,3 +1,4 @@
+#[allow(clippy::module_name_repetitions)]
#[derive(Clone, PartialEq, Debug)]
pub struct CodeLocation {
pub offset: usize,
@@ -9,6 +10,7 @@
pub line_end_offset: usize,
}
+#[allow(clippy::module_name_repetitions)]
pub fn location_to_offset(mut file: &str, mut line: usize, column: usize) -> Option<usize> {
let mut offset = 0;
while line > 1 {
@@ -21,13 +23,14 @@
Some(offset)
}
+#[allow(clippy::module_name_repetitions)]
pub fn offset_to_location(file: &str, offsets: &[usize]) -> Vec<CodeLocation> {
if offsets.is_empty() {
return vec![];
}
let mut line = 1;
let mut column = 1;
- let max_offset = *offsets.iter().max().unwrap();
+ let max_offset = *offsets.iter().max().expect("offsets is not empty");
let mut offset_map = offsets
.iter()
crates/jrsonnet-evaluator/src/trace/mod.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/trace/mod.rs
+++ b/crates/jrsonnet-evaluator/src/trace/mod.rs
@@ -19,14 +19,18 @@
impl PathResolver {
pub fn resolve(&self, from: &Path) -> String {
match self {
- Self::FileName => from.file_name().unwrap().to_string_lossy().into_owned(),
+ Self::FileName => from
+ .file_name()
+ .expect("file name exists")
+ .to_string_lossy()
+ .into_owned(),
Self::Absolute => from.to_string_lossy().into_owned(),
Self::Relative(base) => {
if from.is_relative() {
return from.to_string_lossy().into_owned();
}
pathdiff::diff_paths(from, base)
- .unwrap()
+ .expect("base is absolute")
.to_string_lossy()
.into_owned()
}
@@ -35,6 +39,7 @@
}
/// Implements pretty-printing of traces
+#[allow(clippy::module_name_repetitions)]
pub trait TraceFormat {
fn write_trace(
&self,
@@ -88,8 +93,9 @@
error,
} = error.error()
{
+ use std::fmt::Write;
+
writeln!(out)?;
- use std::fmt::Write;
let mut n = self.resolver.resolve(path);
let mut offset = error.location.offset;
let is_eof = if offset >= source_code.len() {
@@ -134,7 +140,7 @@
let align = file_names
.iter()
.flatten()
- .map(|e| e.len())
+ .map(String::len)
.max()
.unwrap_or(0);
for (el, file) in error.trace().0.iter().zip(file_names) {
@@ -166,7 +172,7 @@
error: &LocError,
) -> Result<(), std::fmt::Error> {
write!(out, "{}", error.error())?;
- for item in error.trace().0.iter() {
+ for item in &error.trace().0 {
writeln!(out)?;
let desc = &item.desc;
if let Some(source) = &item.location {
@@ -227,7 +233,7 @@
)?;
}
let trace = &error.trace();
- for item in trace.0.iter() {
+ for item in &trace.0 {
writeln!(out)?;
let desc = &item.desc;
if let Some(source) = &item.location {
@@ -273,7 +279,7 @@
let snippet = Snippet {
opt: FormatOptions {
color: true,
- ..Default::default()
+ ..FormatOptions::default()
},
title: None,
footer: vec![],
crates/jrsonnet-evaluator/src/typed/conversions.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/typed/conversions.rs
+++ b/crates/jrsonnet-evaluator/src/typed/conversions.rs
@@ -38,6 +38,7 @@
<Self as Typed>::TYPE.check(s, &value)?;
match value {
Val::Num(n) => {
+ #[allow(clippy::float_cmp)]
if n.trunc() != n {
throw!(RuntimeError(
format!(
@@ -95,6 +96,7 @@
<Self as Typed>::TYPE.check(s, &value)?;
match value {
Val::Num(n) => {
+ #[allow(clippy::float_cmp)]
if n.trunc() != n {
throw!(RuntimeError(
format!(
@@ -160,7 +162,7 @@
impl Typed for usize {
// It is possible to store 54 bits of precision in f64, but leaving u32::MAX here for compatibility
const TYPE: &'static ComplexValType =
- &ComplexValType::BoundedNumber(Some(0.0), Some(4294967295.0));
+ &ComplexValType::BoundedNumber(Some(0.0), Some(u32::MAX as f64));
fn into_untyped(value: Self, _: State) -> Result<Val> {
if value > u32::MAX as Self {
@@ -173,6 +175,7 @@
<Self as Typed>::TYPE.check(s, &value)?;
match value {
Val::Num(n) => {
+ #[allow(clippy::float_cmp)]
if n.trunc() != n {
throw!(RuntimeError(
"cannot convert number with fractional part to usize".into()
@@ -263,7 +266,7 @@
}
/// To be used in Vec<Any>
-/// Regular Val can't be used here, because it has wrong TryFrom::Error type
+/// Regular Val can't be used here, because it has wrong `TryFrom::Error` type
#[derive(Clone)]
pub struct Any(pub Val);
@@ -279,7 +282,7 @@
}
}
-/// Specialization, provides faster TryFrom<VecVal> for Val
+/// Specialization, provides faster `TryFrom<VecVal>` for Val
pub struct VecVal(pub Cc<Vec<Val>>);
impl Typed for VecVal {
@@ -310,22 +313,20 @@
}
fn from_untyped(value: Val, s: State) -> Result<Self> {
+ if let Val::Arr(ArrValue::Bytes(bytes)) = value {
+ return Ok(Self(bytes));
+ }
+ <Self as Typed>::TYPE.check(s.clone(), &value)?;
match value {
- Val::Arr(ArrValue::Bytes(bytes)) => Ok(Self(bytes)),
- _ => {
- <Self as Typed>::TYPE.check(s.clone(), &value)?;
- match value {
- Val::Arr(a) => {
- let mut out = Vec::with_capacity(a.len());
- for e in a.iter(s.clone()) {
- let r = e?;
- out.push(u8::from_untyped(r, s.clone())?);
- }
- Ok(Self(out.into()))
- }
- _ => unreachable!(),
+ Val::Arr(a) => {
+ let mut out = Vec::with_capacity(a.len());
+ for e in a.iter(s.clone()) {
+ let r = e?;
+ out.push(u8::from_untyped(r, s.clone())?);
}
+ Ok(Self(out.into()))
}
+ _ => unreachable!(),
}
}
}
crates/jrsonnet-evaluator/src/typed/mod.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/typed/mod.rs
+++ b/crates/jrsonnet-evaluator/src/typed/mod.rs
@@ -71,11 +71,11 @@
if line.trim().is_empty() {
continue;
}
- if i != 0 {
+ if i == 0 {
+ write!(f, " - ")?;
+ } else {
writeln!(f)?;
write!(f, " ")?;
- } else {
- write!(f, " - ")?;
}
write!(f, "{}", line)?;
}
@@ -94,7 +94,7 @@
Ok(_) => Ok(()),
Err(mut e) => {
if let Error::TypeError(e) = &mut e.error_mut() {
- (e.1).0.push(path())
+ (e.1).0.push(path());
}
Err(e)
}
@@ -145,6 +145,7 @@
}
impl CheckType for ComplexValType {
+ #[allow(clippy::too_many_lines)]
fn check(&self, s: State, value: &Val) -> Result<()> {
match self {
Self::Any => Ok(()),
@@ -202,7 +203,7 @@
|| format!("property {}", k),
|| ValuePathItem::Field((*k).into()),
|| v.check(s.clone(), &got_v),
- )?
+ )?;
} else {
return Err(
TypeError::MissingProperty((*k).into(), self.clone()).into()
@@ -245,13 +246,13 @@
}
Self::Sum(types) => {
for ty in types.iter() {
- ty.check(s.clone(), value)?
+ ty.check(s.clone(), value)?;
}
Ok(())
}
Self::SumRef(types) => {
for ty in types.iter() {
- ty.check(s.clone(), value)?
+ ty.check(s.clone(), value)?;
}
Ok(())
}
crates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -32,6 +32,7 @@
Pending,
}
+#[allow(clippy::module_name_repetitions)]
#[derive(Clone, Trace)]
pub struct LazyVal(Cc<RefCell<LazyValInternals>>);
impl LazyVal {
@@ -50,7 +51,7 @@
LazyValInternals::Computed(v) => return Ok(v.clone()),
LazyValInternals::Errored(e) => return Err(e.clone()),
LazyValInternals::Pending => return Err(InfiniteRecursionDetected.into()),
- _ => (),
+ LazyValInternals::Waiting(..) => (),
};
let value = if let LazyValInternals::Waiting(value) =
std::mem::replace(&mut *self.0.borrow_mut(), LazyValInternals::Pending)
@@ -114,6 +115,7 @@
}
}
+#[allow(clippy::module_name_repetitions)]
#[derive(Trace, Clone)]
pub enum FuncVal {
/// Plain function implemented in jsonnet
@@ -225,10 +227,10 @@
let rem = diff % self.step();
let div = diff / self.step();
- if rem != 0 {
+ if rem == 0 {
+ div
+ } else {
div + 1
- } else {
- div
}
}
}
@@ -248,11 +250,17 @@
pub fn new_eager() -> Self {
Self::Eager(Cc::new(Vec::new()))
}
+
+ /// # Panics
+ /// If a > b
pub fn new_range(a: i32, b: i32) -> Self {
assert!(a <= b);
Self::Range(a, b)
}
+ /// # Panics
+ /// If passed numbers are incorrect
+ #[must_use]
pub fn slice(self, from: Option<usize>, to: Option<usize>, step: Option<usize>) -> Self {
let len = self.len();
let from = from.unwrap_or(0);
@@ -289,7 +297,7 @@
match self {
Self::Bytes(i) => i
.get(index)
- .map_or(Ok(None), |v| Ok(Some(Val::Num(*v as f64)))),
+ .map_or(Ok(None), |v| Ok(Some(Val::Num(f64::from(*v))))),
Self::Lazy(vec) => {
if let Some(v) = vec.get(index) {
Ok(Some(v.evaluate(s)?))
@@ -333,7 +341,7 @@
match self {
Self::Bytes(i) => i
.get(index)
- .map(|b| LazyVal::new_resolved(Val::Num(*b as f64))),
+ .map(|b| LazyVal::new_resolved(Val::Num(f64::from(*b)))),
Self::Lazy(vec) => vec.get(index).cloned(),
Self::Eager(vec) => vec.get(index).cloned().map(LazyVal::new_resolved),
Self::Extended(v) => {
@@ -374,7 +382,7 @@
Self::Bytes(i) => {
let mut out = Vec::with_capacity(i.len());
for v in i.iter() {
- out.push(Val::Num(*v as f64));
+ out.push(Val::Num(f64::from(*v)));
}
Cc::new(out)
}
@@ -396,7 +404,7 @@
Self::Range(a, b) => {
let mut out = Vec::with_capacity(self.len());
for i in *a..*b {
- out.push(Val::Num(i as f64));
+ out.push(Val::Num(f64::from(i)));
}
Cc::new(out)
}
@@ -414,7 +422,7 @@
.take(v.to() - v.from())
.step_by(v.step())
{
- out.push(v.evaluate(s.clone())?)
+ out.push(v.evaluate(s.clone())?);
}
Cc::new(out)
}
@@ -423,28 +431,27 @@
pub fn iter(&self, s: State) -> impl DoubleEndedIterator<Item = Result<Val>> + '_ {
(0..self.len()).map(move |idx| match self {
- Self::Bytes(b) => Ok(Val::Num(b[idx] as f64)),
+ Self::Bytes(b) => Ok(Val::Num(f64::from(b[idx]))),
Self::Lazy(l) => l[idx].evaluate(s.clone()),
Self::Eager(e) => Ok(e[idx].clone()),
- Self::Extended(_) => self.get(s.clone(), idx).map(|e| e.unwrap()),
- Self::Range(..) => self.get(s.clone(), idx).map(|e| e.unwrap()),
- Self::Reversed(..) => self.get(s.clone(), idx).map(|e| e.unwrap()),
- Self::Slice(..) => self.get(s.clone(), idx).map(|e| e.unwrap()),
+ Self::Extended(..) | Self::Range(..) | Self::Reversed(..) | Self::Slice(..) => {
+ self.get(s.clone(), idx).map(|e| e.expect("idx < len"))
+ }
})
}
pub fn iter_lazy(&self) -> impl DoubleEndedIterator<Item = LazyVal> + '_ {
(0..self.len()).map(move |idx| match self {
- Self::Bytes(b) => LazyVal::new_resolved(Val::Num(b[idx] as f64)),
+ Self::Bytes(b) => LazyVal::new_resolved(Val::Num(f64::from(b[idx]))),
Self::Lazy(l) => l[idx].clone(),
Self::Eager(e) => LazyVal::new_resolved(e[idx].clone()),
- Self::Extended(_) => self.get_lazy(idx).unwrap(),
- Self::Range(..) => self.get_lazy(idx).unwrap(),
- Self::Reversed(..) => self.get_lazy(idx).unwrap(),
- Self::Slice(..) => self.get_lazy(idx).unwrap(),
+ Self::Slice(..) | Self::Extended(..) | Self::Range(..) | Self::Reversed(..) => {
+ self.get_lazy(idx).expect("idx < len")
+ }
})
}
+ #[must_use]
pub fn reversed(self) -> Self {
Self::Reversed(Box::new(self))
}
@@ -493,6 +500,7 @@
}
}
+#[allow(clippy::module_name_repetitions)]
pub enum IndexableVal {
Str(IStr),
Arr(ArrValue),
@@ -708,7 +716,7 @@
preserve_order,
},
)
- .map(|s| s.into())
+ .map(Into::into)
}
/// Calls `std.manifestJson`
@@ -730,7 +738,7 @@
preserve_order,
},
)
- .map(|s| s.into())
+ .map(Into::into)
}
pub fn to_yaml(
@@ -751,7 +759,7 @@
preserve_order,
},
)
- .map(|s| s.into())
+ .map(Into::into)
}
pub fn into_indexable(self) -> Result<IndexableVal> {
Ok(match self {
@@ -824,8 +832,8 @@
for field in fields {
if !equals(
s.clone(),
- &a.get(s.clone(), field.clone())?.unwrap(),
- &b.get(s.clone(), field)?.unwrap(),
+ &a.get(s.clone(), field.clone())?.expect("field exists"),
+ &b.get(s.clone(), field)?.expect("field exists"),
)? {
return Ok(false);
}
crates/jrsonnet-evaluator/tests/common.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/tests/common.rs
+++ b/crates/jrsonnet-evaluator/tests/common.rs
@@ -12,6 +12,15 @@
}
#[macro_export]
+macro_rules! ensure {
+ ($v:expr $(,)?) => {
+ if !$v {
+ ::jrsonnet_evaluator::throw_runtime!("assertion failed: {}", stringify!($v))
+ }
+ };
+}
+
+#[macro_export]
macro_rules! ensure_val_eq {
($s:expr, $a:expr, $b:expr) => {{
if !::jrsonnet_evaluator::val::equals($s.clone(), &$a.clone(), &$b.clone())? {
crates/jrsonnet-evaluator/tests/sanity.rsdiffbeforeafterboth--- /dev/null
+++ b/crates/jrsonnet-evaluator/tests/sanity.rs
@@ -0,0 +1,46 @@
+use std::path::PathBuf;
+
+use jrsonnet_evaluator::{error::Result, throw_runtime, State, Val};
+
+mod common;
+
+#[test]
+fn assert_positive() -> Result<()> {
+ let s = State::default();
+ s.with_stdlib();
+
+ let v = s.evaluate_snippet_raw(PathBuf::new().into(), "assert 1 == 1: 'fail'; null".into())?;
+ ensure_val_eq!(s.clone(), v, Val::Null);
+ let v = s.evaluate_snippet_raw(PathBuf::new().into(), "std.assertEqual(1, 1)".into())?;
+ ensure_val_eq!(s.clone(), v, Val::Bool(true));
+
+ Ok(())
+}
+
+#[test]
+fn assert_negative() -> Result<()> {
+ let s = State::default();
+ s.with_stdlib();
+
+ {
+ let e = match s
+ .evaluate_snippet_raw(PathBuf::new().into(), "assert 1 == 2: 'fail'; null".into())
+ {
+ Ok(_) => throw_runtime!("assertion should fail"),
+ Err(e) => e,
+ };
+ let e = s.stringify_err(&e);
+ ensure!(e.starts_with("assert failed: fail\n"));
+ }
+ {
+ let e = match s.evaluate_snippet_raw(PathBuf::new().into(), "std.assertEqual(1, 2)".into())
+ {
+ Ok(_) => throw_runtime!("assertion should fail"),
+ Err(e) => e,
+ };
+ let e = s.stringify_err(&e);
+ ensure!(e.starts_with("runtime error: Assertion failed. 1 != 2"))
+ }
+
+ Ok(())
+}
crates/jrsonnet-macros/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-macros/src/lib.rs
+++ b/crates/jrsonnet-macros/src/lib.rs
@@ -157,8 +157,8 @@
});
}
- match &ty as &Type {
- Type::Reference(r) if type_is_path(&r.elem, &name).is_some() => return Ok(Self::This),
+ match ty as &Type {
+ Type::Reference(r) if type_is_path(&r.elem, name).is_some() => return Ok(Self::This),
_ => {}
}
@@ -465,14 +465,13 @@
"strategy should be set when flattening Option",
));
}
- } else {
- if attr.flatten_ok {
- return Err(Error::new(
- field.span(),
- "flatten(ok) is only useable on optional fields",
- ));
- }
+ } else if attr.flatten_ok {
+ return Err(Error::new(
+ field.span(),
+ "flatten(ok) is only useable on optional fields",
+ ));
}
+
Ok(Self {
attr,
ident,