use rustc::hir::intravisit as visit;
-use rustc::hir::*;
+use rustc::hir::{self, *};
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
use rustc::middle::expr_use_visitor::*;
use rustc::middle::mem_categorization::{cmt_, Categorization};
use rustc::ty::layout::LayoutOf;
use rustc::ty::{self, Ty};
use rustc::util::nodemap::HirIdSet;
-use rustc::{declare_tool_lint, lint_array};
+use rustc::{declare_tool_lint, impl_lint_pass};
use syntax::source_map::Span;
use crate::utils::span_lint;
-pub struct Pass {
+#[derive(Copy, Clone)]
+pub struct BoxedLocal {
pub too_large_for_stack: u64,
}
///
/// **Example:**
/// ```rust
- /// fn main() {
- /// let x = Box::new(1);
- /// foo(*x);
- /// println!("{}", *x);
- /// }
+ /// # fn foo(bar: usize) {}
+ /// let x = Box::new(1);
+ /// foo(*x);
+ /// println!("{}", *x);
/// ```
pub BOXED_LOCAL,
perf,
ty.is_box() && !ty.boxed_ty().is_trait()
}
-struct EscapeDelegate<'a, 'tcx: 'a> {
+struct EscapeDelegate<'a, 'tcx> {
cx: &'a LateContext<'a, 'tcx>,
set: HirIdSet,
too_large_for_stack: u64,
}
-impl LintPass for Pass {
- fn get_lints(&self) -> LintArray {
- lint_array!(BOXED_LOCAL)
- }
+impl_lint_pass!(BoxedLocal => [BOXED_LOCAL]);
- fn name(&self) -> &'static str {
- "BoxedLocal"
- }
-}
-
-impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass {
+impl<'a, 'tcx> LateLintPass<'a, 'tcx> for BoxedLocal {
fn check_fn(
&mut self,
cx: &LateContext<'a, 'tcx>,
) {
// If the method is an impl for a trait, don't warn.
let parent_id = cx.tcx.hir().get_parent_item(hir_id);
- let parent_node = cx.tcx.hir().find_by_hir_id(parent_id);
+ let parent_node = cx.tcx.hir().find(parent_id);
if let Some(Node::Item(item)) = parent_node {
if let ItemKind::Impl(_, _, _, _, Some(..), _, _) = item.node {
too_large_for_stack: self.too_large_for_stack,
};
- let fn_def_id = cx.tcx.hir().local_def_id_from_hir_id(hir_id);
+ let fn_def_id = cx.tcx.hir().local_def_id(hir_id);
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);
+ ExprUseVisitor::new(
+ &mut v,
+ cx.tcx,
+ fn_def_id,
+ 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_by_hir_id(node),
+ cx.tcx.hir().span(node),
"local variable doesn't need to be boxed here",
);
}
}
}
+// TODO: Replace with Map::is_argument(..) when it's fixed
+fn is_argument(map: &hir::map::Map<'_>, id: HirId) -> bool {
+ match map.find(id) {
+ Some(Node::Binding(_)) => (),
+ _ => return false,
+ }
+
+ match map.find(map.get_parent_node(id)) {
+ Some(Node::Param(_)) => true,
+ _ => false,
+ }
+}
+
impl<'a, 'tcx> Delegate<'tcx> for EscapeDelegate<'a, 'tcx> {
fn consume(&mut self, _: HirId, _: Span, cmt: &cmt_<'tcx>, mode: ConsumeMode) {
if let Categorization::Local(lid) = cmt.cat {
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(map.hir_to_node_id(consume_pat.hir_id)) {
+ if is_argument(map, consume_pat.hir_id) {
// Skip closure arguments
- if let Some(Node::Expr(..)) = map.find_by_hir_id(map.get_parent_node_by_hir_id(consume_pat.hir_id)) {
+ let parent_id = map.get_parent_node(consume_pat.hir_id);
+ if let Some(Node::Expr(..)) = map.find(map.get_parent_node(parent_id)) {
return;
}
+
if is_non_trait_box(cmt.ty) && !self.is_large_box(cmt.ty) {
self.set.insert(consume_pat.hir_id);
}
return;
}
if let Categorization::Rvalue(..) = cmt.cat {
- if let Some(Node::Stmt(st)) = map.find_by_hir_id(map.get_parent_node_by_hir_id(cmt.hir_id)) {
+ if let Some(Node::Stmt(st)) = map.find(map.get_parent_node(cmt.hir_id)) {
if let StmtKind::Local(ref loc) = st.node {
if let Some(ref ex) = loc.init {
if let ExprKind::Box(..) = ex.node {