difftreelog
style fix clippy warnings
in: master
9 files changed
crates/jrsonnet-evaluator/src/builtin/manifest.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/builtin/manifest.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/manifest.rs
@@ -42,7 +42,7 @@
}
}
Val::Null => buf.push_str("null"),
- Val::Str(s) => buf.push_str(&escape_string_json(&s)),
+ Val::Str(s) => buf.push_str(&escape_string_json(s)),
Val::Num(n) => write!(buf, "{}", n).unwrap(),
Val::Arr(items) => {
buf.push('[');
crates/jrsonnet-evaluator/src/builtin/mod.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/builtin/mod.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/mod.rs
@@ -445,7 +445,7 @@
},
Val::Arr(a) => {
base64::encode(a.iter().map(|v| {
- Ok(v?.clone().unwrap_num()? as u8)
+ Ok(v?.unwrap_num()? as u8)
}).collect::<Result<Vec<_>>>()?).into()
},
_ => unreachable!()
@@ -589,7 +589,7 @@
name: &str,
args: &ArgsDesc,
) -> Result<Val> {
- if let Some(f) = BUILTINS.with(|builtins| builtins.get(name).map(|f| *f)) {
+ if let Some(f) = BUILTINS.with(|builtins| builtins.get(name).copied()) {
return Ok(f(context, loc, args)?);
}
throw!(IntrinsicNotFound(name.into()))
crates/jrsonnet-evaluator/src/evaluate.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/evaluate.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate.rs
@@ -473,7 +473,6 @@
}
v.get(n as usize)?
.ok_or_else(|| ArrayBoundsError(n as usize, v.len()))?
- .clone()
}
(Val::Arr(_), Val::Str(n)) => throw!(AttemptedIndexAnArrayWithString(n)),
(Val::Arr(_), n) => throw!(ValueIndexMustBeTypeGot(
crates/jrsonnet-evaluator/src/native.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/native.rs
+++ b/crates/jrsonnet-evaluator/src/native.rs
@@ -1,3 +1,5 @@
+#![allow(clippy::type_complexity)]
+
use crate::{error::Result, Val};
use jrsonnet_parser::ParamsDesc;
use std::fmt::Debug;
crates/jrsonnet-evaluator/src/obj.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/obj.rs
+++ b/crates/jrsonnet-evaluator/src/obj.rs
@@ -34,7 +34,7 @@
}
let mut debug = f.debug_struct("ObjValue");
for (name, member) in self.0.this_entries.iter() {
- debug.field(&name, member);
+ debug.field(name, member);
}
#[cfg(feature = "unstable")]
{
@@ -140,7 +140,7 @@
.evaluate()?)
}
- pub fn ptr_eq(a: &ObjValue, b: &ObjValue) -> bool {
+ pub fn ptr_eq(a: &Self, b: &Self) -> bool {
Rc::ptr_eq(&a.0, &b.0)
}
}
crates/jrsonnet-evaluator/src/typed.rsdiffbeforeafterboth1use std::{fmt::Display, rc::Rc};23use crate::{4 error::{Error, LocError, Result},5 push, Val,6};7use jrsonnet_parser::ExprLocation;8use jrsonnet_types::{ComplexValType, ValType};9use thiserror::Error;1011#[derive(Debug, Error, Clone)]12pub enum TypeError {13 #[error("expected {0}, got {1}")]14 ExpectedGot(ComplexValType, ValType),15 #[error("missing property {0} from {1:?}")]16 MissingProperty(Rc<str>, ComplexValType),17 #[error("every failed from {0}:\n{1}")]18 UnionFailed(ComplexValType, TypeLocErrorList),19 #[error("number out of bounds: {0} not in {1:?}..{2:?}")]20 BoundsFailed(f64, Option<f64>, Option<f64>),21}22impl From<TypeError> for LocError {23 fn from(e: TypeError) -> Self {24 Error::TypeError(e.into()).into()25 }26}2728#[derive(Debug, Clone)]29pub struct TypeLocError(Box<TypeError>, ValuePathStack);30impl From<TypeError> for TypeLocError {31 fn from(e: TypeError) -> Self {32 TypeLocError(Box::new(e), ValuePathStack(Vec::new()))33 }34}35impl From<TypeLocError> for LocError {36 fn from(e: TypeLocError) -> Self {37 Error::TypeError(e).into()38 }39}40impl Display for TypeLocError {41 fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {42 write!(f, "{}", self.0)?;43 if !(self.1).0.is_empty() {44 write!(f, "at {}", self.1)?;45 }46 Ok(())47 }48}4950#[derive(Debug, Clone)]51pub struct TypeLocErrorList(Vec<TypeLocError>);52impl Display for TypeLocErrorList {53 fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {54 use std::fmt::Write;55 let mut out = String::new();56 for (i, err) in self.0.iter().enumerate() {57 if i != 0 {58 writeln!(f)?;59 }60 out.clear();61 write!(out, "{}", err)?;6263 for (i, line) in out.lines().enumerate() {64 if line.trim().len() == 0 {65 continue;66 }67 if i != 0 {68 writeln!(f)?;69 write!(f, " ")?;70 } else {71 write!(f, " - ")?;72 }73 write!(f, "{}", line)?;74 }75 }76 Ok(())77 }78}7980fn push_type(81 location: Option<&ExprLocation>,82 error_reason: impl Fn() -> String,83 path: impl Fn() -> ValuePathItem,84 item: impl Fn() -> Result<()>,85) -> Result<()> {86 push(location, error_reason, || match item() {87 Ok(_) => Ok(()),88 Err(mut e) => {89 if let Error::TypeError(e) = &mut e.error_mut() {90 (e.1).0.push(path())91 }92 Err(e)93 }94 })95}9697// TODO: check_fast for fast path of union type checking98pub trait CheckType {99 fn check(&self, value: &Val) -> Result<()>;100}101102impl CheckType for ValType {103 fn check(&self, value: &Val) -> Result<()> {104 let got = value.value_type();105 if got != *self {106 let loc_error: TypeLocError = TypeError::ExpectedGot((*self).into(), got).into();107 return Err(loc_error.into());108 }109 Ok(())110 }111}112113#[derive(Clone, Debug)]114enum ValuePathItem {115 Field(Rc<str>),116 Index(u64),117}118impl Display for ValuePathItem {119 fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {120 match self {121 ValuePathItem::Field(name) => write!(f, ".{}", name)?,122 ValuePathItem::Index(idx) => write!(f, "[{}]", idx)?,123 }124 Ok(())125 }126}127128#[derive(Clone, Debug)]129struct ValuePathStack(Vec<ValuePathItem>);130impl Display for ValuePathStack {131 fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {132 write!(f, "self")?;133 for elem in self.0.iter().rev() {134 write!(f, "{}", elem)?;135 }136 Ok(())137 }138}139140impl CheckType for ComplexValType {141 fn check(&self, value: &Val) -> Result<()> {142 match self {143 ComplexValType::Any => Ok(()),144 ComplexValType::Simple(s) => s.check(value),145 ComplexValType::Char => match value {146 Val::Str(s) if s.len() == 1 || s.chars().count() == 1 => Ok(()),147 v => Err(TypeError::ExpectedGot(self.clone(), v.value_type()).into()),148 },149 ComplexValType::BoundedNumber(from, to) => {150 if let Val::Num(n) = value {151 if from.map(|from| from > *n).unwrap_or(false)152 || to.map(|to| to <= *n).unwrap_or(false)153 {154 return Err(TypeError::BoundsFailed(*n, from.clone(), to.clone()).into());155 }156 Ok(())157 } else {158 Err(TypeError::ExpectedGot(self.clone(), value.value_type()).into())159 }160 }161 ComplexValType::Array(elem_type) => match value {162 Val::Arr(a) => {163 for (i, item) in a.iter().enumerate() {164 push_type(165 None,166 || format!("array index {}", i),167 || ValuePathItem::Index(i as u64),168 || Ok(elem_type.check(&item.clone()?)?),169 )?;170 }171 Ok(())172 }173 v => return Err(TypeError::ExpectedGot(self.clone(), v.value_type()).into()),174 },175 ComplexValType::ArrayRef(elem_type) => match value {176 Val::Arr(a) => {177 for (i, item) in a.iter().enumerate() {178 push_type(179 None,180 || format!("array index {}", i),181 || ValuePathItem::Index(i as u64),182 || Ok(elem_type.check(&item.clone()?)?),183 )?;184 }185 Ok(())186 }187 v => return Err(TypeError::ExpectedGot(self.clone(), v.value_type()).into()),188 },189 ComplexValType::ObjectRef(elems) => match value {190 Val::Obj(obj) => {191 for (k, v) in elems.iter() {192 if let Some(got_v) = obj.get((*k).into())? {193 push_type(194 None,195 || format!("property {}", k),196 || ValuePathItem::Field((*k).into()),197 || v.check(&got_v),198 )?199 } else {200 return Err(201 TypeError::MissingProperty((*k).into(), self.clone()).into()202 );203 }204 }205 return Ok(());206 }207 v => return Err(TypeError::ExpectedGot(self.clone(), v.value_type()).into()),208 },209 ComplexValType::Union(types) => {210 let mut errors = Vec::new();211 for ty in types.iter() {212 match ty.check(value) {213 Ok(()) => {214 return Ok(());215 }216 Err(e) => match e.error() {217 Error::TypeError(e) => errors.push(e.clone()),218 _ => return Err(e),219 },220 }221 }222 return Err(TypeError::UnionFailed(self.clone(), TypeLocErrorList(errors)).into());223 }224 ComplexValType::UnionRef(types) => {225 let mut errors = Vec::new();226 for ty in types.iter() {227 match ty.check(value) {228 Ok(()) => {229 return Ok(());230 }231 Err(e) => match e.error() {232 Error::TypeError(e) => errors.push(e.clone()),233 _ => return Err(e),234 },235 }236 }237 return Err(TypeError::UnionFailed(self.clone(), TypeLocErrorList(errors)).into());238 }239 ComplexValType::Sum(types) => {240 for ty in types.iter() {241 ty.check(value)?242 }243 Ok(())244 }245 ComplexValType::SumRef(types) => {246 for ty in types.iter() {247 ty.check(value)?248 }249 Ok(())250 }251 }252 }253}crates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -176,14 +176,14 @@
pub enum ArrValue {
Lazy(Rc<Vec<LazyVal>>),
Eager(Rc<Vec<Val>>),
- Extended(Box<(ArrValue, ArrValue)>),
+ Extended(Box<(Self, Self)>),
}
impl ArrValue {
pub fn len(&self) -> usize {
match self {
- ArrValue::Lazy(l) => l.len(),
- ArrValue::Eager(e) => e.len(),
- ArrValue::Extended(v) => v.0.len() + v.1.len(),
+ Self::Lazy(l) => l.len(),
+ Self::Eager(e) => e.len(),
+ Self::Extended(v) => v.0.len() + v.1.len(),
}
}
@@ -193,15 +193,15 @@
pub fn get(&self, index: usize) -> Result<Option<Val>> {
match self {
- ArrValue::Lazy(vec) => {
+ Self::Lazy(vec) => {
if let Some(v) = vec.get(index) {
Ok(Some(v.evaluate()?))
} else {
Ok(None)
}
}
- ArrValue::Eager(vec) => Ok(vec.get(index).cloned()),
- ArrValue::Extended(v) => {
+ Self::Eager(vec) => Ok(vec.get(index).cloned()),
+ Self::Extended(v) => {
let a_len = v.0.len();
if a_len > index {
v.0.get(index)
@@ -214,12 +214,9 @@
pub fn get_lazy(&self, index: usize) -> Option<LazyVal> {
match self {
- ArrValue::Lazy(vec) => vec.get(index).cloned(),
- ArrValue::Eager(vec) => vec
- .get(index)
- .cloned()
- .map(|val| LazyVal::new_resolved(val)),
- ArrValue::Extended(v) => {
+ Self::Lazy(vec) => vec.get(index).cloned(),
+ Self::Eager(vec) => vec.get(index).cloned().map(LazyVal::new_resolved),
+ Self::Extended(v) => {
let a_len = v.0.len();
if a_len > index {
v.0.get_lazy(index)
@@ -232,15 +229,15 @@
pub fn evaluated(&self) -> Result<Rc<Vec<Val>>> {
Ok(match self {
- ArrValue::Lazy(vec) => {
+ Self::Lazy(vec) => {
let mut out = Vec::with_capacity(vec.len());
for item in vec.iter() {
out.push(item.evaluate()?);
}
Rc::new(out)
}
- ArrValue::Eager(vec) => vec.clone(),
- ArrValue::Extended(v) => {
+ Self::Eager(vec) => vec.clone(),
+ Self::Extended(_v) => {
let mut out = Vec::with_capacity(self.len());
for item in self.iter() {
out.push(item?);
@@ -252,40 +249,40 @@
pub fn iter(&self) -> impl DoubleEndedIterator<Item = Result<Val>> + '_ {
(0..self.len()).map(move |idx| match self {
- ArrValue::Lazy(l) => l[idx].evaluate(),
- ArrValue::Eager(e) => Ok(e[idx].clone()),
- ArrValue::Extended(_) => self.get(idx).map(|e| e.unwrap()),
+ Self::Lazy(l) => l[idx].evaluate(),
+ Self::Eager(e) => Ok(e[idx].clone()),
+ Self::Extended(_) => self.get(idx).map(|e| e.unwrap()),
})
}
pub fn iter_lazy(&self) -> impl DoubleEndedIterator<Item = LazyVal> + '_ {
(0..self.len()).map(move |idx| match self {
- ArrValue::Lazy(l) => l[idx].clone(),
- ArrValue::Eager(e) => LazyVal::new_resolved(e[idx].clone()),
- ArrValue::Extended(_) => self.get_lazy(idx).unwrap(),
+ Self::Lazy(l) => l[idx].clone(),
+ Self::Eager(e) => LazyVal::new_resolved(e[idx].clone()),
+ Self::Extended(_) => self.get_lazy(idx).unwrap(),
})
}
pub fn reversed(self) -> Self {
match self {
- ArrValue::Lazy(vec) => {
+ Self::Lazy(vec) => {
let mut out = (&vec as &Vec<_>).clone();
out.reverse();
Self::Lazy(Rc::new(out))
}
- ArrValue::Eager(vec) => {
+ Self::Eager(vec) => {
let mut out = (&vec as &Vec<_>).clone();
out.reverse();
Self::Eager(Rc::new(out))
}
- ArrValue::Extended(b) => ArrValue::Extended(Box::new((b.1.reversed(), b.0.reversed()))),
+ Self::Extended(b) => Self::Extended(Box::new((b.1.reversed(), b.0.reversed()))),
}
}
- pub fn ptr_eq(a: &ArrValue, b: &ArrValue) -> bool {
+ pub fn ptr_eq(a: &Self, b: &Self) -> bool {
match (a, b) {
- (ArrValue::Lazy(a), ArrValue::Lazy(b)) => Rc::ptr_eq(a, b),
- (ArrValue::Eager(a), ArrValue::Eager(b)) => Rc::ptr_eq(a, b),
+ (Self::Lazy(a), Self::Lazy(b)) => Rc::ptr_eq(a, b),
+ (Self::Eager(a), Self::Eager(b)) => Rc::ptr_eq(a, b),
_ => false,
}
}
@@ -359,7 +356,7 @@
self.assert_type(context, ValType::Num)?;
self.unwrap_num()
}
- pub fn value_type(&self) -> ValType {
+ pub const fn value_type(&self) -> ValType {
match self {
Self::Str(..) => ValType::Str,
Self::Num(..) => ValType::Num,
@@ -378,7 +375,7 @@
Self::Null => "null".into(),
Self::Str(s) => s.clone(),
v => manifest_json_ex(
- &v,
+ v,
&ManifestJsonOptions {
padding: "",
mtype: ManifestType::ToString,
@@ -556,7 +553,7 @@
(Val::Obj(_), Val::Obj(_)) => throw!(RuntimeError(
"primitiveEquals operates on primitive types, got object".into(),
)),
- (a, b) if is_function_like(&a) && is_function_like(&b) => {
+ (a, b) if is_function_like(a) && is_function_like(b) => {
throw!(RuntimeError("cannot test equality of functions".into()))
}
(_, _) => false,
@@ -598,6 +595,6 @@
}
Ok(true)
}
- (a, b) => Ok(primitive_equals(&a, &b)?),
+ (a, b) => Ok(primitive_equals(a, b)?),
}
}
crates/jrsonnet-interner/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-interner/src/lib.rs
+++ b/crates/jrsonnet-interner/src/lib.rs
@@ -68,7 +68,7 @@
IStr(STR_POOL.with(|pool| {
let mut pool = pool.borrow_mut();
if let Some((k, _)) = pool.get_key_value(str) {
- return k.clone();
+ k.clone()
} else {
let rc: Rc<str> = str.into();
pool.insert(rc.clone(), ());
crates/jrsonnet-types/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-types/src/lib.rs
+++ b/crates/jrsonnet-types/src/lib.rs
@@ -133,10 +133,8 @@
union: &[ComplexValType],
) -> std::fmt::Result {
for (i, v) in union.iter().enumerate() {
- let should_add_braces = match v {
- ComplexValType::UnionRef(_) | ComplexValType::Union(_) if !is_union => true,
- _ => false,
- };
+ let should_add_braces =
+ matches!(v, ComplexValType::UnionRef(_) | ComplexValType::Union(_) if !is_union);
if i != 0 {
write!(f, " {} ", if is_union { '|' } else { '&' })?;
}