Skip to content

Commit 2d0d919

Browse files
committed
style: fix warnings with nightly clippy
Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
1 parent e1e1d4b commit 2d0d919

9 files changed

Lines changed: 31 additions & 26 deletions

File tree

crates/jrsonnet-cli/src/trace.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use jrsonnet_evaluator::{
99

1010
use crate::ConfigureState;
1111

12-
#[derive(PartialEq)]
12+
#[derive(PartialEq, Eq)]
1313
pub enum TraceFormatName {
1414
Compact,
1515
Explaining,

crates/jrsonnet-evaluator/src/integrations/serde.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@ impl Typed for Value {
1313

1414
fn into_untyped(value: Self, s: State) -> Result<Val> {
1515
Ok(match value {
16-
Value::Null => Val::Null,
17-
Value::Bool(v) => Val::Bool(v),
18-
Value::Number(n) => Val::Num(n.as_f64().ok_or_else(|| {
16+
Self::Null => Val::Null,
17+
Self::Bool(v) => Val::Bool(v),
18+
Self::Number(n) => Val::Num(n.as_f64().ok_or_else(|| {
1919
RuntimeError(format!("json number can't be represented as jsonnet: {}", n).into())
2020
})?),
21-
Value::String(s) => Val::Str((&s as &str).into()),
22-
Value::Array(a) => {
21+
Self::String(s) => Val::Str((&s as &str).into()),
22+
Self::Array(a) => {
2323
let mut out: Vec<Val> = Vec::with_capacity(a.len());
2424
for v in a {
2525
out.push(Self::into_untyped(v, s.clone())?);
2626
}
2727
Val::Arr(out.into())
2828
}
29-
Value::Object(o) => {
29+
Self::Object(o) => {
3030
let mut builder = ObjValueBuilder::with_capacity(o.len());
3131
for (k, v) in o {
3232
builder

crates/jrsonnet-evaluator/src/lib.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@
1717
clippy::cast_possible_wrap,
1818
clippy::cast_possible_truncation,
1919
clippy::cast_sign_loss,
20+
// False positives
21+
// https://github.com/rust-lang/rust-clippy/issues/6902
22+
clippy::use_self,
23+
// https://github.com/rust-lang/rust-clippy/issues/8539
24+
clippy::iter_with_drain,
2025
)]
2126

2227
// For jrsonnet-macros

crates/jrsonnet-evaluator/src/stdlib/format.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ pub fn try_parse_cflags(str: &str) -> ParseResult<CFlags> {
120120
Ok((out, &str[i..]))
121121
}
122122

123-
#[derive(Debug, PartialEq)]
123+
#[derive(Debug, PartialEq, Eq)]
124124
pub enum Width {
125125
Star,
126126
Fixed(usize),
@@ -174,7 +174,7 @@ pub fn try_parse_length_modifier(str: &str) -> ParseResult<()> {
174174
Ok(((), &str[idx..]))
175175
}
176176

177-
#[derive(Debug, PartialEq)]
177+
#[derive(Debug, PartialEq, Eq)]
178178
pub enum ConvTypeV {
179179
Decimal,
180180
Octal,

crates/jrsonnet-evaluator/src/stdlib/manifest.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use crate::{
33
throw, State, Val,
44
};
55

6-
#[derive(PartialEq, Clone, Copy)]
6+
#[derive(PartialEq, Eq, Clone, Copy)]
77
pub enum ManifestType {
88
// Applied in manifestification
99
Manifest,

crates/jrsonnet-evaluator/src/trace/location.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#[allow(clippy::module_name_repetitions)]
2-
#[derive(Clone, PartialEq, Debug)]
2+
#[derive(Clone, PartialEq, Eq, Debug)]
33
pub struct CodeLocation {
44
pub offset: usize,
55

crates/jrsonnet-evaluator/src/val.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -476,43 +476,43 @@ static_assertions::assert_eq_size!(Val, [u8; 32]);
476476
impl Val {
477477
pub const fn as_bool(&self) -> Option<bool> {
478478
match self {
479-
Val::Bool(v) => Some(*v),
479+
Self::Bool(v) => Some(*v),
480480
_ => None,
481481
}
482482
}
483483
pub const fn as_null(&self) -> Option<()> {
484484
match self {
485-
Val::Null => Some(()),
485+
Self::Null => Some(()),
486486
_ => None,
487487
}
488488
}
489489
pub fn as_str(&self) -> Option<IStr> {
490490
match self {
491-
Val::Str(s) => Some(s.clone()),
491+
Self::Str(s) => Some(s.clone()),
492492
_ => None,
493493
}
494494
}
495495
pub const fn as_num(&self) -> Option<f64> {
496496
match self {
497-
Val::Num(n) => Some(*n),
497+
Self::Num(n) => Some(*n),
498498
_ => None,
499499
}
500500
}
501501
pub fn as_arr(&self) -> Option<ArrValue> {
502502
match self {
503-
Val::Arr(a) => Some(a.clone()),
503+
Self::Arr(a) => Some(a.clone()),
504504
_ => None,
505505
}
506506
}
507507
pub fn as_obj(&self) -> Option<ObjValue> {
508508
match self {
509-
Val::Obj(o) => Some(o.clone()),
509+
Self::Obj(o) => Some(o.clone()),
510510
_ => None,
511511
}
512512
}
513513
pub fn as_func(&self) -> Option<FuncVal> {
514514
match self {
515-
Val::Func(f) => Some(f.clone()),
515+
Self::Func(f) => Some(f.clone()),
516516
_ => None,
517517
}
518518
}

crates/jrsonnet-interner/src/inner.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ impl Inner {
157157
pub fn ptr_eq(a: &Self, b: &Self) -> bool {
158158
a.0 == b.0
159159
}
160-
pub fn as_ptr(this: &Self) -> *const u8 {
160+
pub const fn as_ptr(this: &Self) -> *const u8 {
161161
// SAFETY: data is initialized
162162
unsafe { this.0.as_ptr().add(mem::size_of::<InnerHeader>()) }
163163
}

crates/jrsonnet-parser/src/expr.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ pub enum FieldName {
2121
}
2222

2323
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
24-
#[derive(Debug, Clone, Copy, PartialEq, Trace)]
24+
#[derive(Debug, Clone, Copy, PartialEq, Eq, Trace)]
2525
pub enum Visibility {
2626
/// :
2727
Normal,
@@ -60,7 +60,7 @@ pub enum Member {
6060
}
6161

6262
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
63-
#[derive(Debug, Clone, Copy, PartialEq, Trace)]
63+
#[derive(Debug, Clone, Copy, PartialEq, Eq, Trace)]
6464
pub enum UnaryOpType {
6565
Plus,
6666
Minus,
@@ -85,7 +85,7 @@ impl Display for UnaryOpType {
8585
}
8686

8787
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
88-
#[derive(Debug, Clone, Copy, PartialEq, Trace)]
88+
#[derive(Debug, Clone, Copy, PartialEq, Eq, Trace)]
8989
pub enum BinaryOpType {
9090
Mul,
9191
Div,
@@ -179,7 +179,7 @@ impl ArgsDesc {
179179
}
180180

181181
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
182-
#[derive(Debug, Clone, PartialEq, Trace)]
182+
#[derive(Debug, Clone, PartialEq, Eq, Trace)]
183183
pub enum DestructRest {
184184
/// ...rest
185185
Keep(IStr),
@@ -188,7 +188,7 @@ pub enum DestructRest {
188188
}
189189

190190
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
191-
#[derive(Debug, Clone, PartialEq, Trace)]
191+
#[derive(Debug, Clone, PartialEq, Eq, Trace)]
192192
pub enum Destruct {
193193
Full(IStr),
194194
#[cfg(feature = "exp-destruct")]
@@ -263,7 +263,7 @@ pub enum ObjBody {
263263
}
264264

265265
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
266-
#[derive(Debug, PartialEq, Clone, Copy, Trace)]
266+
#[derive(Debug, PartialEq, Eq, Clone, Copy, Trace)]
267267
pub enum LiteralType {
268268
This,
269269
Super,
@@ -357,7 +357,7 @@ pub enum Expr {
357357

358358
/// file, begin offset, end offset
359359
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
360-
#[derive(Clone, PartialEq, Trace)]
360+
#[derive(Clone, PartialEq, Eq, Trace)]
361361
#[skip_trace]
362362
#[repr(C)]
363363
pub struct ExprLocation(pub Source, pub u32, pub u32);

0 commit comments

Comments
 (0)