-use rustc::hir::def_id::DefId;
use rustc::hir::intravisit::{walk_expr, NestedVisitorMap, Visitor};
use rustc::hir::*;
use rustc::ty;
use rustc::lint::*;
-use utils::{get_parent_expr, span_lint, span_note_and_lint};
+use rustc::{declare_lint, lint_array};
+use if_chain::if_chain;
+use syntax::ast;
+use crate::utils::{get_parent_expr, span_lint, span_note_and_lint};
/// **What it does:** Checks for a read and a write to the same variable where
/// whether the read occurs before or after the write depends on the evaluation
/// let a = {x = 1; 1} + x;
/// // Unclear whether a is 1 or 2.
/// ```
-declare_lint! {
+declare_clippy_lint! {
pub EVAL_ORDER_DEPENDENCE,
- Warn,
+ complexity,
"whether a variable read occurs before a write depends on sub-expression evaluation order"
}
/// let x = (a, b, c, panic!());
/// // can simply be replaced by `panic!()`
/// ```
-declare_lint! {
+declare_clippy_lint! {
pub DIVERGING_SUB_EXPRESSION,
- Warn,
+ complexity,
"whether an expression contains a diverging sub expression"
}
fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx Expr) {
// Find a write to a local variable.
match expr.node {
- ExprAssign(ref lhs, _) | ExprAssignOp(_, ref lhs, _) => if let ExprPath(ref qpath) = lhs.node {
+ ExprKind::Assign(ref lhs, _) | ExprKind::AssignOp(_, ref lhs, _) => if let ExprKind::Path(ref qpath) = lhs.node {
if let QPath::Resolved(_, ref path) = *qpath {
if path.segments.len() == 1 {
- let var = cx.tables.qpath_def(qpath, lhs.hir_id).def_id();
- let mut visitor = ReadVisitor {
- cx: cx,
- var: var,
- write_expr: expr,
- last_expr: expr,
- };
- check_for_unsequenced_reads(&mut visitor);
+ if let def::Def::Local(var) = cx.tables.qpath_def(qpath, lhs.hir_id) {
+ let mut visitor = ReadVisitor {
+ cx,
+ var,
+ write_expr: expr,
+ last_expr: expr,
+ };
+ check_for_unsequenced_reads(&mut visitor);
+ }
}
}
},
}
fn check_stmt(&mut self, cx: &LateContext<'a, 'tcx>, stmt: &'tcx Stmt) {
match stmt.node {
- StmtExpr(ref e, _) | StmtSemi(ref e, _) => DivergenceVisitor { cx: cx }.maybe_walk_expr(e),
- StmtDecl(ref d, _) => if let DeclLocal(ref local) = d.node {
+ StmtKind::Expr(ref e, _) | StmtKind::Semi(ref e, _) => DivergenceVisitor { cx }.maybe_walk_expr(e),
+ StmtKind::Decl(ref d, _) => if let DeclKind::Local(ref local) = d.node {
if let Local {
init: Some(ref e), ..
} = **local
{
- DivergenceVisitor { cx: cx }.visit_expr(e);
+ DivergenceVisitor { cx }.visit_expr(e);
}
},
}
impl<'a, 'tcx> DivergenceVisitor<'a, 'tcx> {
fn maybe_walk_expr(&mut self, e: &'tcx Expr) {
match e.node {
- ExprClosure(.., _) => {},
- ExprMatch(ref e, ref arms, _) => {
+ ExprKind::Closure(.., _) => {},
+ ExprKind::Match(ref e, ref arms, _) => {
self.visit_expr(e);
for arm in arms {
if let Some(ref guard) = arm.guard {
impl<'a, 'tcx> Visitor<'tcx> for DivergenceVisitor<'a, 'tcx> {
fn visit_expr(&mut self, e: &'tcx Expr) {
match e.node {
- ExprAgain(_) | ExprBreak(_, _) | ExprRet(_) => self.report_diverging_sub_expr(e),
- ExprCall(ref func, _) => {
+ ExprKind::Continue(_) | ExprKind::Break(_, _) | ExprKind::Ret(_) => self.report_diverging_sub_expr(e),
+ ExprKind::Call(ref func, _) => {
let typ = self.cx.tables.expr_ty(func);
match typ.sty {
ty::TyFnDef(..) | ty::TyFnPtr(_) => {
_ => {},
}
},
- ExprMethodCall(..) => {
+ ExprKind::MethodCall(..) => {
let borrowed_table = self.cx.tables;
if borrowed_table.expr_ty(e).is_never() {
self.report_diverging_sub_expr(e);
}
match expr.node {
- ExprArray(_) |
- ExprTup(_) |
- ExprMethodCall(..) |
- ExprCall(_, _) |
- ExprAssign(_, _) |
- ExprIndex(_, _) |
- ExprRepeat(_, _) |
- ExprStruct(_, _, _) => {
+ ExprKind::Array(_) |
+ ExprKind::Tup(_) |
+ ExprKind::MethodCall(..) |
+ ExprKind::Call(_, _) |
+ ExprKind::Assign(_, _) |
+ ExprKind::Index(_, _) |
+ ExprKind::Repeat(_, _) |
+ ExprKind::Struct(_, _, _) => {
walk_expr(vis, expr);
},
- ExprBinary(op, _, _) | ExprAssignOp(op, _, _) => {
- if op.node == BiAnd || op.node == BiOr {
+ ExprKind::Binary(op, _, _) | ExprKind::AssignOp(op, _, _) => {
+ if op.node == BinOpKind::And || op.node == BinOpKind::Or {
// x && y and x || y always evaluate x first, so these are
// strictly sequenced.
} else {
walk_expr(vis, expr);
}
},
- ExprClosure(_, _, _, _, _) => {
+ ExprKind::Closure(_, _, _, _, _) => {
// Either
//
// * `var` is defined in the closure body, in which case we've
fn check_stmt<'a, 'tcx>(vis: &mut ReadVisitor<'a, 'tcx>, stmt: &'tcx Stmt) -> StopEarly {
match stmt.node {
- StmtExpr(ref expr, _) | StmtSemi(ref expr, _) => check_expr(vis, expr),
- StmtDecl(ref decl, _) => {
+ StmtKind::Expr(ref expr, _) | StmtKind::Semi(ref expr, _) => check_expr(vis, expr),
+ StmtKind::Decl(ref decl, _) => {
// If the declaration is of a local variable, check its initializer
// expression if it has one. Otherwise, keep going.
let local = match decl.node {
- DeclLocal(ref local) => Some(local),
+ DeclKind::Local(ref local) => Some(local),
_ => None,
};
local
struct ReadVisitor<'a, 'tcx: 'a> {
cx: &'a LateContext<'a, 'tcx>,
/// The id of the variable we're looking for.
- var: DefId,
+ var: ast::NodeId,
/// The expressions where the write to the variable occurred (for reporting
/// in the lint).
write_expr: &'tcx Expr,
}
match expr.node {
- ExprPath(ref qpath) => {
- if let QPath::Resolved(None, ref path) = *qpath {
- if path.segments.len() == 1 && self.cx.tables.qpath_def(qpath, expr.hir_id).def_id() == self.var {
- if is_in_assignment_position(self.cx, expr) {
- // This is a write, not a read.
- } else {
- span_note_and_lint(
- self.cx,
- EVAL_ORDER_DEPENDENCE,
- expr.span,
- "unsequenced read of a variable",
- self.write_expr.span,
- "whether read occurs before this write depends on evaluation order"
- );
- }
+ ExprKind::Path(ref qpath) => {
+ if_chain! {
+ if let QPath::Resolved(None, ref path) = *qpath;
+ if path.segments.len() == 1;
+ if let def::Def::Local(local_id) = self.cx.tables.qpath_def(qpath, expr.hir_id);
+ if local_id == self.var;
+ // Check that this is a read, not a write.
+ if !is_in_assignment_position(self.cx, expr);
+ then {
+ span_note_and_lint(
+ self.cx,
+ EVAL_ORDER_DEPENDENCE,
+ expr.span,
+ "unsequenced read of a variable",
+ self.write_expr.span,
+ "whether read occurs before this write depends on evaluation order"
+ );
}
}
}
// We're about to descend a closure. Since we don't know when (or
// if) the closure will be evaluated, any reads in it might not
// occur here (or ever). Like above, bail to avoid false positives.
- ExprClosure(_, _, _, _, _) |
+ ExprKind::Closure(_, _, _, _, _) |
// We want to avoid a false positive when a variable name occurs
// only to have its address taken, so we stop here. Technically,
// ```
//
// TODO: fix this
- ExprAddrOf(_, _) => {
+ ExprKind::AddrOf(_, _) => {
return;
}
_ => {}
/// Returns true if `expr` is the LHS of an assignment, like `expr = ...`.
fn is_in_assignment_position(cx: &LateContext, expr: &Expr) -> bool {
if let Some(parent) = get_parent_expr(cx, expr) {
- if let ExprAssign(ref lhs, _) = parent.node {
+ if let ExprKind::Assign(ref lhs, _) = parent.node {
return lhs.id == expr.id;
}
}
projects / rust.git / blobdiff