Skip to content

Commit 0dff377

Browse files
committed
use in_constant
1 parent 65778fa commit 0dff377

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed

clippy_lints/src/comparison_chain.rs

+3-11
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use clippy_utils::diagnostics::span_lint_and_help;
22
use clippy_utils::ty::implements_trait;
3-
use clippy_utils::{get_trait_def_id, if_sequence, is_else_clause, paths, SpanlessEq};
4-
use rustc_hir::{BinOpKind, Expr, ExprKind, Node};
3+
use clippy_utils::{get_trait_def_id, if_sequence, in_constant, is_else_clause, paths, SpanlessEq};
4+
use rustc_hir::{BinOpKind, Expr, ExprKind};
55
use rustc_lint::{LateContext, LateLintPass};
66
use rustc_session::{declare_lint_pass, declare_tool_lint};
77

@@ -64,7 +64,7 @@ impl<'tcx> LateLintPass<'tcx> for ComparisonChain {
6464
return;
6565
}
6666

67-
if parent_node_is_if_const_fn(cx, expr) {
67+
if in_constant(cx, expr.hir_id) {
6868
return;
6969
}
7070

@@ -127,11 +127,3 @@ impl<'tcx> LateLintPass<'tcx> for ComparisonChain {
127127
fn kind_is_cmp(kind: BinOpKind) -> bool {
128128
matches!(kind, BinOpKind::Lt | BinOpKind::Gt | BinOpKind::Eq)
129129
}
130-
131-
fn parent_node_is_if_const_fn(cx: &LateContext<'_>, expr: &Expr<'_>) -> bool {
132-
match cx.tcx.hir().find(cx.tcx.hir().get_parent_item(expr.hir_id)) {
133-
Some(Node::Item(item)) => rustc_mir::const_eval::is_const_fn(cx.tcx, item.def_id.to_def_id()),
134-
Some(Node::ImplItem(impl_item)) => rustc_mir::const_eval::is_const_fn(cx.tcx, impl_item.def_id.to_def_id()),
135-
_ => false,
136-
}
137-
}

0 commit comments

Comments
 (0)