difftreelog
style increase clippy linting level
in: master
15 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
@@ -314,7 +314,7 @@
for _ in 0..zp2 {
out.push('0');
}
- out.push_str(&prefix);
+ out.push_str(prefix);
for digit in digits.into_iter().rev() {
let ch = NUMBERS[digit as usize] as char;
@@ -399,7 +399,10 @@
}
return;
}
- let frac = (n.fract() * 10.0_f64.powf(precision as f64) + 0.5).floor();
+ let frac = n
+ .fract()
+ .mul_add(10.0_f64.powf(precision as f64), 0.5)
+ .floor();
if trailing || frac > 0.0 {
out.push('.');
let mut frac_str = String::new();
@@ -605,7 +608,7 @@
}
pub fn format_arr(str: &str, mut values: &[Val]) -> Result<String> {
- let codes = parse_codes(&str)?;
+ let codes = parse_codes(str)?;
let mut out = String::new();
for code in codes {
@@ -659,7 +662,7 @@
}
pub fn format_obj(str: &str, values: &ObjValue) -> Result<String> {
- let codes = parse_codes(&str)?;
+ let codes = parse_codes(str)?;
let mut out = String::new();
for code in codes {
crates/jrsonnet-evaluator/src/builtin/manifest.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/builtin/manifest.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/manifest.rs
@@ -20,7 +20,7 @@
pub mtype: ManifestType,
}
-pub(crate) fn manifest_json_ex(val: &Val, options: &ManifestJsonOptions<'_>) -> Result<String> {
+pub fn manifest_json_ex(val: &Val, options: &ManifestJsonOptions<'_>) -> Result<String> {
let mut out = String::new();
manifest_json_ex_buf(val, &mut out, &mut String::new(), options)?;
Ok(out)
crates/jrsonnet-evaluator/src/builtin/mod.rsdiffbeforeafterboth1use crate::{2 equals,3 error::{Error::*, Result},4 evaluate, parse_args, primitive_equals, push, throw, with_state, Context, FuncVal, Val,5 ValType,6};7use format::{format_arr, format_obj};8use jrsonnet_parser::{ArgsDesc, ExprLocation};9use manifest::{escape_string_json, manifest_json_ex, ManifestJsonOptions, ManifestType};10use std::{path::PathBuf, rc::Rc};1112pub mod stdlib;13pub use stdlib::*;1415pub mod format;16pub mod manifest;17pub mod sort;1819pub fn call_builtin(20 context: Context,21 loc: &Option<ExprLocation>,22 ns: &str,23 name: &str,24 args: &ArgsDesc,25) -> Result<Val> {26 Ok(match (ns, &name as &str) {27 // arr/string/function28 ("std", "length") => parse_args!(context, "std.length", args, 1, [29 0, x: [Val::Str|Val::Arr|Val::Obj], vec![ValType::Str, ValType::Arr, ValType::Obj];30 ], {31 Ok(match x {32 Val::Str(n) => Val::Num(n.chars().count() as f64),33 Val::Arr(i) => Val::Num(i.len() as f64),34 Val::Obj(o) => Val::Num(35 o.fields_visibility()36 .into_iter()37 .filter(|(_k, v)| *v)38 .count() as f64,39 ),40 _ => unreachable!(),41 })42 })?,43 // any44 ("std", "type") => parse_args!(context, "std.type", args, 1, [45 0, x, vec![];46 ], {47 Ok(Val::Str(x.value_type()?.name().into()))48 })?,49 // length, idx=>any50 ("std", "makeArray") => parse_args!(context, "std.makeArray", args, 2, [51 0, sz: [Val::Num]!!Val::Num, vec![ValType::Num];52 1, func: [Val::Func]!!Val::Func, vec![ValType::Func];53 ], {54 if sz < 0.0 {55 throw!(RuntimeError(format!("makeArray requires size >= 0, got {}", sz).into()));56 }57 let mut out = Vec::with_capacity(sz as usize);58 for i in 0..sz as usize {59 out.push(func.evaluate_values(60 Context::new(),61 &[Val::Num(i as f64)]62 )?)63 }64 Ok(Val::Arr(Rc::new(out)))65 })?,66 // string67 ("std", "codepoint") => parse_args!(context, "std.codepoint", args, 1, [68 0, str: [Val::Str]!!Val::Str, vec![ValType::Str];69 ], {70 assert!(71 str.chars().count() == 1,72 "std.codepoint should receive single char string"73 );74 Ok(Val::Num(str.chars().take(1).next().unwrap() as u32 as f64))75 })?,76 // object, includeHidden77 ("std", "objectFieldsEx") => parse_args!(context, "std.objectFieldsEx",args, 2, [78 0, obj: [Val::Obj]!!Val::Obj, vec![ValType::Obj];79 1, inc_hidden: [Val::Bool]!!Val::Bool, vec![ValType::Bool];80 ], {81 let mut out = obj.fields_visibility()82 .into_iter()83 .filter(|(_k, v)| *v || inc_hidden)84 .map(|(k, _v)|k)85 .collect::<Vec<_>>();86 out.sort();87 Ok(Val::Arr(Rc::new(out.into_iter().map(Val::Str).collect())))88 })?,89 // object, field, includeHidden90 ("std", "objectHasEx") => parse_args!(context, "std.objectHasEx", args, 3, [91 0, obj: [Val::Obj]!!Val::Obj, vec![ValType::Obj];92 1, f: [Val::Str]!!Val::Str, vec![ValType::Str];93 2, inc_hidden: [Val::Bool]!!Val::Bool, vec![ValType::Bool];94 ], {95 Ok(Val::Bool(96 obj.fields_visibility()97 .into_iter()98 .filter(|(_k, v)| *v || inc_hidden)99 .any(|(k, _v)| *k == *f),100 ))101 })?,102 ("std", "primitiveEquals") => parse_args!(context, "std.primitiveEquals", args, 2, [103 0, a, vec![];104 1, b, vec![];105 ], {106 Ok(Val::Bool(primitive_equals(&a, &b)?))107 })?,108 // faster109 ("std", "equals") => parse_args!(context, "std.equals", args, 2, [110 0, a, vec![];111 1, b, vec![];112 ], {113 Ok(Val::Bool(equals(&a, &b)?))114 })?,115 ("std", "modulo") => parse_args!(context, "std.modulo", args, 2, [116 0, a: [Val::Num]!!Val::Num, vec![ValType::Num];117 1, b: [Val::Num]!!Val::Num, vec![ValType::Num];118 ], {119 Ok(Val::Num(a % b))120 })?,121 ("std", "floor") => parse_args!(context, "std.floor", args, 1, [122 0, x: [Val::Num]!!Val::Num, vec![ValType::Num];123 ], {124 Ok(Val::Num(x.floor()))125 })?,126 ("std", "log") => parse_args!(context, "std.log", args, 2, [127 0, n: [Val::Num]!!Val::Num, vec![ValType::Num];128 ], {129 Ok(Val::Num(n.ln()))130 })?,131 ("std", "trace") => parse_args!(context, "std.trace", args, 2, [132 0, str: [Val::Str]!!Val::Str, vec![ValType::Str];133 1, rest, vec![];134 ], {135 eprint!("TRACE:");136 if let Some(loc) = loc {137 with_state(|s|{138 let locs = s.map_source_locations(&loc.0, &[loc.1]);139 eprint!(" {}:{}", loc.0.file_name().unwrap().to_str().unwrap(), locs[0].line);140 });141 }142 eprintln!(" {}", str);143 Ok(rest)144 })?,145 ("std", "pow") => parse_args!(context, "std.modulo", args, 2, [146 0, x: [Val::Num]!!Val::Num, vec![ValType::Num];147 1, n: [Val::Num]!!Val::Num, vec![ValType::Num];148 ], {149 Ok(Val::Num(x.powf(n)))150 })?,151 ("std", "extVar") => parse_args!(context, "std.extVar", args, 1, [152 0, x: [Val::Str]!!Val::Str, vec![ValType::Str];153 ], {154 Ok(with_state(|s| s.settings().ext_vars.get(&x).cloned()).ok_or_else(155 || UndefinedExternalVariable(x),156 )?)157 })?,158 ("std", "native") => parse_args!(context, "std.native", args, 1, [159 0, x: [Val::Str]!!Val::Str, vec![ValType::Str];160 ], {161 Ok(with_state(|s| s.settings().ext_natives.get(&x).cloned()).map(|v| Val::Func(Rc::new(FuncVal::NativeExt(x.clone(), v)))).ok_or_else(162 || UndefinedExternalFunction(x),163 )?)164 })?,165 ("std", "filter") => parse_args!(context, "std.filter", args, 2, [166 0, func: [Val::Func]!!Val::Func, vec![ValType::Func];167 1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];168 ], {169 Ok(Val::Arr(Rc::new(170 arr.iter()171 .cloned()172 .filter(|e| {173 func174 .evaluate_values(context.clone(), &[e.clone()])175 .unwrap()176 .try_cast_bool("filter predicate")177 .unwrap()178 })179 .collect(),180 )))181 })?,182 // faster183 ("std", "foldl") => parse_args!(context, "std.foldl", args, 3, [184 0, func: [Val::Func]!!Val::Func, vec![ValType::Func];185 1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];186 2, init, vec![];187 ], {188 let mut acc = init;189 for i in arr.iter().cloned() {190 acc = func.evaluate_values(context.clone(), &[acc, i])?;191 }192 Ok(acc)193 })?,194 // faster195 ("std", "foldr") => parse_args!(context, "std.foldr", args, 3, [196 0, func: [Val::Func]!!Val::Func, vec![ValType::Func];197 1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];198 2, init, vec![];199 ], {200 let mut acc = init;201 for i in arr.iter().rev().cloned() {202 acc = func.evaluate_values(context.clone(), &[acc, i])?;203 }204 Ok(acc)205 })?,206 // faster207 #[allow(non_snake_case)]208 ("std", "sortImpl") => parse_args!(context, "std.sort", args, 2, [209 0, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];210 1, keyF: [Val::Func]!!Val::Func, vec![ValType::Func];211 ], {212 if arr.len() <= 1 {213 return Ok(Val::Arr(arr))214 }215 Ok(Val::Arr(sort::sort(context, arr, &keyF)?))216 })?,217 // faster218 ("std", "format") => parse_args!(context, "std.format", args, 2, [219 0, str: [Val::Str]!!Val::Str, vec![ValType::Str];220 1, vals, vec![]221 ], {222 push(&Some(ExprLocation(Rc::from(PathBuf::from("std.jsonnet")), 0, 0)), ||format!("std.format of {}", str), ||{223 Ok(match vals {224 Val::Arr(vals) => Val::Str(format_arr(&str, &vals)?.into()),225 Val::Obj(obj) => Val::Str(format_obj(&str, &obj)?.into()),226 o => Val::Str(format_arr(&str, &[o])?.into()),227 })228 })229 })?,230 // faster231 ("std", "range") => parse_args!(context, "std.range", args, 2, [232 0, from: [Val::Num]!!Val::Num, vec![ValType::Num];233 1, to: [Val::Num]!!Val::Num, vec![ValType::Num];234 ], {235 let mut out = Vec::with_capacity((1+to as usize-from as usize).max(0));236 for i in from as usize..=to as usize {237 out.push(Val::Num(i as f64));238 }239 Ok(Val::Arr(Rc::new(out)))240 })?,241 ("std", "char") => parse_args!(context, "std.char", args, 1, [242 0, n: [Val::Num]!!Val::Num, vec![ValType::Num];243 ], {244 let mut out = String::new();245 out.push(std::char::from_u32(n as u32).ok_or_else(||246 InvalidUnicodeCodepointGot(n as u32)247 )?);248 Ok(Val::Str(out.into()))249 })?,250 ("std", "encodeUTF8") => parse_args!(context, "std.encodeUtf8", args, 1, [251 0, str: [Val::Str]!!Val::Str, vec![ValType::Str];252 ], {253 Ok(Val::Arr(Rc::new(str.bytes().map(|b| Val::Num(b as f64)).collect())))254 })?,255 ("std", "md5") => parse_args!(context, "std.md5", args, 1, [256 0, str: [Val::Str]!!Val::Str, vec![ValType::Str];257 ], {258 Ok(Val::Str(format!("{:x}", md5::compute(&str.as_bytes())).into()))259 })?,260 // faster261 ("std", "base64") => parse_args!(context, "std.base64", args, 1, [262 0, input: [Val::Str | Val::Arr], vec![ValType::Arr, ValType::Str];263 ], {264 Ok(Val::Str(match input {265 Val::Str(s) => {266 base64::encode(s.bytes().collect::<Vec<_>>()).into()267 },268 Val::Arr(a) => {269 base64::encode(a.iter().map(|v| {270 Ok(v.clone().try_cast_num("base64 array")? as u8)271 }).collect::<Result<Vec<_>>>()?).into()272 },273 _ => unreachable!()274 }))275 })?,276 // faster277 ("std", "join") => parse_args!(context, "std.join", args, 2, [278 0, sep: [Val::Str|Val::Arr], vec![ValType::Str, ValType::Arr];279 1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];280 ], {281 Ok(match sep {282 Val::Arr(joiner_items) => {283 let mut out = Vec::new();284285 let mut first = true;286 for item in arr.iter().cloned() {287 if let Val::Arr(items) = item.unwrap_if_lazy()? {288 if !first {289 out.reserve(joiner_items.len());290 out.extend(joiner_items.iter().cloned());291 }292 first = false;293 out.reserve(items.len());294 out.extend(items.iter().cloned());295 } else {296 throw!(RuntimeError("in std.join all items should be arrays".into()));297 }298 }299300 Val::Arr(Rc::new(out))301 },302 Val::Str(sep) => {303 let mut out = String::new();304305 let mut first = true;306 for item in arr.iter().cloned() {307 if let Val::Str(item) = item.unwrap_if_lazy()? {308 if !first {309 out += &sep;310 }311 first = false;312 out += &item;313 } else {314 throw!(RuntimeError("in std.join all items should be strings".into()));315 }316 }317318 Val::Str(out.into())319 },320 _ => unreachable!()321 })322 })?,323 // Faster324 ("std", "escapeStringJson") => parse_args!(context, "std.escapeStringJson", args, 1, [325 0, str_: [Val::Str]!!Val::Str, vec![ValType::Str];326 ], {327 Ok(Val::Str(escape_string_json(&str_).into()))328 })?,329 // Faster330 ("std", "manifestJsonEx") => parse_args!(context, "std.manifestJsonEx", args, 2, [331 0, value, vec![];332 1, indent: [Val::Str]!!Val::Str, vec![ValType::Str];333 ], {334 Ok(Val::Str(manifest_json_ex(&value, &ManifestJsonOptions {335 padding: &indent,336 mtype: ManifestType::Std,337 })?.into()))338 })?,339 // Faster340 ("std", "reverse") => parse_args!(context, "std.reverse", args, 1, [341 0, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];342 ], {343 let mut marr = arr;344 Rc::make_mut(&mut marr).reverse();345 Ok(Val::Arr(marr))346 })?,347 ("std", "id") => parse_args!(context, "std.id", args, 1, [348 0, v, vec![];349 ], {350 Ok(v)351 })?,352 (ns, name) => throw!(IntrinsicNotFound(ns.into(), name.into())),353 })354}1use crate::{2 equals,3 error::{Error::*, Result},4 evaluate, parse_args, primitive_equals, push, throw, with_state, Context, FuncVal, Val,5 ValType,6};7use format::{format_arr, format_obj};8use jrsonnet_parser::{ArgsDesc, ExprLocation};9use manifest::{escape_string_json, manifest_json_ex, ManifestJsonOptions, ManifestType};10use std::{path::PathBuf, rc::Rc};1112pub mod stdlib;13pub use stdlib::*;1415pub mod format;16pub mod manifest;17pub mod sort;1819#[allow(clippy::cognitive_complexity)]20pub fn call_builtin(21 context: Context,22 loc: &Option<ExprLocation>,23 ns: &str,24 name: &str,25 args: &ArgsDesc,26) -> Result<Val> {27 Ok(match (ns, name as &str) {28 // arr/string/function29 ("std", "length") => parse_args!(context, "std.length", args, 1, [30 0, x: [Val::Str|Val::Arr|Val::Obj], vec![ValType::Str, ValType::Arr, ValType::Obj];31 ], {32 Ok(match x {33 Val::Str(n) => Val::Num(n.chars().count() as f64),34 Val::Arr(i) => Val::Num(i.len() as f64),35 Val::Obj(o) => Val::Num(36 o.fields_visibility()37 .into_iter()38 .filter(|(_k, v)| *v)39 .count() as f64,40 ),41 _ => unreachable!(),42 })43 })?,44 // any45 ("std", "type") => parse_args!(context, "std.type", args, 1, [46 0, x, vec![];47 ], {48 Ok(Val::Str(x.value_type()?.name().into()))49 })?,50 // length, idx=>any51 ("std", "makeArray") => parse_args!(context, "std.makeArray", args, 2, [52 0, sz: [Val::Num]!!Val::Num, vec![ValType::Num];53 1, func: [Val::Func]!!Val::Func, vec![ValType::Func];54 ], {55 if sz < 0.0 {56 throw!(RuntimeError(format!("makeArray requires size >= 0, got {}", sz).into()));57 }58 let mut out = Vec::with_capacity(sz as usize);59 for i in 0..sz as usize {60 out.push(func.evaluate_values(61 Context::new(),62 &[Val::Num(i as f64)]63 )?)64 }65 Ok(Val::Arr(Rc::new(out)))66 })?,67 // string68 ("std", "codepoint") => parse_args!(context, "std.codepoint", args, 1, [69 0, str: [Val::Str]!!Val::Str, vec![ValType::Str];70 ], {71 assert!(72 str.chars().count() == 1,73 "std.codepoint should receive single char string"74 );75 Ok(Val::Num(str.chars().take(1).next().unwrap() as u32 as f64))76 })?,77 // object, includeHidden78 ("std", "objectFieldsEx") => parse_args!(context, "std.objectFieldsEx",args, 2, [79 0, obj: [Val::Obj]!!Val::Obj, vec![ValType::Obj];80 1, inc_hidden: [Val::Bool]!!Val::Bool, vec![ValType::Bool];81 ], {82 let mut out = obj.fields_visibility()83 .into_iter()84 .filter(|(_k, v)| *v || inc_hidden)85 .map(|(k, _v)|k)86 .collect::<Vec<_>>();87 out.sort();88 Ok(Val::Arr(Rc::new(out.into_iter().map(Val::Str).collect())))89 })?,90 // object, field, includeHidden91 ("std", "objectHasEx") => parse_args!(context, "std.objectHasEx", args, 3, [92 0, obj: [Val::Obj]!!Val::Obj, vec![ValType::Obj];93 1, f: [Val::Str]!!Val::Str, vec![ValType::Str];94 2, inc_hidden: [Val::Bool]!!Val::Bool, vec![ValType::Bool];95 ], {96 Ok(Val::Bool(97 obj.fields_visibility()98 .into_iter()99 .filter(|(_k, v)| *v || inc_hidden)100 .any(|(k, _v)| *k == *f),101 ))102 })?,103 ("std", "primitiveEquals") => parse_args!(context, "std.primitiveEquals", args, 2, [104 0, a, vec![];105 1, b, vec![];106 ], {107 Ok(Val::Bool(primitive_equals(&a, &b)?))108 })?,109 // faster110 ("std", "equals") => parse_args!(context, "std.equals", args, 2, [111 0, a, vec![];112 1, b, vec![];113 ], {114 Ok(Val::Bool(equals(&a, &b)?))115 })?,116 ("std", "modulo") => parse_args!(context, "std.modulo", args, 2, [117 0, a: [Val::Num]!!Val::Num, vec![ValType::Num];118 1, b: [Val::Num]!!Val::Num, vec![ValType::Num];119 ], {120 Ok(Val::Num(a % b))121 })?,122 ("std", "floor") => parse_args!(context, "std.floor", args, 1, [123 0, x: [Val::Num]!!Val::Num, vec![ValType::Num];124 ], {125 Ok(Val::Num(x.floor()))126 })?,127 ("std", "log") => parse_args!(context, "std.log", args, 2, [128 0, n: [Val::Num]!!Val::Num, vec![ValType::Num];129 ], {130 Ok(Val::Num(n.ln()))131 })?,132 ("std", "trace") => parse_args!(context, "std.trace", args, 2, [133 0, str: [Val::Str]!!Val::Str, vec![ValType::Str];134 1, rest, vec![];135 ], {136 eprint!("TRACE:");137 if let Some(loc) = loc {138 with_state(|s|{139 let locs = s.map_source_locations(&loc.0, &[loc.1]);140 eprint!(" {}:{}", loc.0.file_name().unwrap().to_str().unwrap(), locs[0].line);141 });142 }143 eprintln!(" {}", str);144 Ok(rest)145 })?,146 ("std", "pow") => parse_args!(context, "std.modulo", args, 2, [147 0, x: [Val::Num]!!Val::Num, vec![ValType::Num];148 1, n: [Val::Num]!!Val::Num, vec![ValType::Num];149 ], {150 Ok(Val::Num(x.powf(n)))151 })?,152 ("std", "extVar") => parse_args!(context, "std.extVar", args, 1, [153 0, x: [Val::Str]!!Val::Str, vec![ValType::Str];154 ], {155 Ok(with_state(|s| s.settings().ext_vars.get(&x).cloned()).ok_or_else(156 || UndefinedExternalVariable(x),157 )?)158 })?,159 ("std", "native") => parse_args!(context, "std.native", args, 1, [160 0, x: [Val::Str]!!Val::Str, vec![ValType::Str];161 ], {162 Ok(with_state(|s| s.settings().ext_natives.get(&x).cloned()).map(|v| Val::Func(Rc::new(FuncVal::NativeExt(x.clone(), v)))).ok_or_else(163 || UndefinedExternalFunction(x),164 )?)165 })?,166 ("std", "filter") => parse_args!(context, "std.filter", args, 2, [167 0, func: [Val::Func]!!Val::Func, vec![ValType::Func];168 1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];169 ], {170 Ok(Val::Arr(Rc::new(171 arr.iter()172 .cloned()173 .filter(|e| {174 func175 .evaluate_values(context.clone(), &[e.clone()])176 .unwrap()177 .try_cast_bool("filter predicate")178 .unwrap()179 })180 .collect(),181 )))182 })?,183 // faster184 ("std", "foldl") => parse_args!(context, "std.foldl", args, 3, [185 0, func: [Val::Func]!!Val::Func, vec![ValType::Func];186 1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];187 2, init, vec![];188 ], {189 let mut acc = init;190 for i in arr.iter().cloned() {191 acc = func.evaluate_values(context.clone(), &[acc, i])?;192 }193 Ok(acc)194 })?,195 // faster196 ("std", "foldr") => parse_args!(context, "std.foldr", args, 3, [197 0, func: [Val::Func]!!Val::Func, vec![ValType::Func];198 1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];199 2, init, vec![];200 ], {201 let mut acc = init;202 for i in arr.iter().rev().cloned() {203 acc = func.evaluate_values(context.clone(), &[acc, i])?;204 }205 Ok(acc)206 })?,207 // faster208 #[allow(non_snake_case)]209 ("std", "sortImpl") => parse_args!(context, "std.sort", args, 2, [210 0, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];211 1, keyF: [Val::Func]!!Val::Func, vec![ValType::Func];212 ], {213 if arr.len() <= 1 {214 return Ok(Val::Arr(arr))215 }216 Ok(Val::Arr(sort::sort(context, arr, &keyF)?))217 })?,218 // faster219 ("std", "format") => parse_args!(context, "std.format", args, 2, [220 0, str: [Val::Str]!!Val::Str, vec![ValType::Str];221 1, vals, vec![]222 ], {223 push(&Some(ExprLocation(Rc::from(PathBuf::from("std.jsonnet")), 0, 0)), ||format!("std.format of {}", str), ||{224 Ok(match vals {225 Val::Arr(vals) => Val::Str(format_arr(&str, &vals)?.into()),226 Val::Obj(obj) => Val::Str(format_obj(&str, &obj)?.into()),227 o => Val::Str(format_arr(&str, &[o])?.into()),228 })229 })230 })?,231 // faster232 ("std", "range") => parse_args!(context, "std.range", args, 2, [233 0, from: [Val::Num]!!Val::Num, vec![ValType::Num];234 1, to: [Val::Num]!!Val::Num, vec![ValType::Num];235 ], {236 let mut out = Vec::with_capacity((1+to as usize-from as usize).max(0));237 for i in from as usize..=to as usize {238 out.push(Val::Num(i as f64));239 }240 Ok(Val::Arr(Rc::new(out)))241 })?,242 ("std", "char") => parse_args!(context, "std.char", args, 1, [243 0, n: [Val::Num]!!Val::Num, vec![ValType::Num];244 ], {245 let mut out = String::new();246 out.push(std::char::from_u32(n as u32).ok_or_else(||247 InvalidUnicodeCodepointGot(n as u32)248 )?);249 Ok(Val::Str(out.into()))250 })?,251 ("std", "encodeUTF8") => parse_args!(context, "std.encodeUtf8", args, 1, [252 0, str: [Val::Str]!!Val::Str, vec![ValType::Str];253 ], {254 Ok(Val::Arr(Rc::new(str.bytes().map(|b| Val::Num(b as f64)).collect())))255 })?,256 ("std", "md5") => parse_args!(context, "std.md5", args, 1, [257 0, str: [Val::Str]!!Val::Str, vec![ValType::Str];258 ], {259 Ok(Val::Str(format!("{:x}", md5::compute(&str.as_bytes())).into()))260 })?,261 // faster262 ("std", "base64") => parse_args!(context, "std.base64", args, 1, [263 0, input: [Val::Str | Val::Arr], vec![ValType::Arr, ValType::Str];264 ], {265 Ok(Val::Str(match input {266 Val::Str(s) => {267 base64::encode(s.bytes().collect::<Vec<_>>()).into()268 },269 Val::Arr(a) => {270 base64::encode(a.iter().map(|v| {271 Ok(v.clone().try_cast_num("base64 array")? as u8)272 }).collect::<Result<Vec<_>>>()?).into()273 },274 _ => unreachable!()275 }))276 })?,277 // faster278 ("std", "join") => parse_args!(context, "std.join", args, 2, [279 0, sep: [Val::Str|Val::Arr], vec![ValType::Str, ValType::Arr];280 1, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];281 ], {282 Ok(match sep {283 Val::Arr(joiner_items) => {284 let mut out = Vec::new();285286 let mut first = true;287 for item in arr.iter().cloned() {288 if let Val::Arr(items) = item.unwrap_if_lazy()? {289 if !first {290 out.reserve(joiner_items.len());291 out.extend(joiner_items.iter().cloned());292 }293 first = false;294 out.reserve(items.len());295 out.extend(items.iter().cloned());296 } else {297 throw!(RuntimeError("in std.join all items should be arrays".into()));298 }299 }300301 Val::Arr(Rc::new(out))302 },303 Val::Str(sep) => {304 let mut out = String::new();305306 let mut first = true;307 for item in arr.iter().cloned() {308 if let Val::Str(item) = item.unwrap_if_lazy()? {309 if !first {310 out += &sep;311 }312 first = false;313 out += &item;314 } else {315 throw!(RuntimeError("in std.join all items should be strings".into()));316 }317 }318319 Val::Str(out.into())320 },321 _ => unreachable!()322 })323 })?,324 // Faster325 ("std", "escapeStringJson") => parse_args!(context, "std.escapeStringJson", args, 1, [326 0, str_: [Val::Str]!!Val::Str, vec![ValType::Str];327 ], {328 Ok(Val::Str(escape_string_json(&str_).into()))329 })?,330 // Faster331 ("std", "manifestJsonEx") => parse_args!(context, "std.manifestJsonEx", args, 2, [332 0, value, vec![];333 1, indent: [Val::Str]!!Val::Str, vec![ValType::Str];334 ], {335 Ok(Val::Str(manifest_json_ex(&value, &ManifestJsonOptions {336 padding: &indent,337 mtype: ManifestType::Std,338 })?.into()))339 })?,340 // Faster341 ("std", "reverse") => parse_args!(context, "std.reverse", args, 1, [342 0, arr: [Val::Arr]!!Val::Arr, vec![ValType::Arr];343 ], {344 let mut marr = arr;345 Rc::make_mut(&mut marr).reverse();346 Ok(Val::Arr(marr))347 })?,348 ("std", "id") => parse_args!(context, "std.id", args, 1, [349 0, v, vec![];350 ], {351 Ok(v)352 })?,353 (ns, name) => throw!(IntrinsicNotFound(ns.into(), name.into())),354 })355}crates/jrsonnet-evaluator/src/builtin/stdlib.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/builtin/stdlib.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/stdlib.rs
@@ -22,7 +22,7 @@
}
jrsonnet_parser::parse(
- &jrsonnet_stdlib::STDLIB_STR,
+ jrsonnet_stdlib::STDLIB_STR,
&ParserSettings {
loc_data: true,
file_name: Rc::new(PathBuf::from("std.jsonnet")),
crates/jrsonnet-evaluator/src/ctx.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/ctx.rs
+++ b/crates/jrsonnet-evaluator/src/ctx.rs
@@ -48,8 +48,8 @@
&self.0.super_obj
}
- pub fn new() -> Context {
- Context(Rc::new(ContextInternals {
+ pub fn new() -> Self {
+ Self(Rc::new(ContextInternals {
dollar: None,
this: None,
super_obj: None,
@@ -65,14 +65,14 @@
.cloned()
.ok_or_else(|| UnknownVariable(name))?)
}
- pub fn into_future(self, ctx: FutureContext) -> Context {
+ pub fn into_future(self, ctx: FutureContext) -> Self {
{
ctx.0.borrow_mut().replace(self);
}
ctx.unwrap()
}
- pub fn with_var(self, name: Rc<str>, value: Val) -> Context {
+ pub fn with_var(self, name: Rc<str>, value: Val) -> Self {
let mut new_bindings =
FxHashMap::with_capacity_and_hasher(1, BuildHasherDefault::default());
new_bindings.insert(name, resolved_lazy_val!(value));
@@ -85,7 +85,7 @@
new_dollar: Option<ObjValue>,
new_this: Option<ObjValue>,
new_super_obj: Option<ObjValue>,
- ) -> Context {
+ ) -> Self {
match Rc::try_unwrap(self.0) {
Ok(mut ctx) => {
// Extended context aren't used by anything else, we can freely mutate it without cloning
@@ -101,7 +101,7 @@
if !new_bindings.is_empty() {
ctx.bindings = ctx.bindings.extend(new_bindings);
}
- Context(Rc::new(ctx))
+ Self(Rc::new(ctx))
}
Err(ctx) => {
let dollar = new_dollar.or_else(|| ctx.dollar.clone());
@@ -112,7 +112,7 @@
} else {
ctx.bindings.clone().extend(new_bindings)
};
- Context(Rc::new(ContextInternals {
+ Self(Rc::new(ContextInternals {
dollar,
this,
super_obj,
@@ -127,7 +127,7 @@
new_dollar: Option<ObjValue>,
new_this: Option<ObjValue>,
new_super_obj: Option<ObjValue>,
- ) -> Result<Context> {
+ ) -> Result<Self> {
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 =
crates/jrsonnet-evaluator/src/error.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/error.rs
+++ b/crates/jrsonnet-evaluator/src/error.rs
@@ -95,10 +95,10 @@
Self(Box::new((e, StackTrace(vec![]))))
}
- pub fn error(&self) -> &Error {
+ pub const fn error(&self) -> &Error {
&(self.0).0
}
- pub fn trace(&self) -> &StackTrace {
+ pub const fn trace(&self) -> &StackTrace {
&(self.0).1
}
pub fn trace_mut(&mut self) -> &mut StackTrace {
crates/jrsonnet-evaluator/src/evaluate.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/evaluate.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate.rs
@@ -82,9 +82,9 @@
})
}
-pub(crate) fn evaluate_add_op(a: &Val, b: &Val) -> Result<Val> {
+pub fn evaluate_add_op(a: &Val, b: &Val) -> Result<Val> {
Ok(match (a, b) {
- (Val::Str(v1), Val::Str(v2)) => Val::Str(((**v1).to_owned() + &v2).into()),
+ (Val::Str(v1), Val::Str(v2)) => Val::Str(((**v1).to_owned() + v2).into()),
// Can't use generic json serialization way, because it depends on number to string concatenation (std.jsonnet:890)
(Val::Num(n), Val::Str(o)) => Val::Str(format!("{}{}", n, o).into()),
@@ -111,7 +111,7 @@
b: &LocExpr,
) -> Result<Val> {
Ok(
- match (evaluate(context.clone(), &a)?.unwrap_if_lazy()?, op, b) {
+ match (evaluate(context.clone(), a)?.unwrap_if_lazy()?, op, b) {
(Val::Bool(true), BinaryOpType::Or, _o) => Val::Bool(true),
(Val::Bool(false), BinaryOpType::And, _o) => Val::Bool(false),
(a, op, eb) => {
@@ -194,14 +194,14 @@
Ok(match specs.get(0) {
None => Some(vec![value(context)?]),
Some(CompSpec::IfSpec(IfSpecData(cond))) => {
- if evaluate(context.clone(), &cond)?.try_cast_bool("if spec")? {
+ if evaluate(context.clone(), cond)?.try_cast_bool("if spec")? {
evaluate_comp(context, value, &specs[1..])?
} else {
None
}
}
Some(CompSpec::ForSpec(ForSpecData(var, expr))) => {
- match evaluate(context.clone(), &expr)?.unwrap_if_lazy()? {
+ match evaluate(context.clone(), expr)?.unwrap_if_lazy()? {
Val::Arr(list) => {
let mut out = Vec::new();
for item in list.iter() {
@@ -258,7 +258,7 @@
visibility,
value,
}) => {
- let name = evaluate_field_name(context.clone(), &name)?;
+ let name = evaluate_field_name(context.clone(), name)?;
if name.is_none() {
continue;
}
@@ -286,7 +286,7 @@
value,
..
}) => {
- let name = evaluate_field_name(context.clone(), &name)?;
+ let name = evaluate_field_name(context.clone(), name)?;
if name.is_none() {
continue;
}
@@ -320,7 +320,7 @@
pub fn evaluate_object(context: Context, object: &ObjBody) -> Result<ObjValue> {
Ok(match object {
- ObjBody::MemberList(members) => evaluate_member_list_object(context, &members)?,
+ ObjBody::MemberList(members) => evaluate_member_list_object(context, members)?,
ObjBody::ObjComp(obj) => {
let future_this = FutureObjValue::new();
let mut new_members = HashMap::new();
@@ -437,7 +437,7 @@
Parened(e) => evaluate(context, e)?,
Str(v) => Val::Str(v.clone()),
Num(v) => Val::new_checked_num(*v)?,
- BinaryOp(v1, o, v2) => evaluate_binary_op_special(context, &v1, *o, &v2)?,
+ BinaryOp(v1, o, v2) => evaluate_binary_op_special(context, v1, *o, v2)?,
UnaryOp(o, v) => evaluate_unary_op(*o, &evaluate(context, v)?)?,
Var(name) => push(
loc,
@@ -461,7 +461,7 @@
(Val::Obj(v), Val::Str(s)) => {
let sn = s.clone();
push(
- &loc,
+ loc,
|| format!("field <{}> access", sn),
|| {
if let Some(v) = v.get(s.clone())? {
@@ -563,7 +563,7 @@
&value.1,
|| "assertion condition".to_owned(),
|| {
- evaluate(context.clone(), &value)?
+ evaluate(context.clone(), value)?
.try_cast_bool("assertion condition should be of type `boolean`")
},
)?;
@@ -576,7 +576,7 @@
}
}
ErrorStmt(e) => push(
- &loc,
+ loc,
|| "error statement".to_owned(),
|| {
throw!(RuntimeError(
@@ -610,7 +610,7 @@
push(
loc,
|| format!("import {:?}", path),
- || with_state(|s| s.import_file(&import_location, path)),
+ || with_state(|s| s.import_file(import_location, path)),
)?
}
ImportStr(path) => {
@@ -620,7 +620,7 @@
.0;
let import_location = Rc::make_mut(&mut tmp);
import_location.pop();
- Val::Str(with_state(|s| s.import_file_str(&import_location, path))?)
+ Val::Str(with_state(|s| s.import_file_str(import_location, path))?)
}
Literal(LiteralType::Super) => throw!(StandaloneSuper),
})
crates/jrsonnet-evaluator/src/function.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/function.rs
+++ b/crates/jrsonnet-evaluator/src/function.rs
@@ -75,7 +75,7 @@
let idx = params
.iter()
.position(|p| *p.0 == **name)
- .ok_or_else(|| UnknownFunctionParameter((&name as &str).to_owned()))?;
+ .ok_or_else(|| UnknownFunctionParameter((name as &str).to_owned()))?;
if idx >= params.len() {
throw!(TooManyArgsFunctionHas(params.len()));
@@ -111,7 +111,7 @@
Ok(body_ctx.unwrap_or(ctx).extend(out, None, None, None))
}
-pub(crate) fn place_args(
+pub fn place_args(
ctx: Context,
body_ctx: Option<Context>,
params: &ParamsDesc,
crates/jrsonnet-evaluator/src/import.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/import.rs
+++ b/crates/jrsonnet-evaluator/src/import.rs
@@ -41,6 +41,7 @@
panic!("`as_any($self)` is not supported by dummy resolver")
}
}
+#[allow(clippy::use_self)]
impl Default for Box<dyn ImportResolver> {
fn default() -> Self {
Box::new(DummyImportResolver)
crates/jrsonnet-evaluator/src/integrations/serde.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/integrations/serde.rs
+++ b/crates/jrsonnet-evaluator/src/integrations/serde.rs
@@ -14,10 +14,10 @@
type Error = LocError;
fn try_from(v: &Val) -> Result<Self> {
Ok(match v {
- Val::Bool(b) => Value::Bool(*b),
- Val::Null => Value::Null,
- Val::Str(s) => Value::String((&s as &str).into()),
- Val::Num(n) => Value::Number(if n.fract() <= f64::EPSILON {
+ Val::Bool(b) => Self::Bool(*b),
+ Val::Null => Self::Null,
+ Val::Str(s) => Self::String((s as &str).into()),
+ Val::Num(n) => Self::Number(if n.fract() <= f64::EPSILON {
(*n as i64).into()
} else {
Number::from_f64(*n).expect("to json number")
@@ -28,7 +28,7 @@
for item in a.iter() {
out.push(item.try_into()?);
}
- Value::Array(out)
+ Self::Array(out)
}
Val::Obj(o) => {
let mut out = Map::new();
@@ -38,7 +38,7 @@
(&o.get(key)?.expect("field exists")).try_into()?,
);
}
- Value::Object(out)
+ Self::Object(out)
}
Val::Func(_) => throw!(RuntimeError("tried to manifest function".into())),
})
@@ -48,16 +48,16 @@
impl From<&Value> for Val {
fn from(v: &Value) -> Self {
match v {
- Value::Null => Val::Null,
- Value::Bool(v) => Val::Bool(*v),
- Value::Number(n) => Val::Num(n.as_f64().expect("as f64")),
- Value::String(s) => Val::Str((s as &str).into()),
+ Value::Null => Self::Null,
+ Value::Bool(v) => Self::Bool(*v),
+ Value::Number(n) => Self::Num(n.as_f64().expect("as f64")),
+ Value::String(s) => Self::Str((s as &str).into()),
Value::Array(a) => {
let mut out = Vec::with_capacity(a.len());
for v in a {
out.push(v.into());
}
- Val::Arr(Rc::new(out))
+ Self::Arr(Rc::new(out))
}
Value::Object(o) => {
let mut entries = HashMap::with_capacity(o.len());
@@ -72,7 +72,7 @@
},
);
}
- Val::Obj(ObjValue::new(None, Rc::new(entries)))
+ Self::Obj(ObjValue::new(None, Rc::new(entries)))
}
}
}
crates/jrsonnet-evaluator/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/lib.rs
+++ b/crates/jrsonnet-evaluator/src/lib.rs
@@ -1,5 +1,6 @@
#![cfg_attr(feature = "unstable", feature(stmt_expr_attributes))]
#![allow(macro_expanded_macro_exports_accessed_by_absolute_paths)]
+#![warn(clippy::all, clippy::nursery)]
mod builtin;
mod ctx;
@@ -49,8 +50,8 @@
impl LazyBinding {
pub fn evaluate(&self, this: Option<ObjValue>, super_obj: Option<ObjValue>) -> Result<LazyVal> {
match self {
- LazyBinding::Bindable(v) => v(this, super_obj),
- LazyBinding::Bound(v) => Ok(v.clone()),
+ Self::Bindable(v) => v(this, super_obj),
+ Self::Bound(v) => Ok(v.clone()),
}
}
}
@@ -77,7 +78,7 @@
}
impl Default for EvaluationSettings {
fn default() -> Self {
- EvaluationSettings {
+ Self {
max_stack: 200,
max_trace: 20,
globals: Default::default(),
@@ -130,7 +131,7 @@
f: impl FnOnce() -> Result<T>,
) -> Result<T> {
if let Some(v) = e {
- with_state(|s| s.push(&v, frame_desc, f))
+ with_state(|s| s.push(v, frame_desc, f))
} else {
f()
}
@@ -359,10 +360,10 @@
/// Raw methods evaluate passed values but don't perform TLA execution
impl EvaluationState {
pub fn evaluate_file_raw(&self, name: &PathBuf) -> Result<Val> {
- self.run_in_state(|| self.import_file(&std::env::current_dir().expect("cwd"), &name))
+ self.run_in_state(|| self.import_file(&std::env::current_dir().expect("cwd"), name))
}
pub fn evaluate_file_raw_nocwd(&self, name: &PathBuf) -> Result<Val> {
- self.run_in_state(|| self.import_file(&PathBuf::from("."), &name))
+ self.run_in_state(|| self.import_file(&PathBuf::from("."), name))
}
/// Parses and evaluates the given snippet
pub fn evaluate_snippet_raw(&self, source: Rc<PathBuf>, code: Rc<str>) -> Result<Val> {
crates/jrsonnet-evaluator/src/map.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/map.rs
+++ b/crates/jrsonnet-evaluator/src/map.rs
@@ -15,10 +15,10 @@
match Rc::try_unwrap(self.0) {
Ok(mut map) => {
map.current.extend(new_layer);
- LayeredHashMap(Rc::new(map))
+ Self(Rc::new(map))
}
- Err(this) => LayeredHashMap(Rc::new(LayeredHashMapInternals {
- parent: Some(LayeredHashMap(this)),
+ Err(this) => Self(Rc::new(LayeredHashMapInternals {
+ parent: Some(Self(this)),
current: new_layer,
})),
}
@@ -31,20 +31,20 @@
{
(self.0)
.current
- .get(&key)
+ .get(key)
.or_else(|| self.0.parent.as_ref().and_then(|p| p.get(key)))
}
}
impl<K: Hash, V> Clone for LayeredHashMap<K, V> {
fn clone(&self) -> Self {
- LayeredHashMap(self.0.clone())
+ Self(self.0.clone())
}
}
impl<K: Hash + Eq, V> Default for LayeredHashMap<K, V> {
fn default() -> Self {
- LayeredHashMap(Rc::new(LayeredHashMapInternals {
+ Self(Rc::new(LayeredHashMapInternals {
parent: None,
current: FxHashMap::default(),
}))
crates/jrsonnet-evaluator/src/obj.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/obj.rs
+++ b/crates/jrsonnet-evaluator/src/obj.rs
@@ -47,23 +47,20 @@
}
impl ObjValue {
- pub fn new(
- super_obj: Option<ObjValue>,
- this_entries: Rc<HashMap<Rc<str>, ObjMember>>,
- ) -> ObjValue {
- ObjValue(Rc::new(ObjValueInternals {
+ pub fn new(super_obj: Option<Self>, this_entries: Rc<HashMap<Rc<str>, ObjMember>>) -> Self {
+ Self(Rc::new(ObjValueInternals {
super_obj,
this_entries,
value_cache: RefCell::new(HashMap::new()),
}))
}
- pub fn new_empty() -> ObjValue {
+ pub fn new_empty() -> Self {
Self::new(None, Rc::new(HashMap::new()))
}
- pub fn with_super(&self, super_obj: ObjValue) -> ObjValue {
+ pub fn with_super(&self, super_obj: Self) -> Self {
match &self.0.super_obj {
- None => ObjValue::new(Some(super_obj), self.0.this_entries.clone()),
- Some(v) => ObjValue::new(Some(v.with_super(super_obj)), self.0.this_entries.clone()),
+ None => Self::new(Some(super_obj), self.0.this_entries.clone()),
+ Some(v) => Self::new(Some(v.with_super(super_obj)), self.0.this_entries.clone()),
}
}
pub fn enum_fields(&self, handler: &impl Fn(&Rc<str>, &Visibility)) {
@@ -71,7 +68,7 @@
s.enum_fields(handler);
}
for (name, member) in self.0.this_entries.iter() {
- handler(&name, &member.visibility);
+ handler(name, &member.visibility);
}
}
pub fn fields_visibility(&self) -> IndexMap<Rc<str>, bool> {
@@ -107,7 +104,7 @@
pub fn get(&self, key: Rc<str>) -> Result<Option<Val>> {
Ok(self.get_raw(key, self)?)
}
- pub(crate) fn get_raw(&self, key: Rc<str>, real_this: &ObjValue) -> Result<Option<Val>> {
+ pub(crate) fn get_raw(&self, key: Rc<str>, real_this: &Self) -> Result<Option<Val>> {
let cache_key = (key.clone(), Rc::as_ptr(&real_this.0) as usize);
if let Some(v) = self.0.value_cache.borrow().get(&cache_key) {
@@ -135,7 +132,7 @@
.insert(cache_key, value.clone());
Ok(value)
}
- fn evaluate_this(&self, v: &ObjMember, real_this: &ObjValue) -> Result<Val> {
+ fn evaluate_this(&self, v: &ObjMember, real_this: &Self) -> Result<Val> {
Ok(v.invoke
.evaluate(Some(real_this.clone()), self.0.super_obj.clone())?
.evaluate()?)
crates/jrsonnet-evaluator/src/trace/mod.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/trace/mod.rs
+++ b/crates/jrsonnet-evaluator/src/trace/mod.rs
@@ -17,9 +17,9 @@
impl PathResolver {
pub fn resolve(&self, from: &PathBuf) -> String {
match self {
- PathResolver::FileName => from.file_name().unwrap().to_string_lossy().into_owned(),
- PathResolver::Absolute => from.to_string_lossy().into_owned(),
- PathResolver::Relative(base) => {
+ Self::FileName => from.file_name().unwrap().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();
}
crates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -25,10 +25,10 @@
pub struct LazyVal(Rc<RefCell<LazyValInternals>>);
impl LazyVal {
pub fn new(f: Box<dyn Fn() -> Result<Val>>) -> Self {
- LazyVal(Rc::new(RefCell::new(LazyValInternals::Waiting(f))))
+ Self(Rc::new(RefCell::new(LazyValInternals::Waiting(f))))
}
pub fn new_resolved(val: Val) -> Self {
- LazyVal(Rc::new(RefCell::new(LazyValInternals::Computed(val))))
+ Self(Rc::new(RefCell::new(LazyValInternals::Computed(val))))
}
pub fn evaluate(&self) -> Result<Val> {
let new_value = match &*self.0.borrow() {
@@ -84,22 +84,22 @@
impl PartialEq for FuncVal {
fn eq(&self, other: &Self) -> bool {
match (self, other) {
- (FuncVal::Normal(a), FuncVal::Normal(b)) => a == b,
- (FuncVal::Intrinsic(ans, an), FuncVal::Intrinsic(bns, bn)) => ans == bns && an == bn,
- (FuncVal::NativeExt(an, _), FuncVal::NativeExt(bn, _)) => an == bn,
+ (Self::Normal(a), Self::Normal(b)) => a == b,
+ (Self::Intrinsic(ans, an), Self::Intrinsic(bns, bn)) => ans == bns && an == bn,
+ (Self::NativeExt(an, _), Self::NativeExt(bn, _)) => an == bn,
(..) => false,
}
}
}
impl FuncVal {
pub fn is_ident(&self) -> bool {
- matches!(&self, FuncVal::Intrinsic(ns, n) if ns as &str == "std" && n as &str == "id")
+ matches!(&self, Self::Intrinsic(ns, n) if ns as &str == "std" && n as &str == "id")
}
pub fn name(&self) -> Rc<str> {
match self {
- FuncVal::Normal(normal) => normal.name.clone(),
- FuncVal::Intrinsic(ns, name) => format!("intrinsic.{}.{}", ns, name).into(),
- FuncVal::NativeExt(n, _) => format!("native.{}", n).into(),
+ Self::Normal(normal) => normal.name.clone(),
+ Self::Intrinsic(ns, name) => format!("intrinsic.{}.{}", ns, name).into(),
+ Self::NativeExt(n, _) => format!("native.{}", n).into(),
}
}
pub fn evaluate(
@@ -110,7 +110,7 @@
tailstrict: bool,
) -> Result<Val> {
match self {
- FuncVal::Normal(func) => {
+ Self::Normal(func) => {
let ctx = parse_function_call(
call_ctx,
Some(func.ctx.clone()),
@@ -120,8 +120,8 @@
)?;
evaluate(ctx, &func.body)
}
- FuncVal::Intrinsic(ns, name) => call_builtin(call_ctx, loc, &ns, &name, args),
- FuncVal::NativeExt(_name, handler) => {
+ Self::Intrinsic(ns, name) => call_builtin(call_ctx, loc, ns, name, args),
+ Self::NativeExt(_name, handler) => {
let args = parse_function_call(call_ctx, None, &handler.params, args, true)?;
let mut out_args = Vec::with_capacity(handler.params.len());
for p in handler.params.0.iter() {
@@ -139,7 +139,7 @@
tailstrict: bool,
) -> Result<Val> {
match self {
- FuncVal::Normal(func) => {
+ Self::Normal(func) => {
let ctx = parse_function_call_map(
call_ctx,
Some(func.ctx.clone()),
@@ -149,19 +149,19 @@
)?;
evaluate(ctx, &func.body)
}
- FuncVal::Intrinsic(_, _) => todo!(),
- FuncVal::NativeExt(_, _) => todo!(),
+ Self::Intrinsic(_, _) => todo!(),
+ Self::NativeExt(_, _) => todo!(),
}
}
pub fn evaluate_values(&self, call_ctx: Context, args: &[Val]) -> Result<Val> {
match self {
- FuncVal::Normal(func) => {
+ Self::Normal(func) => {
let ctx = place_args(call_ctx, Some(func.ctx.clone()), &func.params, args)?;
evaluate(ctx, &func.body)
}
- FuncVal::Intrinsic(_, _) => todo!(),
- FuncVal::NativeExt(_, _) => todo!(),
+ Self::Intrinsic(_, _) => todo!(),
+ Self::NativeExt(_, _) => todo!(),
}
}
}
@@ -177,7 +177,7 @@
Func,
}
impl ValType {
- pub fn name(&self) -> &'static str {
+ pub const fn name(&self) -> &'static str {
use ValType::*;
match self {
Bool => "boolean",
@@ -227,9 +227,9 @@
impl Val {
/// Creates `Val::Num` after checking for numeric overflow.
/// As numbers are `f64`, we can just check for their finity.
- pub fn new_checked_num(num: f64) -> Result<Val> {
+ pub fn new_checked_num(num: f64) -> Result<Self> {
if num.is_finite() {
- Ok(Val::Num(num))
+ Ok(Self::Num(num))
} else {
throw!(RuntimeError("overflow".into()))
}
@@ -245,24 +245,24 @@
}
pub fn try_cast_bool(self, context: &'static str) -> Result<bool> {
self.assert_type(context, ValType::Bool)?;
- Ok(matches_unwrap!(self.unwrap_if_lazy()?, Val::Bool(v), v))
+ Ok(matches_unwrap!(self.unwrap_if_lazy()?, Self::Bool(v), v))
}
pub fn try_cast_str(self, context: &'static str) -> Result<Rc<str>> {
self.assert_type(context, ValType::Str)?;
- Ok(matches_unwrap!(self.unwrap_if_lazy()?, Val::Str(v), v))
+ Ok(matches_unwrap!(self.unwrap_if_lazy()?, Self::Str(v), v))
}
pub fn try_cast_num(self, context: &'static str) -> Result<f64> {
self.assert_type(context, ValType::Num)?;
- Ok(matches_unwrap!(self.unwrap_if_lazy()?, Val::Num(v), v))
+ Ok(matches_unwrap!(self.unwrap_if_lazy()?, Self::Num(v), v))
}
pub fn inplace_unwrap(&mut self) -> Result<()> {
- while let Val::Lazy(lazy) = self {
+ while let Self::Lazy(lazy) = self {
*self = lazy.evaluate()?;
}
Ok(())
}
pub fn unwrap_if_lazy(&self) -> Result<Self> {
- Ok(if let Val::Lazy(v) = self {
+ Ok(if let Self::Lazy(v) = self {
v.evaluate()?.unwrap_if_lazy()?
} else {
self.clone()
@@ -270,27 +270,27 @@
}
pub fn value_type(&self) -> Result<ValType> {
Ok(match self {
- Val::Str(..) => ValType::Str,
- Val::Num(..) => ValType::Num,
- Val::Arr(..) => ValType::Arr,
- Val::Obj(..) => ValType::Obj,
- Val::Bool(_) => ValType::Bool,
- Val::Null => ValType::Null,
- Val::Func(..) => ValType::Func,
- Val::Lazy(_) => self.clone().unwrap_if_lazy()?.value_type()?,
+ Self::Str(..) => ValType::Str,
+ Self::Num(..) => ValType::Num,
+ Self::Arr(..) => ValType::Arr,
+ Self::Obj(..) => ValType::Obj,
+ Self::Bool(_) => ValType::Bool,
+ Self::Null => ValType::Null,
+ Self::Func(..) => ValType::Func,
+ Self::Lazy(_) => self.clone().unwrap_if_lazy()?.value_type()?,
})
}
pub fn to_string(&self) -> Result<Rc<str>> {
Ok(match self.unwrap_if_lazy()? {
- Val::Bool(true) => "true".into(),
- Val::Bool(false) => "false".into(),
- Val::Null => "null".into(),
- Val::Str(s) => s,
+ Self::Bool(true) => "true".into(),
+ Self::Bool(false) => "false".into(),
+ Self::Null => "null".into(),
+ Self::Str(s) => s,
v => manifest_json_ex(
&v,
&ManifestJsonOptions {
- padding: &"",
+ padding: "",
mtype: ManifestType::ToString,
},
)?
@@ -301,7 +301,7 @@
/// Expects value to be object, outputs (key, manifested value) pairs
pub fn manifest_multi(&self, ty: &ManifestFormat) -> Result<Vec<(Rc<str>, Rc<str>)>> {
let obj = match self {
- Val::Obj(obj) => obj,
+ Self::Obj(obj) => obj,
_ => throw!(MultiManifestOutputIsNotAObject),
};
let keys = obj.visible_fields();
@@ -319,7 +319,7 @@
/// Expects value to be array, outputs manifested values
pub fn manifest_stream(&self, ty: &ManifestFormat) -> Result<Vec<Rc<str>>> {
let arr = match self {
- Val::Arr(a) => a,
+ Self::Arr(a) => a,
_ => throw!(StreamManifestOutputIsNotAArray),
};
let mut out = Vec::with_capacity(arr.len());
@@ -333,7 +333,7 @@
Ok(match ty {
ManifestFormat::YamlStream(format) => {
let arr = match self {
- Val::Arr(a) => a,
+ Self::Arr(a) => a,
_ => throw!(StreamManifestOutputIsNotAArray),
};
let mut out = String::new();
@@ -358,7 +358,7 @@
ManifestFormat::Yaml(padding) => self.to_yaml(*padding)?,
ManifestFormat::Json(padding) => self.to_json(*padding)?,
ManifestFormat::String => match self {
- Val::Str(s) => s.clone(),
+ Self::Str(s) => s.clone(),
_ => throw!(StringManifestOutputIsNotAString),
},
})
@@ -384,7 +384,7 @@
#[cfg(feature = "faster")]
pub fn to_std_json(&self, padding: usize) -> Result<Rc<str>> {
manifest_json_ex(
- &self,
+ self,
&ManifestJsonOptions {
padding: &" ".repeat(padding),
mtype: ManifestType::Std,
@@ -441,7 +441,7 @@
}
}
-fn is_function_like(val: &Val) -> bool {
+const fn is_function_like(val: &Val) -> bool {
matches!(val, Val::Func(_))
}