check the def_id with using diagnostic_item in unnecessary_min_or_max lint
https://github.com/rust-lang/rust-clippy/issues/13191
This commit is contained in:
parent
b1e87922c1
commit
c2ed04be16
@ -1,16 +1,15 @@
|
|||||||
use std::cmp::Ordering;
|
use std::cmp::Ordering;
|
||||||
|
|
||||||
use super::UNNECESSARY_MIN_OR_MAX;
|
use super::UNNECESSARY_MIN_OR_MAX;
|
||||||
use clippy_utils::diagnostics::span_lint_and_sugg;
|
|
||||||
|
|
||||||
use clippy_utils::consts::{ConstEvalCtxt, Constant, ConstantSource, FullInt};
|
use clippy_utils::consts::{ConstEvalCtxt, Constant, ConstantSource, FullInt};
|
||||||
|
use clippy_utils::diagnostics::span_lint_and_sugg;
|
||||||
use clippy_utils::source::snippet;
|
use clippy_utils::source::snippet;
|
||||||
|
|
||||||
use rustc_errors::Applicability;
|
use rustc_errors::Applicability;
|
||||||
use rustc_hir::Expr;
|
use rustc_hir::Expr;
|
||||||
use rustc_lint::LateContext;
|
use rustc_lint::LateContext;
|
||||||
use rustc_middle::ty;
|
use rustc_middle::ty;
|
||||||
use rustc_span::Span;
|
use rustc_span::{sym, Span};
|
||||||
|
|
||||||
pub(super) fn check<'tcx>(
|
pub(super) fn check<'tcx>(
|
||||||
cx: &LateContext<'tcx>,
|
cx: &LateContext<'tcx>,
|
||||||
@ -21,26 +20,30 @@ pub(super) fn check<'tcx>(
|
|||||||
) {
|
) {
|
||||||
let typeck_results = cx.typeck_results();
|
let typeck_results = cx.typeck_results();
|
||||||
let ecx = ConstEvalCtxt::with_env(cx.tcx, cx.param_env, typeck_results);
|
let ecx = ConstEvalCtxt::with_env(cx.tcx, cx.param_env, typeck_results);
|
||||||
if let Some((left, ConstantSource::Local | ConstantSource::CoreConstant)) = ecx.eval_with_source(recv)
|
if let Some(id) = typeck_results.type_dependent_def_id(expr.hir_id)
|
||||||
&& let Some((right, ConstantSource::Local | ConstantSource::CoreConstant)) = ecx.eval_with_source(arg)
|
&& (cx.tcx.is_diagnostic_item(sym::cmp_ord_min, id) || cx.tcx.is_diagnostic_item(sym::cmp_ord_max, id))
|
||||||
{
|
{
|
||||||
let Some(ord) = Constant::partial_cmp(cx.tcx, typeck_results.expr_ty(recv), &left, &right) else {
|
if let Some((left, ConstantSource::Local | ConstantSource::CoreConstant)) = ecx.eval_with_source(recv)
|
||||||
return;
|
&& let Some((right, ConstantSource::Local | ConstantSource::CoreConstant)) = ecx.eval_with_source(arg)
|
||||||
};
|
{
|
||||||
|
let Some(ord) = Constant::partial_cmp(cx.tcx, typeck_results.expr_ty(recv), &left, &right) else {
|
||||||
|
return;
|
||||||
|
};
|
||||||
|
|
||||||
lint(cx, expr, name, recv.span, arg.span, ord);
|
lint(cx, expr, name, recv.span, arg.span, ord);
|
||||||
} else if let Some(extrema) = detect_extrema(cx, recv) {
|
} else if let Some(extrema) = detect_extrema(cx, recv) {
|
||||||
let ord = match extrema {
|
let ord = match extrema {
|
||||||
Extrema::Minimum => Ordering::Less,
|
Extrema::Minimum => Ordering::Less,
|
||||||
Extrema::Maximum => Ordering::Greater,
|
Extrema::Maximum => Ordering::Greater,
|
||||||
};
|
};
|
||||||
lint(cx, expr, name, recv.span, arg.span, ord);
|
lint(cx, expr, name, recv.span, arg.span, ord);
|
||||||
} else if let Some(extrema) = detect_extrema(cx, arg) {
|
} else if let Some(extrema) = detect_extrema(cx, arg) {
|
||||||
let ord = match extrema {
|
let ord = match extrema {
|
||||||
Extrema::Minimum => Ordering::Greater,
|
Extrema::Minimum => Ordering::Greater,
|
||||||
Extrema::Maximum => Ordering::Less,
|
Extrema::Maximum => Ordering::Less,
|
||||||
};
|
};
|
||||||
lint(cx, expr, name, recv.span, arg.span, ord);
|
lint(cx, expr, name, recv.span, arg.span, ord);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -65,3 +65,32 @@ fn random_u32() -> u32 {
|
|||||||
// random number generator
|
// random number generator
|
||||||
0
|
0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
struct Issue13191 {
|
||||||
|
min: u16,
|
||||||
|
max: u16,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Issue13191 {
|
||||||
|
fn new() -> Self {
|
||||||
|
Self { min: 0, max: 0 }
|
||||||
|
}
|
||||||
|
|
||||||
|
fn min(mut self, value: u16) -> Self {
|
||||||
|
self.min = value;
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
fn max(mut self, value: u16) -> Self {
|
||||||
|
self.max = value;
|
||||||
|
self
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn issue_13191() {
|
||||||
|
// should not fixed
|
||||||
|
Issue13191::new().min(0);
|
||||||
|
|
||||||
|
// should not fixed
|
||||||
|
Issue13191::new().max(0);
|
||||||
|
}
|
||||||
|
@ -65,3 +65,32 @@ fn random_u32() -> u32 {
|
|||||||
// random number generator
|
// random number generator
|
||||||
0
|
0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
struct Issue13191 {
|
||||||
|
min: u16,
|
||||||
|
max: u16,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Issue13191 {
|
||||||
|
fn new() -> Self {
|
||||||
|
Self { min: 0, max: 0 }
|
||||||
|
}
|
||||||
|
|
||||||
|
fn min(mut self, value: u16) -> Self {
|
||||||
|
self.min = value;
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
fn max(mut self, value: u16) -> Self {
|
||||||
|
self.max = value;
|
||||||
|
self
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn issue_13191() {
|
||||||
|
// should not fixed
|
||||||
|
Issue13191::new().min(0);
|
||||||
|
|
||||||
|
// should not fixed
|
||||||
|
Issue13191::new().max(0);
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user