rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

RustFmt changes

Browse Source
This commit is contained in:
Zaki Manian
2017-09-02 21:33:26 -07:00
parent 27e55c96ce
commit 93e78c81a1
1 changed files with 53 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
clippy_lints/src/is_unit_expr.rs
View File

@@ -8,14 +8,17 @@ use syntax::ext::quote::rt::Span;
/// - () being assigned to a variable /// - () being assigned to a variable
/// - () being passed to a function /// - () being passed to a function
/// ///
/// **Why is this bad?** It is extremely unlikely that a user intended to assign '()' to valiable. Instead, /// **Why is this bad?** It is extremely unlikely that a user intended to
/// Unit is what a block evaluates to when it returns nothing. This is typically caused by a trailing /// assign '()' to valiable. Instead,
/// Unit is what a block evaluates to when it returns nothing. This is
/// typically caused by a trailing
/// unintended semicolon. /// unintended semicolon.
/// ///
/// **Known problems:** None. /// **Known problems:** None.
/// ///
/// **Example:** /// **Example:**
/// * `let x = {"foo" ;}` when the user almost certainly intended `let x ={"foo"}` /// * `let x = {"foo" ;}` when the user almost certainly intended `let x
/// ={"foo"}`
declare_lint! { declare_lint! {
pub UNIT_EXPR, pub UNIT_EXPR,
@@ -57,7 +60,9 @@ impl EarlyLintPass for UnitExpr {
fn check_stmt(&mut self, cx: &EarlyContext, stmt: &Stmt) { fn check_stmt(&mut self, cx: &EarlyContext, stmt: &Stmt) {
if let StmtKind::Local(ref local) = stmt.node { if let StmtKind::Local(ref local) = stmt.node {
if local.pat.node == PatKind::Wild {return;} if local.pat.node == PatKind::Wild {
return;
}
if let Some(ref expr) = local.init { if let Some(ref expr) = local.init {
if let Some(span) = is_unit_expr(expr) { if let Some(span) = is_unit_expr(expr) {
cx.span_lint(UNIT_EXPR, span, "Consider removing the trailing semicolon"); cx.span_lint(UNIT_EXPR, span, "Consider removing the trailing semicolon");
@@ -68,12 +73,10 @@ impl EarlyLintPass for UnitExpr {
} }
fn is_unit_expr(expr: &Expr) -> Option<Span> { fn is_unit_expr(expr: &Expr) -> Option<Span> {
match expr.node { match expr.node {
ExprKind::Block(ref block) => { ExprKind::Block(ref block) => if check_last_stmt_in_block(block) {
if check_last_stmt_in_block(block){
return Some(block.stmts[block.stmts.len() - 1].span.clone()); return Some(block.stmts[block.stmts.len() - 1].span.clone());
} else { } else {
return None; return None;
}
}, },
ExprKind::If(_, ref then, ref else_) => { ExprKind::If(_, ref then, ref else_) => {
let check_then = check_last_stmt_in_block(then); let check_then = check_last_stmt_in_block(then);
@@ -87,7 +90,6 @@ fn is_unit_expr(expr: &Expr)->Option<Span>{
} }
if check_then { if check_then {
return Some(expr.span.clone()); return Some(expr.span.clone());
} else { } else {
return Some(expr.span.clone()); return Some(expr.span.clone());
} }
@@ -99,7 +101,7 @@ fn is_unit_expr(expr: &Expr)->Option<Span>{
} }
} }
return None; return None;
} },
_ => return None, _ => return None,
} }
} }
@@ -108,8 +110,7 @@ fn check_last_stmt_in_block(block: &Block)->bool{
let ref final_stmt = &block.stmts[block.stmts.len() - 1]; let ref final_stmt = &block.stmts[block.stmts.len() - 1];
if let StmtKind::Expr(_) = final_stmt.node { if let StmtKind::Expr(_) = final_stmt.node {
return false; return false;
} } else {
else{
return true; return true;
} }
} }