Auto merge of #3680 - g-bartoszek:needless-bool-else-if-brackets, r=oli-obk

[rust.git] / clippy_lints / src / no_effect.rs

diff --git a/clippy_lints/src/no_effect.rs b/clippy_lints/src/no_effect.rs
index 02ca5ebedfa5b460a9dea30bbe7fa7fb36e47d01..648c198df080ade8ec46275b5c65994ce2575f43 100644 (file)
--- a/clippy_lints/src/no_effect.rs
+++ b/clippy_lints/src/no_effect.rs
@@ -1,12 +1,3 @@
-// Copyright 2014-2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 use crate::utils::{has_drop, in_macro, snippet_opt, span_lint, span_lint_and_sugg};
 use rustc::hir::def::Def;
 use rustc::hir::{BinOpKind, BlockCheckMode, Expr, ExprKind, Stmt, StmtKind, UnsafeSource};
@@ -98,20 +89,6 @@ fn has_no_effect(cx: &LateContext<'_, '_>, expr: &Expr) -> bool {
                     false
                 }
         },
-        ExprKind::Assign(ref left, ref right) => {
-            if has_no_effect(cx, left) {
-                let mut left = left;
-                while let ExprKind::Field(f, _) | ExprKind::Index(f, _) = &left.node {
-                    left = f;
-                }
-                if let ExprKind::Path(qpath) = &left.node {
-                    if let Def::Const(..) = cx.tables.qpath_def(qpath, left.hir_id) {
-                        return has_no_effect(cx, right);
-                    }
-                }
-            }
-            false
-        },
         _ => false,
     }
 }
@@ -127,7 +104,7 @@ fn get_lints(&self) -> LintArray {
 
 impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass {
     fn check_stmt(&mut self, cx: &LateContext<'a, 'tcx>, stmt: &'tcx Stmt) {
-        if let StmtKind::Semi(ref expr, _) = stmt.node {
+        if let StmtKind::Semi(ref expr) = stmt.node {
             if has_no_effect(cx, expr) {
                 span_lint(cx, NO_EFFECT, stmt.span, "statement with no effect");
             } else if let Some(reduced) = reduce_expression(cx, expr) {