Merge branch 'macro-use' into HEAD

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

diff --git a/clippy_lints/src/escape.rs b/clippy_lints/src/escape.rs
index 6f073478027ac45ccb1c6aa950073dac1abf5a19..ff5c85b6009e0279a36d77a638ca7f31eba0bf78 100644 (file)
--- a/clippy_lints/src/escape.rs
+++ b/clippy_lints/src/escape.rs
@@ -2,13 +2,15 @@
 use rustc::hir::intravisit as visit;
 use rustc::hir::map::Node::{NodeExpr, NodeStmt};
 use rustc::lint::*;
+use rustc::{declare_lint, lint_array};
 use rustc::middle::expr_use_visitor::*;
-use rustc::middle::mem_categorization::{cmt, Categorization};
-use rustc::ty;
+use rustc::middle::mem_categorization::{cmt_, Categorization};
+use rustc::ty::{self, Ty};
+use rustc::ty::layout::LayoutOf;
 use rustc::util::nodemap::NodeSet;
 use syntax::ast::NodeId;
 use syntax::codemap::Span;
-use utils::span_lint;
+use crate::utils::span_lint;
 
 pub struct Pass {
     pub too_large_for_stack: u64,
@@ -31,20 +33,19 @@ pub struct Pass {
 ///     println!("{}", *x);
 /// }
 /// ```
-declare_lint! {
+declare_clippy_lint! {
     pub BOXED_LOCAL,
-    Warn,
+    perf,
     "using `Box<T>` where unnecessary"
 }
 
-fn is_non_trait_box(ty: ty::Ty) -> bool {
+fn is_non_trait_box(ty: Ty) -> bool {
     ty.is_box() && !ty.boxed_ty().is_trait()
 }
 
 struct EscapeDelegate<'a, 'tcx: 'a> {
+    cx: &'a LateContext<'a, 'tcx>,
     set: NodeSet,
-    tcx: ty::TyCtxt<'a, 'tcx, 'tcx>,
-    param_env: ty::ParamEnv<'tcx>,
     too_large_for_stack: u64,
 }
 
@@ -62,34 +63,31 @@ fn check_fn(
         _: &'tcx FnDecl,
         body: &'tcx Body,
         _: Span,
-        node_id: NodeId
+        node_id: NodeId,
     ) {
         let fn_def_id = cx.tcx.hir.local_def_id(node_id);
-        let param_env = cx.tcx.param_env(fn_def_id).reveal_all();
         let mut v = EscapeDelegate {
+            cx,
             set: NodeSet(),
-            tcx: cx.tcx,
-            param_env: param_env,
             too_large_for_stack: self.too_large_for_stack,
         };
 
-        cx.tcx.infer_ctxt(body.id()).enter(|infcx| {
-            let region_maps = &cx.tcx.region_maps(fn_def_id);
-            let mut vis = ExprUseVisitor::new(&mut v, region_maps, &infcx, param_env);
-            vis.consume_body(body);
-        });
+        let region_scope_tree = &cx.tcx.region_scope_tree(fn_def_id);
+        ExprUseVisitor::new(&mut v, cx.tcx, cx.param_env, region_scope_tree, cx.tables, None).consume_body(body);
 
         for node in v.set {
-            span_lint(cx,
-                      BOXED_LOCAL,
-                      cx.tcx.hir.span(node),
-                      "local variable doesn't need to be boxed here");
+            span_lint(
+                cx,
+                BOXED_LOCAL,
+                cx.tcx.hir.span(node),
+                "local variable doesn't need to be boxed here",
+            );
         }
     }
 }
 
-impl<'a, 'gcx: 'tcx, 'tcx> Delegate<'tcx> for EscapeDelegate<'a, 'gcx> {
-    fn consume(&mut self, _: NodeId, _: Span, cmt: cmt<'tcx>, mode: ConsumeMode) {
+impl<'a, 'tcx> Delegate<'tcx> for EscapeDelegate<'a, 'tcx> {
+    fn consume(&mut self, _: NodeId, _: Span, cmt: &cmt_<'tcx>, mode: ConsumeMode) {
         if let Categorization::Local(lid) = cmt.cat {
             if let Move(DirectRefMove) = mode {
                 // moved out or in. clearly can't be localized
@@ -97,9 +95,9 @@ fn consume(&mut self, _: NodeId, _: Span, cmt: cmt<'tcx>, mode: ConsumeMode) {
             }
         }
     }
-    fn matched_pat(&mut self, _: &Pat, _: cmt<'tcx>, _: MatchMode) {}
-    fn consume_pat(&mut self, consume_pat: &Pat, cmt: cmt<'tcx>, _: ConsumeMode) {
-        let map = &self.tcx.hir;
+    fn matched_pat(&mut self, _: &Pat, _: &cmt_<'tcx>, _: MatchMode) {}
+    fn consume_pat(&mut self, consume_pat: &Pat, cmt: &cmt_<'tcx>, _: ConsumeMode) {
+        let map = &self.cx.tcx.hir;
         if map.is_argument(consume_pat.id) {
             // Skip closure arguments
             if let Some(NodeExpr(..)) = map.find(map.get_parent_node(consume_pat.id)) {
@@ -111,11 +109,12 @@ fn consume_pat(&mut self, consume_pat: &Pat, cmt: cmt<'tcx>, _: ConsumeMode) {
             return;
         }
         if let Categorization::Rvalue(..) = cmt.cat {
-            if let Some(NodeStmt(st)) = map.find(map.get_parent_node(cmt.id)) {
-                if let StmtDecl(ref decl, _) = st.node {
-                    if let DeclLocal(ref loc) = decl.node {
+            let id = map.hir_to_node_id(cmt.hir_id);
+            if let Some(NodeStmt(st)) = map.find(map.get_parent_node(id)) {
+                if let StmtKind::Decl(ref decl, _) = st.node {
+                    if let DeclKind::Local(ref loc) = decl.node {
                         if let Some(ref ex) = loc.init {
-                            if let ExprBox(..) = ex.node {
+                            if let ExprKind::Box(..) = ex.node {
                                 if is_non_trait_box(cmt.ty) && !self.is_large_box(cmt.ty) {
                                     // let x = box (...)
                                     self.set.insert(consume_pat.id);
@@ -137,17 +136,8 @@ fn consume_pat(&mut self, consume_pat: &Pat, cmt: cmt<'tcx>, _: ConsumeMode) {
                 self.set.remove(&lid);
             }
         }
-
     }
-    fn borrow(
-        &mut self,
-        _: NodeId,
-        _: Span,
-        cmt: cmt<'tcx>,
-        _: ty::Region,
-        _: ty::BorrowKind,
-        loan_cause: LoanCause
-    ) {
+    fn borrow(&mut self, _: NodeId, _: Span, cmt: &cmt_<'tcx>, _: ty::Region, _: ty::BorrowKind, loan_cause: LoanCause) {
         if let Categorization::Local(lid) = cmt.cat {
             match loan_cause {
                 // x.foo()
@@ -169,21 +159,17 @@ fn borrow(
         }
     }
     fn decl_without_init(&mut self, _: NodeId, _: Span) {}
-    fn mutate(&mut self, _: NodeId, _: Span, _: cmt<'tcx>, _: MutateMode) {}
+    fn mutate(&mut self, _: NodeId, _: Span, _: &cmt_<'tcx>, _: MutateMode) {}
 }
 
-impl<'a, 'tcx: 'a> EscapeDelegate<'a, 'tcx> {
-    fn is_large_box(&self, ty: ty::Ty) -> bool {
+impl<'a, 'tcx> EscapeDelegate<'a, 'tcx> {
+    fn is_large_box(&self, ty: Ty<'tcx>) -> bool {
         // Large types need to be boxed to avoid stack
         // overflows.
         if ty.is_box() {
-            if let Some(inner) = self.tcx.lift(&ty.boxed_ty()) {
-                if let Ok(layout) = inner.layout(self.tcx, self.param_env) {
-                    return layout.size(self.tcx).bytes() > self.too_large_for_stack;
-                }
-            }
+            self.cx.layout_of(ty.boxed_ty()).ok().map_or(0, |l| l.size.bytes()) > self.too_large_for_stack
+        } else {
+            false
         }
-
-        false
     }
 }