Auto merge of #4809 - iankronquist:patch-1, r=flip1995

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

diff --git a/clippy_lints/src/missing_const_for_fn.rs b/clippy_lints/src/missing_const_for_fn.rs
index d97e3ed880693f41c934f0dca65969eb2b420dbb..dc5a58abe56d01117af2fa5fe327fc6ebaa0fa86 100644 (file)
--- a/clippy_lints/src/missing_const_for_fn.rs
+++ b/clippy_lints/src/missing_const_for_fn.rs
@@ -1,12 +1,13 @@
 use crate::utils::{has_drop, is_entrypoint_fn, span_lint, trait_ref_of_method};
-use rustc::hir;
-use rustc::hir::intravisit::FnKind;
-use rustc::hir::{Body, Constness, FnDecl, HirId, HirVec};
-use rustc::lint::{in_external_macro, LateContext, LateLintPass, LintArray, LintPass};
-use rustc::{declare_lint_pass, declare_tool_lint};
+use rustc::lint::in_external_macro;
+use rustc_hir as hir;
+use rustc_hir::intravisit::FnKind;
+use rustc_hir::{Body, Constness, FnDecl, HirId};
+use rustc_lint::{LateContext, LateLintPass};
 use rustc_mir::transform::qualify_min_const_fn::is_min_const_fn;
+use rustc_session::{declare_lint_pass, declare_tool_lint};
+use rustc_span::Span;
 use rustc_typeck::hir_ty_to_ty;
-use syntax_pos::Span;
 
 declare_clippy_lint! {
     /// **What it does:**
@@ -75,8 +76,8 @@ fn check_fn(
         &mut self,
         cx: &LateContext<'_, '_>,
         kind: FnKind<'_>,
-        _: &FnDecl,
-        _: &Body,
+        _: &FnDecl<'_>,
+        _: &Body<'_>,
         span: Span,
         hir_id: HirId,
     ) {
@@ -97,7 +98,7 @@ fn check_fn(
             FnKind::Method(_, sig, ..) => {
                 if trait_ref_of_method(cx, hir_id).is_some()
                     || already_const(sig.header)
-                    || method_accepts_dropable(cx, &sig.decl.inputs)
+                    || method_accepts_dropable(cx, sig.decl.inputs)
                 {
                     return;
                 }
@@ -108,18 +109,18 @@ fn check_fn(
         let mir = cx.tcx.optimized_mir(def_id);
 
         if let Err((span, err)) = is_min_const_fn(cx.tcx, def_id, &mir) {
-            if cx.tcx.is_min_const_fn(def_id) {
+            if rustc_mir::const_eval::is_min_const_fn(cx.tcx, def_id) {
                 cx.tcx.sess.span_err(span, &err);
             }
         } else {
-            span_lint(cx, MISSING_CONST_FOR_FN, span, "this could be a const_fn");
+            span_lint(cx, MISSING_CONST_FOR_FN, span, "this could be a `const fn`");
         }
     }
 }
 
 /// Returns true if any of the method parameters is a type that implements `Drop`. The method
 /// can't be made const then, because `drop` can't be const-evaluated.
-fn method_accepts_dropable(cx: &LateContext<'_, '_>, param_tys: &HirVec<hir::Ty>) -> bool {
+fn method_accepts_dropable(cx: &LateContext<'_, '_>, param_tys: &[hir::Ty<'_>]) -> bool {
     // If any of the params are dropable, return true
     param_tys.iter().any(|hir_ty| {
         let ty_ty = hir_ty_to_ty(cx.tcx, hir_ty);