X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=clippy_lints%2Fsrc%2Fneedless_update.rs;h=77483bc128082210d825837a18202feed7be9a4e;hb=e5a5b0a0774625eebbe7b29c67b49dc6431544d1;hp=316395acf263bc69810591f35622c0b19d3301f0;hpb=6feed2713c7740eb5868eba43745bc508b8b77aa;p=rust.git diff --git a/clippy_lints/src/needless_update.rs b/clippy_lints/src/needless_update.rs index 316395acf26..77483bc1280 100644 --- a/clippy_lints/src/needless_update.rs +++ b/clippy_lints/src/needless_update.rs @@ -1,8 +1,9 @@ use crate::utils::span_lint; +use rustc::declare_lint_pass; use rustc::hir::{Expr, ExprKind}; use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::ty; -use rustc::{declare_lint_pass, declare_tool_lint}; +use rustc_session::declare_tool_lint; declare_clippy_lint! { /// **What it does:** Checks for needlessly including a base struct on update @@ -15,11 +16,17 @@ /// /// **Example:** /// ```rust + /// # struct Point { + /// # x: i32, + /// # y: i32, + /// # z: i32, + /// # } + /// # let zero_point = Point { x: 0, y: 0, z: 0 }; /// Point { /// x: 1, - /// y: 0, + /// y: 1, /// ..zero_point - /// } + /// }; /// ``` pub NEEDLESS_UPDATE, complexity, @@ -30,9 +37,9 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for NeedlessUpdate { fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx Expr) { - if let ExprKind::Struct(_, ref fields, Some(ref base)) = expr.node { + if let ExprKind::Struct(_, ref fields, Some(ref base)) = expr.kind { let ty = cx.tables.expr_ty(expr); - if let ty::Adt(def, _) = ty.sty { + if let ty::Adt(def, _) = ty.kind { if fields.len() == def.non_enum_variant().fields.len() { span_lint( cx,