use crate::consts::{constant_simple, Constant};
-use crate::utils::{paths, span_lint};
+use crate::utils::{match_def_path, paths, span_lint};
use rustc::hir::*;
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
-use rustc::{declare_tool_lint, lint_array};
+use rustc::{declare_lint_pass, declare_tool_lint};
use std::cmp::Ordering;
declare_clippy_lint! {
"`min(_, max(_, _))` (or vice versa) with bounds clamping the result to a constant"
}
-pub struct MinMaxPass;
-
-impl LintPass for MinMaxPass {
- fn get_lints(&self) -> LintArray {
- lint_array!(MIN_MAX)
- }
-
- fn name(&self) -> &'static str {
- "MinMax"
- }
-}
+declare_lint_pass!(MinMaxPass => [MIN_MAX]);
impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MinMaxPass {
fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx Expr) {
fn min_max<'a>(cx: &LateContext<'_, '_>, expr: &'a Expr) -> Option<(MinMax, Constant, &'a Expr)> {
if let ExprKind::Call(ref path, ref args) = expr.node {
if let ExprKind::Path(ref qpath) = path.node {
- cx.tables.qpath_def(qpath, path.hir_id).opt_def_id().and_then(|def_id| {
- if cx.match_def_path(def_id, &paths::CMP_MIN) {
+ cx.tables.qpath_res(qpath, path.hir_id).opt_def_id().and_then(|def_id| {
+ if match_def_path(cx, def_id, &paths::CMP_MIN) {
fetch_const(cx, args, MinMax::Min)
- } else if cx.match_def_path(def_id, &paths::CMP_MAX) {
+ } else if match_def_path(cx, def_id, &paths::CMP_MAX) {
fetch_const(cx, args, MinMax::Max)
} else {
None