Merge pull request #3465 from flip1995/rustfmt

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

diff --git a/clippy_lints/src/drop_forget_ref.rs b/clippy_lints/src/drop_forget_ref.rs
index eb271a899c4735af8608864f7c3f10afa140f08f..a9741c7a2ddc60abeefd74518cd5a6874171c849 100644 (file)
--- a/clippy_lints/src/drop_forget_ref.rs
+++ b/clippy_lints/src/drop_forget_ref.rs
@@ -1,7 +1,18 @@
-use rustc::lint::*;
-use rustc::ty;
-use rustc::hir::*;
+// Copyright 2014-2018 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use crate::rustc::hir::*;
+use crate::rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
+use crate::rustc::ty;
+use crate::rustc::{declare_tool_lint, lint_array};
 use crate::utils::{is_copy, match_def_path, opt_def_id, paths, span_note_and_lint};
+use if_chain::if_chain;
 
 /// **What it does:** Checks for calls to `std::mem::drop` with a reference
 /// instead of an owned value.
@@ -58,9 +69,9 @@
 ///
 /// **Example:**
 /// ```rust
-/// let x:i32 = 42;   // i32 implements Copy
+/// let x: i32 = 42; // i32 implements Copy
 /// std::mem::drop(x) // A copy of x is passed to the function, leaving the
-/// // original unaffected
+///                   // original unaffected
 /// ```
 declare_clippy_lint! {
     pub DROP_COPY,
@@ -85,9 +96,9 @@
 ///
 /// **Example:**
 /// ```rust
-/// let x:i32 = 42;     // i32 implements Copy
+/// let x: i32 = 42; // i32 implements Copy
 /// std::mem::forget(x) // A copy of x is passed to the function, leaving the
-/// // original unaffected
+///                     // original unaffected
 /// ```
 declare_clippy_lint! {
     pub FORGET_COPY,
@@ -104,7 +115,6 @@
 const FORGET_COPY_SUMMARY: &str = "calls to `std::mem::forget` with a value that implements Copy. \
                                    Forgetting a copy leaves the original intact.";
 
-#[allow(missing_copy_implementations)]
 pub struct Pass;
 
 impl LintPass for Pass {
@@ -116,8 +126,8 @@ fn get_lints(&self) -> LintArray {
 impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass {
     fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx Expr) {
         if_chain! {
-            if let ExprCall(ref path, ref args) = expr.node;
-            if let ExprPath(ref qpath) = path.node;
+            if let ExprKind::Call(ref path, ref args) = expr.node;
+            if let ExprKind::Path(ref qpath) = path.node;
             if args.len() == 1;
             if let Some(def_id) = opt_def_id(cx.tables.qpath_def(qpath, path.hir_id));
             then {
@@ -126,7 +136,7 @@ fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx Expr) {
                 let arg = &args[0];
                 let arg_ty = cx.tables.expr_ty(arg);
 
-                if let ty::TyRef(..) = arg_ty.sty {
+                if let ty::Ref(..) = arg_ty.sty {
                     if match_def_path(cx.tcx, def_id, &paths::DROP) {
                         lint = DROP_REF;
                         msg = DROP_REF_SUMMARY.to_string();