difftreelog
style fix clippy warnings
in: master
20 files changed
bindings/jsonnet/src/lib.rsdiffbeforeafterboth--- a/bindings/jsonnet/src/lib.rs
+++ b/bindings/jsonnet/src/lib.rs
@@ -70,6 +70,7 @@
/// Creates a new Jsonnet virtual machine.
#[no_mangle]
+#[allow(clippy::box_default)]
pub extern "C" fn jsonnet_make() -> *mut State {
let state = State::default();
state.settings_mut().import_resolver = Box::new(FileImportResolver::default());
crates/jrsonnet-cli/src/stdlib.rsdiffbeforeafterboth--- a/crates/jrsonnet-cli/src/stdlib.rs
+++ b/crates/jrsonnet-cli/src/stdlib.rs
@@ -44,7 +44,7 @@
if out.len() != 2 {
return Err("bad ext-file syntax".to_owned());
}
- let file = read_to_string(&out[1]);
+ let file = read_to_string(out[1]);
match file {
Ok(content) => Ok(Self {
name: out[0].into(),
crates/jrsonnet-evaluator/src/error.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/error.rs
+++ b/crates/jrsonnet-evaluator/src/error.rs
@@ -100,7 +100,7 @@
#[error("duplicate local var: {0}")]
DuplicateLocalVar(IStr),
- #[error("type mismatch: expected {}, got {2} {0}", .1.iter().map(|e| format!("{}", e)).collect::<Vec<_>>().join(", "))]
+ #[error("type mismatch: expected {}, got {2} {0}", .1.iter().map(|e| format!("{e}")).collect::<Vec<_>>().join(", "))]
TypeMismatch(&'static str, Vec<ValType>, ValType),
#[error("no such field: {}{}", format_empty_str(.0), format_found(.1, "field"))]
NoSuchField(IStr, Vec<IStr>),
@@ -113,7 +113,7 @@
BindingParameterASecondTime(IStr),
#[error("too many args, function has {0}{}", format_signature(.1))]
TooManyArgsFunctionHas(usize, FunctionSignature),
- #[error("function argument is not passed: {}{}", .0.as_ref().map(|n| n.as_str()).unwrap_or("<unnamed>"), format_signature(.1))]
+ #[error("function argument is not passed: {}{}", .0.as_ref().map_or("<unnamed>", IStr::as_str), format_signature(.1))]
FunctionParameterNotBoundInCall(Option<IStr>, FunctionSignature),
#[error("external variable is not defined: {0}")]
@@ -249,7 +249,7 @@
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
writeln!(f, "{}", self.0 .0)?;
for el in &self.0 .1 .0 {
- writeln!(f, "\t{:?}", el)?;
+ 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
@@ -436,7 +436,7 @@
UnaryOp(o, v) => evaluate_unary_op(*o, &evaluate(s, ctx, v)?)?,
Var(name) => s.push(
CallLocation::new(loc),
- || format!("variable <{}> access", name),
+ || format!("variable <{name}> access"),
|| ctx.binding(name.clone())?.evaluate(s.clone()),
)?,
Index(value, index) => {
@@ -446,7 +446,7 @@
) {
(Val::Obj(v), Val::Str(key)) => s.push(
CallLocation::new(loc),
- || format!("field <{}> access", key),
+ || format!("field <{key}> access"),
|| match v.get(s.clone(), key.clone()) {
Ok(Some(v)) => Ok(v),
#[cfg(not(feature = "friendly-errors"))]
@@ -611,7 +611,7 @@
if let Some(value) = expr {
Ok(Some(s.push(
loc,
- || format!("slice {}", desc),
+ || format!("slice {desc}"),
|| T::from_untyped(evaluate(s.clone(), ctx.clone(), value)?, s.clone()),
)?))
} else {
crates/jrsonnet-evaluator/src/evaluate/operator.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/evaluate/operator.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/operator.rs
@@ -30,8 +30,8 @@
(Str(a), Num(b)) => Str(format!("{a}{b}").into()),
(Str(a), o) | (o, Str(a)) if a.is_empty() => Val::Str(o.clone().to_string(s)?),
- (Str(a), o) => Str(format!("{}{}", a, o.clone().to_string(s)?).into()),
- (o, Str(a)) => Str(format!("{}{}", o.clone().to_string(s)?, a).into()),
+ (Str(a), o) => Str(format!("{a}{}", o.clone().to_string(s)?).into()),
+ (o, Str(a)) => Str(format!("{}{a}", o.clone().to_string(s)?).into()),
(Obj(v1), Obj(v2)) => Obj(v2.extend_from(v1.clone())),
(Arr(a), Arr(b)) => {
crates/jrsonnet-evaluator/src/function/arglike.rsdiffbeforeafterboth1use std::collections::HashMap;23use jrsonnet_gcmodule::Trace;4use jrsonnet_interner::IStr;5use jrsonnet_parser::{ArgsDesc, LocExpr};67use crate::{8 error::Result, evaluate, tb, typed::Typed, val::ThunkValue, Context, State, Thunk, Val,9};1011#[derive(Trace)]12struct EvaluateThunk {13 ctx: Context,14 expr: LocExpr,15}16impl ThunkValue for EvaluateThunk {17 type Output = Val;18 fn get(self: Box<Self>, s: State) -> Result<Val> {19 evaluate(s, self.ctx, &self.expr)20 }21}2223pub trait ArgLike {24 fn evaluate_arg(&self, s: State, ctx: Context, tailstrict: bool) -> Result<Thunk<Val>>;25}2627impl ArgLike for &LocExpr {28 fn evaluate_arg(&self, s: State, ctx: Context, tailstrict: bool) -> Result<Thunk<Val>> {29 Ok(if tailstrict {30 Thunk::evaluated(evaluate(s, ctx, self)?)31 } else {32 Thunk::new(tb!(EvaluateThunk {33 ctx,34 expr: (*self).clone(),35 }))36 })37 }38}3940impl<T> ArgLike for T41where42 T: Typed + Clone,43{44 fn evaluate_arg(&self, s: State, _ctx: Context, _tailstrict: bool) -> Result<Thunk<Val>> {45 let val = T::into_untyped(self.clone(), s)?;46 Ok(Thunk::evaluated(val))47 }48}4950#[derive(Clone)]51pub enum TlaArg {52 String(IStr),53 Code(LocExpr),54 Val(Val),55}56impl ArgLike for TlaArg {57 fn evaluate_arg(&self, s: State, ctx: Context, tailstrict: bool) -> Result<Thunk<Val>> {58 match self {59 TlaArg::String(s) => Ok(Thunk::evaluated(Val::Str(s.clone()))),60 TlaArg::Code(code) => Ok(if tailstrict {61 Thunk::evaluated(evaluate(s, ctx, code)?)62 } else {63 Thunk::new(tb!(EvaluateThunk {64 ctx,65 expr: code.clone(),66 }))67 }),68 TlaArg::Val(val) => Ok(Thunk::evaluated(val.clone())),69 }70 }71}7273mod sealed {74 /// Implemented for `ArgsLike`, where only unnamed arguments present75 pub trait Unnamed {}76 /// Implemented for `ArgsLike`, where only named arguments present77 pub trait Named {}78}7980pub trait ArgsLike {81 fn unnamed_len(&self) -> usize;82 fn unnamed_iter(83 &self,84 s: State,85 ctx: Context,86 tailstrict: bool,87 handler: &mut dyn FnMut(usize, Thunk<Val>) -> Result<()>,88 ) -> Result<()>;89 fn named_iter(90 &self,91 s: State,92 ctx: Context,93 tailstrict: bool,94 handler: &mut dyn FnMut(&IStr, Thunk<Val>) -> Result<()>,95 ) -> Result<()>;96 fn named_names(&self, handler: &mut dyn FnMut(&IStr));97}9899impl ArgsLike for Vec<Val> {100 fn unnamed_len(&self) -> usize {101 self.len()102 }103 fn unnamed_iter(104 &self,105 _s: State,106 _ctx: Context,107 _tailstrict: bool,108 handler: &mut dyn FnMut(usize, Thunk<Val>) -> Result<()>,109 ) -> Result<()> {110 for (idx, el) in self.iter().enumerate() {111 handler(idx, Thunk::evaluated(el.clone()))?112 }113 Ok(())114 }115 fn named_iter(116 &self,117 _s: State,118 _ctx: Context,119 _tailstrict: bool,120 _handler: &mut dyn FnMut(&IStr, Thunk<Val>) -> Result<()>,121 ) -> Result<()> {122 Ok(())123 }124 fn named_names(&self, _handler: &mut dyn FnMut(&IStr)) {}125}126127impl ArgsLike for ArgsDesc {128 fn unnamed_len(&self) -> usize {129 self.unnamed.len()130 }131132 fn unnamed_iter(133 &self,134 s: State,135 ctx: Context,136 tailstrict: bool,137 handler: &mut dyn FnMut(usize, Thunk<Val>) -> Result<()>,138 ) -> Result<()> {139 for (id, arg) in self.unnamed.iter().enumerate() {140 handler(141 id,142 if tailstrict {143 Thunk::evaluated(evaluate(s.clone(), ctx.clone(), arg)?)144 } else {145 Thunk::new(tb!(EvaluateThunk {146 ctx: ctx.clone(),147 expr: arg.clone(),148 }))149 },150 )?;151 }152 Ok(())153 }154155 fn named_iter(156 &self,157 s: State,158 ctx: Context,159 tailstrict: bool,160 handler: &mut dyn FnMut(&IStr, Thunk<Val>) -> Result<()>,161 ) -> Result<()> {162 for (name, arg) in &self.named {163 handler(164 name,165 if tailstrict {166 Thunk::evaluated(evaluate(s.clone(), ctx.clone(), arg)?)167 } else {168 Thunk::new(tb!(EvaluateThunk {169 ctx: ctx.clone(),170 expr: arg.clone(),171 }))172 },173 )?;174 }175 Ok(())176 }177178 fn named_names(&self, handler: &mut dyn FnMut(&IStr)) {179 for (name, _) in &self.named {180 handler(name);181 }182 }183}184185impl<A: ArgLike, S> sealed::Named for HashMap<IStr, A, S> {}186impl<A: ArgLike, S> ArgsLike for HashMap<IStr, A, S> {187 fn unnamed_len(&self) -> usize {188 0189 }190191 fn unnamed_iter(192 &self,193 _s: State,194 _ctx: Context,195 _tailstrict: bool,196 _handler: &mut dyn FnMut(usize, Thunk<Val>) -> Result<()>,197 ) -> Result<()> {198 Ok(())199 }200201 fn named_iter(202 &self,203 s: State,204 ctx: Context,205 tailstrict: bool,206 handler: &mut dyn FnMut(&IStr, Thunk<Val>) -> Result<()>,207 ) -> Result<()> {208 for (name, value) in self.iter() {209 handler(210 name,211 value.evaluate_arg(s.clone(), ctx.clone(), tailstrict)?,212 )?;213 }214 Ok(())215 }216217 fn named_names(&self, handler: &mut dyn FnMut(&IStr)) {218 for (name, _) in self.iter() {219 handler(name);220 }221 }222}223224macro_rules! impl_args_like {225 ($count:expr; $($gen:ident)*) => {226 impl<$($gen: ArgLike,)*> sealed::Unnamed for ($($gen,)*) {}227 impl<$($gen: ArgLike,)*> ArgsLike for ($($gen,)*) {228 fn unnamed_len(&self) -> usize {229 $count230 }231 #[allow(non_snake_case, unused_assignments)]232 fn unnamed_iter(233 &self,234 s: State,235 ctx: Context,236 tailstrict: bool,237 handler: &mut dyn FnMut(usize, Thunk<Val>) -> Result<()>,238 ) -> Result<()> {239 let mut i = 0usize;240 let ($($gen,)*) = self;241 $(242 handler(i, $gen.evaluate_arg(s.clone(), ctx.clone(), tailstrict)?)?;243 i+=1;244 )*245 Ok(())246 }247 fn named_iter(248 &self,249 _s: State,250 _ctx: Context,251 _tailstrict: bool,252 _handler: &mut dyn FnMut(&IStr, Thunk<Val>) -> Result<()>,253 ) -> Result<()> {254 Ok(())255 }256 fn named_names(&self, _handler: &mut dyn FnMut(&IStr)) {}257 }258 impl<$($gen: ArgLike,)*> sealed::Named for ($((IStr, $gen),)*) {}259 impl<$($gen: ArgLike,)*> ArgsLike for ($((IStr, $gen),)*) {260 fn unnamed_len(&self) -> usize {261 0262 }263 fn unnamed_iter(264 &self,265 _s: State,266 _ctx: Context,267 _tailstrict: bool,268 _handler: &mut dyn FnMut(usize, Thunk<Val>) -> Result<()>,269 ) -> Result<()> {270 Ok(())271 }272 #[allow(non_snake_case)]273 fn named_iter(274 &self,275 s: State,276 ctx: Context,277 tailstrict: bool,278 handler: &mut dyn FnMut(&IStr, Thunk<Val>) -> Result<()>,279 ) -> Result<()> {280 let ($($gen,)*) = self;281 $(282 handler(&$gen.0, $gen.1.evaluate_arg(s.clone(), ctx.clone(), tailstrict)?)?;283 )*284 Ok(())285 }286 #[allow(non_snake_case)]287 fn named_names(&self, handler: &mut dyn FnMut(&IStr)) {288 let ($($gen,)*) = self;289 $(290 handler(&$gen.0);291 )*292 }293 }294 };295 ($count:expr; $($cur:ident)* @ $c:ident $($rest:ident)*) => {296 impl_args_like!($count; $($cur)*);297 impl_args_like!($count + 1usize; $($cur)* $c @ $($rest)*);298 };299 ($count:expr; $($cur:ident)* @) => {300 impl_args_like!($count; $($cur)*);301 }302}303impl_args_like! {304 // First argument is already in position, so count starts from 1305 1usize; A @ B C D E F G H I J K L306}307308impl ArgsLike for () {309 fn unnamed_len(&self) -> usize {310 0311 }312313 fn unnamed_iter(314 &self,315 _s: State,316 _ctx: Context,317 _tailstrict: bool,318 _handler: &mut dyn FnMut(usize, Thunk<Val>) -> Result<()>,319 ) -> Result<()> {320 Ok(())321 }322323 fn named_iter(324 &self,325 _s: State,326 _ctx: Context,327 _tailstrict: bool,328 _handler: &mut dyn FnMut(&IStr, Thunk<Val>) -> Result<()>,329 ) -> Result<()> {330 Ok(())331 }332333 fn named_names(&self, _handler: &mut dyn FnMut(&IStr)) {}334}1use std::collections::HashMap;23use jrsonnet_gcmodule::Trace;4use jrsonnet_interner::IStr;5use jrsonnet_parser::{ArgsDesc, LocExpr};67use crate::{8 error::Result, evaluate, tb, typed::Typed, val::ThunkValue, Context, State, Thunk, Val,9};1011#[derive(Trace)]12struct EvaluateThunk {13 ctx: Context,14 expr: LocExpr,15}16impl ThunkValue for EvaluateThunk {17 type Output = Val;18 fn get(self: Box<Self>, s: State) -> Result<Val> {19 evaluate(s, self.ctx, &self.expr)20 }21}2223pub trait ArgLike {24 fn evaluate_arg(&self, s: State, ctx: Context, tailstrict: bool) -> Result<Thunk<Val>>;25}2627impl ArgLike for &LocExpr {28 fn evaluate_arg(&self, s: State, ctx: Context, tailstrict: bool) -> Result<Thunk<Val>> {29 Ok(if tailstrict {30 Thunk::evaluated(evaluate(s, ctx, self)?)31 } else {32 Thunk::new(tb!(EvaluateThunk {33 ctx,34 expr: (*self).clone(),35 }))36 })37 }38}3940impl<T> ArgLike for T41where42 T: Typed + Clone,43{44 fn evaluate_arg(&self, s: State, _ctx: Context, _tailstrict: bool) -> Result<Thunk<Val>> {45 let val = T::into_untyped(self.clone(), s)?;46 Ok(Thunk::evaluated(val))47 }48}4950#[derive(Clone)]51pub enum TlaArg {52 String(IStr),53 Code(LocExpr),54 Val(Val),55}56impl ArgLike for TlaArg {57 fn evaluate_arg(&self, s: State, ctx: Context, tailstrict: bool) -> Result<Thunk<Val>> {58 match self {59 TlaArg::String(s) => Ok(Thunk::evaluated(Val::Str(s.clone()))),60 TlaArg::Code(code) => Ok(if tailstrict {61 Thunk::evaluated(evaluate(s, ctx, code)?)62 } else {63 Thunk::new(tb!(EvaluateThunk {64 ctx,65 expr: code.clone(),66 }))67 }),68 TlaArg::Val(val) => Ok(Thunk::evaluated(val.clone())),69 }70 }71}7273mod sealed {74 /// Implemented for `ArgsLike`, where only unnamed arguments present75 pub trait Unnamed {}76 /// Implemented for `ArgsLike`, where only named arguments present77 pub trait Named {}78}7980pub trait ArgsLike {81 fn unnamed_len(&self) -> usize;82 fn unnamed_iter(83 &self,84 s: State,85 ctx: Context,86 tailstrict: bool,87 handler: &mut dyn FnMut(usize, Thunk<Val>) -> Result<()>,88 ) -> Result<()>;89 fn named_iter(90 &self,91 s: State,92 ctx: Context,93 tailstrict: bool,94 handler: &mut dyn FnMut(&IStr, Thunk<Val>) -> Result<()>,95 ) -> Result<()>;96 fn named_names(&self, handler: &mut dyn FnMut(&IStr));97}9899impl ArgsLike for Vec<Val> {100 fn unnamed_len(&self) -> usize {101 self.len()102 }103 fn unnamed_iter(104 &self,105 _s: State,106 _ctx: Context,107 _tailstrict: bool,108 handler: &mut dyn FnMut(usize, Thunk<Val>) -> Result<()>,109 ) -> Result<()> {110 for (idx, el) in self.iter().enumerate() {111 handler(idx, Thunk::evaluated(el.clone()))?;112 }113 Ok(())114 }115 fn named_iter(116 &self,117 _s: State,118 _ctx: Context,119 _tailstrict: bool,120 _handler: &mut dyn FnMut(&IStr, Thunk<Val>) -> Result<()>,121 ) -> Result<()> {122 Ok(())123 }124 fn named_names(&self, _handler: &mut dyn FnMut(&IStr)) {}125}126127impl ArgsLike for ArgsDesc {128 fn unnamed_len(&self) -> usize {129 self.unnamed.len()130 }131132 fn unnamed_iter(133 &self,134 s: State,135 ctx: Context,136 tailstrict: bool,137 handler: &mut dyn FnMut(usize, Thunk<Val>) -> Result<()>,138 ) -> Result<()> {139 for (id, arg) in self.unnamed.iter().enumerate() {140 handler(141 id,142 if tailstrict {143 Thunk::evaluated(evaluate(s.clone(), ctx.clone(), arg)?)144 } else {145 Thunk::new(tb!(EvaluateThunk {146 ctx: ctx.clone(),147 expr: arg.clone(),148 }))149 },150 )?;151 }152 Ok(())153 }154155 fn named_iter(156 &self,157 s: State,158 ctx: Context,159 tailstrict: bool,160 handler: &mut dyn FnMut(&IStr, Thunk<Val>) -> Result<()>,161 ) -> Result<()> {162 for (name, arg) in &self.named {163 handler(164 name,165 if tailstrict {166 Thunk::evaluated(evaluate(s.clone(), ctx.clone(), arg)?)167 } else {168 Thunk::new(tb!(EvaluateThunk {169 ctx: ctx.clone(),170 expr: arg.clone(),171 }))172 },173 )?;174 }175 Ok(())176 }177178 fn named_names(&self, handler: &mut dyn FnMut(&IStr)) {179 for (name, _) in &self.named {180 handler(name);181 }182 }183}184185impl<A: ArgLike, S> sealed::Named for HashMap<IStr, A, S> {}186impl<A: ArgLike, S> ArgsLike for HashMap<IStr, A, S> {187 fn unnamed_len(&self) -> usize {188 0189 }190191 fn unnamed_iter(192 &self,193 _s: State,194 _ctx: Context,195 _tailstrict: bool,196 _handler: &mut dyn FnMut(usize, Thunk<Val>) -> Result<()>,197 ) -> Result<()> {198 Ok(())199 }200201 fn named_iter(202 &self,203 s: State,204 ctx: Context,205 tailstrict: bool,206 handler: &mut dyn FnMut(&IStr, Thunk<Val>) -> Result<()>,207 ) -> Result<()> {208 for (name, value) in self.iter() {209 handler(210 name,211 value.evaluate_arg(s.clone(), ctx.clone(), tailstrict)?,212 )?;213 }214 Ok(())215 }216217 fn named_names(&self, handler: &mut dyn FnMut(&IStr)) {218 for (name, _) in self.iter() {219 handler(name);220 }221 }222}223224macro_rules! impl_args_like {225 ($count:expr; $($gen:ident)*) => {226 impl<$($gen: ArgLike,)*> sealed::Unnamed for ($($gen,)*) {}227 impl<$($gen: ArgLike,)*> ArgsLike for ($($gen,)*) {228 fn unnamed_len(&self) -> usize {229 $count230 }231 #[allow(non_snake_case, unused_assignments)]232 fn unnamed_iter(233 &self,234 s: State,235 ctx: Context,236 tailstrict: bool,237 handler: &mut dyn FnMut(usize, Thunk<Val>) -> Result<()>,238 ) -> Result<()> {239 let mut i = 0usize;240 let ($($gen,)*) = self;241 $(242 handler(i, $gen.evaluate_arg(s.clone(), ctx.clone(), tailstrict)?)?;243 i+=1;244 )*245 Ok(())246 }247 fn named_iter(248 &self,249 _s: State,250 _ctx: Context,251 _tailstrict: bool,252 _handler: &mut dyn FnMut(&IStr, Thunk<Val>) -> Result<()>,253 ) -> Result<()> {254 Ok(())255 }256 fn named_names(&self, _handler: &mut dyn FnMut(&IStr)) {}257 }258 impl<$($gen: ArgLike,)*> sealed::Named for ($((IStr, $gen),)*) {}259 impl<$($gen: ArgLike,)*> ArgsLike for ($((IStr, $gen),)*) {260 fn unnamed_len(&self) -> usize {261 0262 }263 fn unnamed_iter(264 &self,265 _s: State,266 _ctx: Context,267 _tailstrict: bool,268 _handler: &mut dyn FnMut(usize, Thunk<Val>) -> Result<()>,269 ) -> Result<()> {270 Ok(())271 }272 #[allow(non_snake_case)]273 fn named_iter(274 &self,275 s: State,276 ctx: Context,277 tailstrict: bool,278 handler: &mut dyn FnMut(&IStr, Thunk<Val>) -> Result<()>,279 ) -> Result<()> {280 let ($($gen,)*) = self;281 $(282 handler(&$gen.0, $gen.1.evaluate_arg(s.clone(), ctx.clone(), tailstrict)?)?;283 )*284 Ok(())285 }286 #[allow(non_snake_case)]287 fn named_names(&self, handler: &mut dyn FnMut(&IStr)) {288 let ($($gen,)*) = self;289 $(290 handler(&$gen.0);291 )*292 }293 }294 };295 ($count:expr; $($cur:ident)* @ $c:ident $($rest:ident)*) => {296 impl_args_like!($count; $($cur)*);297 impl_args_like!($count + 1usize; $($cur)* $c @ $($rest)*);298 };299 ($count:expr; $($cur:ident)* @) => {300 impl_args_like!($count; $($cur)*);301 }302}303impl_args_like! {304 // First argument is already in position, so count starts from 1305 1usize; A @ B C D E F G H I J K L306}307308impl ArgsLike for () {309 fn unnamed_len(&self) -> usize {310 0311 }312313 fn unnamed_iter(314 &self,315 _s: State,316 _ctx: Context,317 _tailstrict: bool,318 _handler: &mut dyn FnMut(usize, Thunk<Val>) -> Result<()>,319 ) -> Result<()> {320 Ok(())321 }322323 fn named_iter(324 &self,325 _s: State,326 _ctx: Context,327 _tailstrict: bool,328 _handler: &mut dyn FnMut(&IStr, Thunk<Val>) -> Result<()>,329 ) -> Result<()> {330 Ok(())331 }332333 fn named_names(&self, _handler: &mut dyn FnMut(&IStr)) {}334}crates/jrsonnet-evaluator/src/function/parse.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/function/parse.rs
+++ b/crates/jrsonnet-evaluator/src/function/parse.rs
@@ -179,12 +179,7 @@
// FIXME: O(n) for arg existence check
let id = params
.iter()
- .position(|p| {
- p.name
- .as_ref()
- .map(|v| &v as &str == name as &str)
- .unwrap_or(false)
- })
+ .position(|p| p.name.as_ref().map_or(false, |v| v as &str == name as &str))
.ok_or_else(|| UnknownFunctionParameter((name as &str).to_owned()))?;
if replace(&mut passed_args[id], Some(arg)).is_some() {
throw!(BindingParameterASecondTime(name.clone()));
@@ -209,8 +204,7 @@
if param
.name
.as_ref()
- .map(|v| &v as &str == name as &str)
- .unwrap_or(false)
+ .map_or(false, |v| v as &str == name as &str)
{
found = true;
}
crates/jrsonnet-evaluator/src/import.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/import.rs
+++ b/crates/jrsonnet-evaluator/src/import.rs
@@ -123,15 +123,11 @@
};
if meta.is_file() {
Ok(SourcePath::new(SourceFile::new(
- path.canonicalize()
- .map_err(|e| ImportIo(e.to_string()))?
- .to_owned(),
+ path.canonicalize().map_err(|e| ImportIo(e.to_string()))?,
)))
} else if meta.is_dir() {
Ok(SourcePath::new(SourceDirectory::new(
- path.canonicalize()
- .map_err(|e| ImportIo(e.to_string()))?
- .to_owned(),
+ path.canonicalize().map_err(|e| ImportIo(e.to_string()))?,
)))
} else {
unreachable!("this can't be a symlink")
crates/jrsonnet-evaluator/src/integrations/serde.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/integrations/serde.rs
+++ b/crates/jrsonnet-evaluator/src/integrations/serde.rs
@@ -16,7 +16,7 @@
Self::Null => Val::Null,
Self::Bool(v) => Val::Bool(v),
Self::Number(n) => Val::Num(n.as_f64().ok_or_else(|| {
- RuntimeError(format!("json number can't be represented as jsonnet: {}", n).into())
+ RuntimeError(format!("json number can't be represented as jsonnet: {n}").into())
})?),
Self::String(s) => Val::Str((&s as &str).into()),
Self::Array(a) => {
crates/jrsonnet-evaluator/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/lib.rs
+++ b/crates/jrsonnet-evaluator/src/lib.rs
@@ -594,7 +594,7 @@
.insert(name, TlaArg::String(value));
}
pub fn add_tla_code(&self, name: IStr, code: &str) -> Result<()> {
- let source_name = format!("<top-level-arg:{}>", name);
+ let source_name = format!("<top-level-arg:{name}>");
let source = Source::new_virtual(source_name.into(), code.into());
let parsed = jrsonnet_parser::parse(
code,
crates/jrsonnet-evaluator/src/obj.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/obj.rs
+++ b/crates/jrsonnet-evaluator/src/obj.rs
@@ -156,9 +156,9 @@
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
if let Some(super_obj) = self.0.sup.as_ref() {
if f.alternate() {
- write!(f, "{:#?}", super_obj)?;
+ write!(f, "{super_obj:#?}")?;
} else {
- write!(f, "{:?}", super_obj)?;
+ write!(f, "{super_obj:?}")?;
}
write!(f, " + ")?;
}
@@ -395,10 +395,9 @@
})?;
self.0.value_cache.borrow_mut().insert(
key,
- match &value {
- Some(v) => CacheValue::Cached(v.clone()),
- None => CacheValue::NotFound,
- },
+ value
+ .as_ref()
+ .map_or(CacheValue::NotFound, |v| CacheValue::Cached(v.clone())),
);
Ok(value)
}
crates/jrsonnet-evaluator/src/stdlib/format.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/stdlib/format.rs
+++ b/crates/jrsonnet-evaluator/src/stdlib/format.rs
@@ -45,7 +45,7 @@
let mut i = 1;
while i < bytes.len() {
if bytes[i] == b')' {
- return Ok((&str[1..i as usize], &str[i as usize + 1..]));
+ return Ok((&str[1..i], &str[i + 1..]));
}
i += 1;
}
@@ -310,6 +310,7 @@
nums
};
let neg = iv < 0.0;
+ #[allow(clippy::bool_to_int_with_if)]
let zp = padding.saturating_sub(if neg || blank || sign { 1 } else { 0 });
let zp2 = zp
.max(precision)
@@ -406,6 +407,7 @@
ensure_pt: bool,
trailing: bool,
) {
+ #[allow(clippy::bool_to_int_with_if)]
let dot_size = if precision == 0 && !ensure_pt { 0 } else { 1 };
padding = padding.saturating_sub(dot_size + precision);
render_decimal(out, n.floor(), padding, 0, blank, sign);
@@ -478,10 +480,7 @@
precision: Option<usize>,
) -> Result<()> {
let clfags = &code.cflags;
- let (fpprec, iprec) = match precision {
- Some(v) => (v, v),
- None => (6, 0),
- };
+ let (fpprec, iprec) = precision.map_or((6, 0), |v| (v, v));
let padding = if clfags.zero && !clfags.left {
width
} else {
@@ -586,8 +585,10 @@
}
}
ConvTypeV::Char => match value.clone() {
- Val::Num(n) => tmp_out
- .push(std::char::from_u32(n as u32).ok_or(InvalidUnicodeCodepointGot(n as u32))?),
+ Val::Num(n) => tmp_out.push(
+ std::char::from_u32(n as u32)
+ .ok_or_else(|| InvalidUnicodeCodepointGot(n as u32))?,
+ ),
Val::Str(s) => {
if s.chars().count() != 1 {
throw!(RuntimeError(
crates/jrsonnet-evaluator/src/stdlib/manifest.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/stdlib/manifest.rs
+++ b/crates/jrsonnet-evaluator/src/stdlib/manifest.rs
@@ -49,7 +49,7 @@
}
Val::Null => buf.push_str("null"),
Val::Str(s) => escape_string_json_buf(s, buf),
- Val::Num(n) => write!(buf, "{}", n).unwrap(),
+ Val::Num(n) => write!(buf, "{n}").unwrap(),
Val::Arr(items) => {
buf.push('[');
if !items.is_empty() {
crates/jrsonnet-evaluator/src/stdlib/mod.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/stdlib/mod.rs
+++ b/crates/jrsonnet-evaluator/src/stdlib/mod.rs
@@ -12,7 +12,7 @@
pub fn std_format(s: State, str: IStr, vals: Val) -> Result<String> {
s.push(
CallLocation::native(),
- || format!("std.format of {}", str),
+ || format!("std.format of {str}"),
|| {
Ok(match vals {
Val::Arr(vals) => format_arr(s.clone(), &str, &vals.evaluated(s.clone())?)?,
crates/jrsonnet-evaluator/src/trace/mod.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/trace/mod.rs
+++ b/crates/jrsonnet-evaluator/src/trace/mod.rs
@@ -16,12 +16,9 @@
}
impl PathResolver {
- /// Will return Self::Relative(cwd), or Self::Absolute on cwd failure
+ /// Will return `Self::Relative(cwd)`, or `Self::Absolute` on cwd failure
pub fn new_cwd_fallback() -> Self {
- match std::env::current_dir() {
- Ok(v) => Self::Relative(v),
- Err(_) => Self::Absolute,
- }
+ std::env::current_dir().map_or(Self::Absolute, Self::Relative)
}
pub fn resolve(&self, from: &Path) -> String {
match self {
@@ -97,10 +94,10 @@
use std::fmt::Write;
writeln!(out)?;
- let mut n = match path.source_path().path() {
- Some(r) => self.resolver.resolve(r),
- None => path.source_path().to_string(),
- };
+ let mut n = path.source_path().path().map_or_else(
+ || path.source_path().to_string(),
+ |r| self.resolver.resolve(r),
+ );
let mut offset = error.location.offset;
let is_eof = if offset >= path.code().len() {
offset = path.code().len().saturating_sub(1);
@@ -119,7 +116,7 @@
write!(n, ":").unwrap();
print_code_location(&mut n, &location, &location).unwrap();
- write!(out, "{:<p$}{}", "", n, p = self.padding,)?;
+ write!(out, "{:<p$}{n}", "", p = self.padding)?;
}
let file_names = error
.trace()
@@ -185,10 +182,10 @@
let desc = &item.desc;
if let Some(source) = &item.location {
let start_end = source.0.map_source_locations(&[source.1, source.2]);
- let resolved_path = match source.0.source_path().path() {
- Some(r) => r.display().to_string(),
- None => source.0.source_path().to_string(),
- };
+ let resolved_path = source.0.source_path().path().map_or_else(
+ || source.0.source_path().to_string(),
+ |r| r.display().to_string(),
+ );
write!(
out,
@@ -196,7 +193,7 @@
desc, resolved_path, start_end[0].line, start_end[0].column,
)?;
} else {
- write!(out, " during {}", desc)?;
+ write!(out, " during {desc}")?;
}
}
Ok(())
@@ -252,7 +249,7 @@
desc,
)?;
} else {
- write!(out, "{}", desc)?;
+ write!(out, "{desc}")?;
}
}
Ok(())
@@ -280,10 +277,10 @@
.take(end.line_end_offset - end.line_start_offset)
.collect();
- let origin = match origin.source_path().path() {
- Some(r) => self.resolver.resolve(r),
- None => origin.source_path().to_string(),
- };
+ let origin = origin.source_path().path().map_or_else(
+ || origin.source_path().to_string(),
+ |r| self.resolver.resolve(r),
+ );
let snippet = Snippet {
opt: FormatOptions {
color: true,
@@ -308,7 +305,7 @@
};
let dl = DisplayList::from(snippet);
- write!(out, "{}", dl)?;
+ write!(out, "{dl}")?;
Ok(())
}
crates/jrsonnet-evaluator/src/typed/mod.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/typed/mod.rs
+++ b/crates/jrsonnet-evaluator/src/typed/mod.rs
@@ -21,8 +21,8 @@
UnionFailed(ComplexValType, TypeLocErrorList),
#[error(
"number out of bounds: {0} not in {}..{}",
- .1.map(|v|v.to_string()).unwrap_or_else(|| "".to_owned()),
- .2.map(|v|v.to_string()).unwrap_or_else(|| "".to_owned()),
+ .1.map(|v|v.to_string()).unwrap_or_default(),
+ .2.map(|v|v.to_string()).unwrap_or_default(),
)]
BoundsFailed(f64, Option<f64>, Option<f64>),
}
@@ -65,7 +65,7 @@
writeln!(f)?;
}
out.clear();
- write!(out, "{}", err)?;
+ write!(out, "{err}")?;
for (i, line) in out.lines().enumerate() {
if line.trim().is_empty() {
@@ -77,7 +77,7 @@
writeln!(f)?;
write!(f, " ")?;
}
- write!(f, "{}", line)?;
+ write!(f, "{line}")?;
}
}
Ok(())
@@ -125,8 +125,8 @@
impl Display for ValuePathItem {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self {
- Self::Field(name) => write!(f, ".{:?}", name)?,
- Self::Index(idx) => write!(f, "[{}]", idx)?,
+ Self::Field(name) => write!(f, ".{name:?}")?,
+ Self::Index(idx) => write!(f, "[{idx}]")?,
}
Ok(())
}
@@ -138,7 +138,7 @@
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "self")?;
for elem in self.0.iter().rev() {
- write!(f, "{}", elem)?;
+ write!(f, "{elem}")?;
}
Ok(())
}
@@ -171,7 +171,7 @@
for (i, item) in a.iter(s.clone()).enumerate() {
push_type_description(
s.clone(),
- || format!("array index {}", i),
+ || format!("array index {i}"),
|| ValuePathItem::Index(i as u64),
|| elem_type.check(s.clone(), &item.clone()?),
)?;
@@ -185,7 +185,7 @@
for (i, item) in a.iter(s.clone()).enumerate() {
push_type_description(
s.clone(),
- || format!("array index {}", i),
+ || format!("array index {i}"),
|| ValuePathItem::Index(i as u64),
|| elem_type.check(s.clone(), &item.clone()?),
)?;
@@ -200,7 +200,7 @@
if let Some(got_v) = obj.get(s.clone(), (*k).into())? {
push_type_description(
s.clone(),
- || format!("property {}", k),
+ || format!("property {k}"),
|| ValuePathItem::Field((*k).into()),
|| v.check(s.clone(), &got_v),
)?;
crates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -292,7 +292,7 @@
if index >= v.to() {
return Ok(None);
}
- v.inner.get(s, index as usize)
+ v.inner.get(s, index)
}
}
}
@@ -332,7 +332,7 @@
if index >= s.to() {
return None;
}
- s.inner.get_lazy(index as usize)
+ s.inner.get_lazy(index)
}
}
}
@@ -531,8 +531,9 @@
}
}
-#[cfg(target_pointer_width = "64")]
-static_assertions::assert_eq_size!(Val, [u8; 32]);
+// Broken between stable and nightly, as there is new layout size optimization
+// #[cfg(target_pointer_width = "64")]
+// static_assertions::assert_eq_size!(Val, [u8; 24]);
impl Val {
pub const fn as_bool(&self) -> Option<bool> {
crates/jrsonnet-stdlib/src/encoding.rsdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/encoding.rs
+++ b/crates/jrsonnet-stdlib/src/encoding.rs
@@ -28,7 +28,7 @@
#[builtin]
pub fn builtin_base64_decode_bytes(input: IStr) -> Result<IBytes> {
- Ok(base64::decode(&input.as_bytes())
+ Ok(base64::decode(input.as_bytes())
.map_err(|_| RuntimeError("bad base64".into()))?
.as_slice()
.into())
@@ -36,6 +36,6 @@
#[builtin]
pub fn builtin_base64_decode(input: IStr) -> Result<String> {
- let bytes = base64::decode(&input.as_bytes()).map_err(|_| RuntimeError("bad base64".into()))?;
+ let bytes = base64::decode(input.as_bytes()).map_err(|_| RuntimeError("bad base64".into()))?;
Ok(String::from_utf8(bytes).map_err(|_| RuntimeError("bad utf8".into()))?)
}
crates/jrsonnet-stdlib/src/hash.rsdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/hash.rs
+++ b/crates/jrsonnet-stdlib/src/hash.rs
@@ -2,5 +2,5 @@
#[builtin]
pub fn builtin_md5(str: IStr) -> Result<String> {
- Ok(format!("{:x}", md5::compute(&str.as_bytes())))
+ Ok(format!("{:x}", md5::compute(str.as_bytes())))
}
crates/jrsonnet-stdlib/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/lib.rs
+++ b/crates/jrsonnet-stdlib/src/lib.rs
@@ -366,7 +366,7 @@
#[builtin]
fn builtin_substr(str: IStr, from: usize, len: usize) -> Result<String> {
- Ok(str.chars().skip(from as usize).take(len as usize).collect())
+ Ok(str.chars().skip(from).take(len).collect())
}
#[builtin(fields(
@@ -380,7 +380,7 @@
.ext_vars
.get(&x)
.cloned()
- .ok_or(UndefinedExternalVariable(x))?
+ .ok_or_else(|| UndefinedExternalVariable(x))?
.evaluate_arg(s.clone(), ctx, true)?
.evaluate(s)?))
}
@@ -402,7 +402,7 @@
#[builtin]
fn builtin_char(n: u32) -> Result<char> {
- Ok(std::char::from_u32(n as u32).ok_or(InvalidUnicodeCodepointGot(n as u32))?)
+ Ok(std::char::from_u32(n).ok_or_else(|| InvalidUnicodeCodepointGot(n))?)
}
#[builtin(fields(