Merge branch 'macro-use' into HEAD

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

diff --git a/clippy_lints/src/vec.rs b/clippy_lints/src/vec.rs
index d5ed4cb712d5af2c3042d9425dfc001eeb10aed0..a58d73f86daa067d5d14e2a84d0f493844a4060f 100644 (file)
--- a/clippy_lints/src/vec.rs
+++ b/clippy_lints/src/vec.rs
@@ -1,9 +1,11 @@
 use rustc::hir::*;
 use rustc::lint::*;
+use rustc::{declare_lint, lint_array};
+use if_chain::if_chain;
 use rustc::ty::{self, Ty};
 use syntax::codemap::Span;
-use utils::{higher, is_copy, snippet, span_lint_and_sugg};
-use consts::constant;
+use crate::utils::{higher, is_copy, snippet, span_lint_and_sugg};
+use crate::consts::constant;
 
 /// **What it does:** Checks for usage of `&vec![..]` when using `&[..]` would
 /// be possible.
@@ -37,7 +39,7 @@ fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx Expr) {
         if_chain! {
             if let ty::TyRef(_, ty, _) = cx.tables.expr_ty_adjusted(expr).sty;
             if let ty::TySlice(..) = ty.sty;
-            if let ExprAddrOf(_, ref addressee) = expr.node;
+            if let ExprKind::AddrOf(_, ref addressee) = expr.node;
             if let Some(vec_args) = higher::vec_macro(cx, addressee);
             then {
                 check_vec_macro(cx, &vec_args, expr.span);
@@ -66,7 +68,7 @@ fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx Expr) {
 fn check_vec_macro<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, vec_args: &higher::VecArgs<'tcx>, span: Span) {
     let snippet = match *vec_args {
         higher::VecArgs::Repeat(elem, len) => {
-            if constant(cx, len).is_some() {
+            if constant(cx, cx.tables, len).is_some() {
                 format!("&[{}; {}]", snippet(cx, elem.span, "elem"), snippet(cx, len.span, "len"))
             } else {
                 return;