nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-28 01:34:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

use if chain

Browse Source
This commit is contained in:
Devin R 2020-04-15 16:22:28 -04:00
parent 4cebe2bf84
commit ae820924c4
2 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
clippy_lints/src/if_let_mutex.rs
View File

@ -1,3 +1,4 @@
use if_chain::if_chain;
use crate::utils::{match_type, paths, span_lint_and_help};
use rustc_hir::intravisit::{self as visit, NestedVisitorMap, Visitor};
use rustc_hir::{Arm, Expr, ExprKind, MatchSource, StmtKind};
@ -42,13 +43,11 @@ declare_lint_pass!(IfLetMutex => [IF_LET_MUTEX]);
impl LateLintPass<'_, '_> for IfLetMutex {
fn check_expr(&mut self, cx: &LateContext<'_, '_>, ex: &'_ Expr<'_>) {
let mut arm_visit = ArmVisitor {
arm_mutex: false,
arm_lock: false,
mutex_lock_called: false,
cx,
};
let mut op_visit = OppVisitor {
op_mutex: false,
op_lock: false,
mutex_lock_called: false,
cx,
};
if let ExprKind::Match(
@ -60,12 +59,12 @@ impl LateLintPass<'_, '_> for IfLetMutex {
) = ex.kind
{
op_visit.visit_expr(op);
if op_visit.op_mutex && op_visit.op_lock {
if op_visit.mutex_lock_called {
for arm in *arms {
arm_visit.visit_arm(arm);
}
if arm_visit.arm_mutex && arm_visit.arm_lock {
if arm_visit.mutex_lock_called {
span_lint_and_help(
cx,
IF_LET_MUTEX,
@ -81,8 +80,7 @@ impl LateLintPass<'_, '_> for IfLetMutex {
/// Checks if `Mutex::lock` is called in the `if let _ = expr.
pub struct OppVisitor<'tcx, 'l> {
pub op_mutex: bool,
pub op_lock: bool,
pub mutex_lock_called: bool,
pub cx: &'tcx LateContext<'tcx, 'l>,
}
@ -90,13 +88,14 @@ impl<'tcx, 'l> Visitor<'tcx> for OppVisitor<'tcx, 'l> {
type Map = Map<'tcx>;
fn visit_expr(&mut self, expr: &'tcx Expr<'_>) {
if let ExprKind::MethodCall(path, _span, args) = &expr.kind {
if path.ident.to_string() == "lock" {
self.op_lock = true;
}
if_chain! {
if let ExprKind::MethodCall(path, _span, args) = &expr.kind;
if path.ident.to_string() == "lock";
let ty = self.cx.tables.expr_ty(&args[0]);
if match_type(self.cx, ty, &paths::MUTEX) {
self.op_mutex = true;
if match_type(self.cx, ty, &paths::MUTEX);
then {
self.mutex_lock_called = true;
return;
}
}
visit::walk_expr(self, expr);
@ -109,8 +108,7 @@ impl<'tcx, 'l> Visitor<'tcx> for OppVisitor<'tcx, 'l> {
/// Checks if `Mutex::lock` is called in any of the branches.
pub struct ArmVisitor<'tcx, 'l> {
pub arm_mutex: bool,
pub arm_lock: bool,
pub mutex_lock_called: bool,
pub cx: &'tcx LateContext<'tcx, 'l>,
}
@ -118,13 +116,14 @@ impl<'tcx, 'l> Visitor<'tcx> for ArmVisitor<'tcx, 'l> {
type Map = Map<'tcx>;
fn visit_expr(&mut self, expr: &'tcx Expr<'_>) {
if let ExprKind::MethodCall(path, _span, args) = &expr.kind {
if path.ident.to_string() == "lock" {
self.arm_lock = true;
}
if_chain! {
if let ExprKind::MethodCall(path, _span, args) = &expr.kind;
if path.ident.to_string() == "lock";
let ty = self.cx.tables.expr_ty(&args[0]);
if match_type(self.cx, ty, &paths::MUTEX) {
self.arm_mutex = true;
if match_type(self.cx, ty, &paths::MUTEX);
then {
self.mutex_lock_called = true;
return;
}
}
visit::walk_expr(self, expr);

4
doc/adding_lints.md
View File

@ -102,8 +102,8 @@ Please note that, we should run `TESTNAME=foo_functions cargo uitest`
every time before running `tests/ui/update-all-references.sh`.
Running `TESTNAME=foo_functions cargo uitest` should pass then. When we commit
our lint, we need to commit the generated `.stderr` files, too. In general you
should only run `tests/ui/update-all-references.sh` for the specific lint you are
creating/editing.
should only commit changed files by `tests/ui/update-all-references.sh` for the
specific lint you are creating/editing.
## Rustfix tests