diff options
author | Akshay <[email protected]> | 2022-01-29 11:01:20 +0000 |
---|---|---|
committer | Akshay <[email protected]> | 2022-01-29 11:01:20 +0000 |
commit | df29effd59bb8971395419b79e8c0e51f373d4fb (patch) | |
tree | 1d1fd9c1fdbb68260a7de24c2a799541f3ad1e24 /lib/src | |
parent | 8e4eeb979ebaa8f0f461e66d986a75c3a80220b6 (diff) |
bump rnix to latest master, support nix 2.5 syntax
Diffstat (limited to 'lib/src')
-rw-r--r-- | lib/src/lints/bool_comparison.rs | 5 | ||||
-rw-r--r-- | lib/src/lints/empty_pattern.rs | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/src/lints/bool_comparison.rs b/lib/src/lints/bool_comparison.rs index ef7f5d2..5402f31 100644 --- a/lib/src/lints/bool_comparison.rs +++ b/lib/src/lints/bool_comparison.rs | |||
@@ -41,8 +41,9 @@ impl Rule for BoolComparison { | |||
41 | if let Some(bin_expr) = BinOp::cast(node.clone()); | 41 | if let Some(bin_expr) = BinOp::cast(node.clone()); |
42 | if let Some(lhs) = bin_expr.lhs(); | 42 | if let Some(lhs) = bin_expr.lhs(); |
43 | if let Some(rhs) = bin_expr.rhs(); | 43 | if let Some(rhs) = bin_expr.rhs(); |
44 | if let Some(op) = bin_expr.operator(); | ||
44 | 45 | ||
45 | if let op@(BinOpKind::Equal | BinOpKind::NotEqual) = bin_expr.operator(); | 46 | if let BinOpKind::Equal | BinOpKind::NotEqual = op; |
46 | let (non_bool_side, bool_side) = if boolean_ident(&lhs).is_some() { | 47 | let (non_bool_side, bool_side) = if boolean_ident(&lhs).is_some() { |
47 | (rhs, lhs) | 48 | (rhs, lhs) |
48 | } else if boolean_ident(&rhs).is_some() { | 49 | } else if boolean_ident(&rhs).is_some() { |
@@ -70,7 +71,7 @@ impl Rule for BoolComparison { | |||
70 | SyntaxKind::NODE_BIN_OP => { | 71 | SyntaxKind::NODE_BIN_OP => { |
71 | let inner = BinOp::cast(non_bool_side.clone()).unwrap(); | 72 | let inner = BinOp::cast(non_bool_side.clone()).unwrap(); |
72 | // `!a ? b`, no paren required | 73 | // `!a ? b`, no paren required |
73 | if inner.operator() == BinOpKind::IsSet { | 74 | if inner.operator()? == BinOpKind::IsSet { |
74 | make::unary_not(&non_bool_side).node().clone() | 75 | make::unary_not(&non_bool_side).node().clone() |
75 | } else { | 76 | } else { |
76 | let parens = make::parenthesize(&non_bool_side); | 77 | let parens = make::parenthesize(&non_bool_side); |
diff --git a/lib/src/lints/empty_pattern.rs b/lib/src/lints/empty_pattern.rs index b399ba2..14c3b5e 100644 --- a/lib/src/lints/empty_pattern.rs +++ b/lib/src/lints/empty_pattern.rs | |||
@@ -49,6 +49,7 @@ impl Rule for EmptyPattern { | |||
49 | if let Some(body) = lambda_expr.body(); | 49 | if let Some(body) = lambda_expr.body(); |
50 | 50 | ||
51 | if let Some(pattern) = Pattern::cast(arg.clone()); | 51 | if let Some(pattern) = Pattern::cast(arg.clone()); |
52 | |||
52 | // no patterns within `{ }` | 53 | // no patterns within `{ }` |
53 | if pattern.entries().count() == 0; | 54 | if pattern.entries().count() == 0; |
54 | // pattern is not bound | 55 | // pattern is not bound |