-use rustc::hir;
-use rustc::hir::intravisit::FnKind;
-use rustc::hir::{Body, Constness, FnDecl};
-// use rustc::mir::*;
-use crate::utils::{is_entrypoint_fn, span_lint};
-use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
-use rustc::{declare_tool_lint, lint_array};
+use crate::utils::{has_drop, is_entrypoint_fn, span_lint, trait_ref_of_method};
+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 syntax::ast::{Attribute, NodeId};
-use syntax_pos::Span;
+use rustc_session::{declare_lint_pass, declare_tool_lint};
+use rustc_span::Span;
+use rustc_typeck::hir_ty_to_ty;
-/// **What it does:**
-///
-/// Suggests the use of `const` in functions and methods where possible
-///
-/// **Why is this bad?**
-/// Not using `const` is a missed optimization. Instead of having the function execute at runtime,
-/// when using `const`, it's evaluated at compiletime.
-///
-/// **Known problems:**
-///
-/// Const functions are currently still being worked on, with some features only being available
-/// on nightly. This lint does not consider all edge cases currently and the suggestions may be
-/// incorrect if you are using this lint on stable.
-///
-/// Also, the lint only runs one pass over the code. Consider these two non-const functions:
-///
-/// ```rust
-/// fn a() -> i32 {
-/// 0
-/// }
-/// fn b() -> i32 {
-/// a()
-/// }
-/// ```
-///
-/// When running Clippy, the lint will only suggest to make `a` const, because `b` at this time
-/// can't be const as it calls a non-const function. Making `a` const and running Clippy again,
-/// will suggest to make `b` const, too.
-///
-/// **Example:**
-///
-/// ```rust
-/// fn new() -> Self {
-/// Self { random_number: 42 }
-/// }
-/// ```
-///
-/// Could be a const fn:
-///
-/// ```rust
-/// const fn new() -> Self {
-/// Self { random_number: 42 }
-/// }
-/// ```
declare_clippy_lint! {
+ /// **What it does:**
+ ///
+ /// Suggests the use of `const` in functions and methods where possible.
+ ///
+ /// **Why is this bad?**
+ ///
+ /// Not having the function const prevents callers of the function from being const as well.
+ ///
+ /// **Known problems:**
+ ///
+ /// Const functions are currently still being worked on, with some features only being available
+ /// on nightly. This lint does not consider all edge cases currently and the suggestions may be
+ /// incorrect if you are using this lint on stable.
+ ///
+ /// Also, the lint only runs one pass over the code. Consider these two non-const functions:
+ ///
+ /// ```rust
+ /// fn a() -> i32 {
+ /// 0
+ /// }
+ /// fn b() -> i32 {
+ /// a()
+ /// }
+ /// ```
+ ///
+ /// When running Clippy, the lint will only suggest to make `a` const, because `b` at this time
+ /// can't be const as it calls a non-const function. Making `a` const and running Clippy again,
+ /// will suggest to make `b` const, too.
+ ///
+ /// **Example:**
+ ///
+ /// ```rust
+ /// # struct Foo {
+ /// # random_number: usize,
+ /// # }
+ /// # impl Foo {
+ /// fn new() -> Self {
+ /// Self { random_number: 42 }
+ /// }
+ /// # }
+ /// ```
+ ///
+ /// Could be a const fn:
+ ///
+ /// ```rust
+ /// # struct Foo {
+ /// # random_number: usize,
+ /// # }
+ /// # impl Foo {
+ /// const fn new() -> Self {
+ /// Self { random_number: 42 }
+ /// }
+ /// # }
+ /// ```
pub MISSING_CONST_FOR_FN,
nursery,
"Lint functions definitions that could be made `const fn`"
}
-#[derive(Clone)]
-pub struct MissingConstForFn;
-
-impl LintPass for MissingConstForFn {
- fn get_lints(&self) -> LintArray {
- lint_array!(MISSING_CONST_FOR_FN)
- }
-
- fn name(&self) -> &'static str {
- "MissingConstForFn"
- }
-}
+declare_lint_pass!(MissingConstForFn => [MISSING_CONST_FOR_FN]);
impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MissingConstForFn {
fn check_fn(
&mut self,
cx: &LateContext<'_, '_>,
kind: FnKind<'_>,
- _: &FnDecl,
- _: &Body,
+ _: &FnDecl<'_>,
+ _: &Body<'_>,
span: Span,
- node_id: NodeId,
+ hir_id: HirId,
) {
+ let def_id = cx.tcx.hir().local_def_id(hir_id);
+
+ if in_external_macro(cx.tcx.sess, span) || is_entrypoint_fn(cx, def_id) {
+ return;
+ }
+
// Perform some preliminary checks that rule out constness on the Clippy side. This way we
// can skip the actual const check and return early.
match kind {
- FnKind::ItemFn(name, _generics, header, _vis, attrs) => {
- if !can_be_const_fn(&name.as_str(), header, attrs) {
+ FnKind::ItemFn(_, _, header, ..) => {
+ if already_const(header) {
return;
}
},
- FnKind::Method(ident, sig, _vis, attrs) => {
- let header = sig.header;
- let name = ident.name.as_str();
- if !can_be_const_fn(&name, header, attrs) {
+ FnKind::Method(_, sig, ..) => {
+ if trait_ref_of_method(cx, hir_id).is_some()
+ || already_const(sig.header)
+ || method_accepts_dropable(cx, sig.decl.inputs)
+ {
return;
}
},
_ => return,
}
- let def_id = cx.tcx.hir().local_def_id(node_id);
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`");
}
}
}
-fn can_be_const_fn(name: &str, header: hir::FnHeader, attrs: &[Attribute]) -> bool {
- // Main and custom entrypoints can't be `const`
- if is_entrypoint_fn(name, attrs) {
- return false;
- }
+/// 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: &[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);
+ has_drop(cx, ty_ty)
+ })
+}
- // We don't have to lint on something that's already `const`
- if header.constness == Constness::Const {
- return false;
- }
- true
+// We don't have to lint on something that's already `const`
+#[must_use]
+fn already_const(header: hir::FnHeader) -> bool {
+ header.constness == Constness::Const
}
projects / rust.git / blobdiff