rustup https://github.com/rust-lang/rust/pull/67455

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

diff --git a/clippy_lints/src/needless_update.rs b/clippy_lints/src/needless_update.rs
index 2ce9bf78aa6c40248a3774afcf5bfdbc6e76ed6d..77483bc128082210d825837a18202feed7be9a4e 100644 (file)
--- 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_tool_lint, lint_array};
+use rustc_session::declare_tool_lint;
 
 declare_clippy_lint! {
     /// **What it does:** Checks for needlessly including a base struct on update
@@ -15,35 +16,30 @@
     ///
     /// **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,
     "using `Foo { ..base }` when there are no missing fields"
 }
 
-#[derive(Copy, Clone)]
-pub struct Pass;
+declare_lint_pass!(NeedlessUpdate => [NEEDLESS_UPDATE]);
 
-impl LintPass for Pass {
-    fn get_lints(&self) -> LintArray {
-        lint_array!(NEEDLESS_UPDATE)
-    }
-
-    fn name(&self) -> &'static str {
-        "NeedUpdate"
-    }
-}
-
-impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass {
+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,