Skip to content

Commit c535b2e

Browse files
JarchoJarcho
committed
Use eval_local in more places.
1 parent e0ce9f0 commit c535b2e

29 files changed

+130
-334
lines changed

‎clippy_lints/src/floating_point_arithmetic.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ declare_lint_pass!(FloatingPointArithmetic => [
111111

112112
// Returns the specialized log method for a given base if base is constant
113113
// and is one of 2, 10 and e
114-
fn get_specialized_log_method(cx: &LateContext<'_>, base: &Expr<'_>) -> Option<&'static str> {
115-
if let Some(value) = ConstEvalCtxt::new(cx).eval(base) {
114+
fn get_specialized_log_method(cx: &LateContext<'_>, base: &Expr<'_>, ctxt: SyntaxContext) -> Option<&'static str> {
115+
if let Some(value) = ConstEvalCtxt::new(cx).eval_local(base, ctxt) {
116116
if F32(2.0) == value || F64(2.0) == value {
117117
return Some("log2");
118118
} else if F32(10.0) == value || F64(10.0) == value {
@@ -158,7 +158,7 @@ fn prepare_receiver_sugg<'a>(cx: &LateContext<'_>, mut expr: &'a Expr<'a>) -> Su
158158
}
159159

160160
fn check_log_base(cx: &LateContext<'_>, expr: &Expr<'_>, receiver: &Expr<'_>, args: &[Expr<'_>]) {
161-
if let Some(method) = get_specialized_log_method(cx, &args[0]) {
161+
if let Some(method) = get_specialized_log_method(cx, &args[0], expr.span.ctxt()) {
162162
span_lint_and_sugg(
163163
cx,
164164
SUBOPTIMAL_FLOPS,

‎clippy_lints/src/implicit_saturating_add.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,11 @@ fn get_int_max(ty: Ty<'_>) -> Option<u128> {
117117
fn get_const<'tcx>(cx: &LateContext<'tcx>, expr: &Expr<'tcx>) -> Option<(u128, BinOpKind, &'tcx Expr<'tcx>)> {
118118
if let ExprKind::Binary(op, l, r) = expr.kind {
119119
let ecx = ConstEvalCtxt::new(cx);
120-
if let Some(Constant::Int(c)) = ecx.eval(r) {
120+
let ctxt = expr.span.ctxt();
121+
if let Some(Constant::Int(c)) = ecx.eval_local(r, ctxt) {
121122
return Some((c, op.node, l));
122123
}
123-
if let Some(Constant::Int(c)) = ecx.eval(l) {
124+
if let Some(Constant::Int(c)) = ecx.eval_local(l, ctxt) {
124125
return Some((c, invert_op(op.node)?, r));
125126
}
126127
}

‎clippy_lints/src/manual_float_methods.rs‎

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use clippy_config::Conf;
2-
use clippy_utils::consts::{ConstEvalCtxt, Constant};
2+
use clippy_utils::consts::ConstEvalCtxt;
33
use clippy_utils::diagnostics::span_lint_and_then;
44
use clippy_utils::msrvs::{self, Msrv};
55
use clippy_utils::source::SpanRangeExt;
@@ -146,13 +146,14 @@ impl<'tcx> LateLintPass<'tcx> for ManualFloatMethods {
146146
)
147147
&& let [first, second, const_1, const_2] = exprs
148148
&& let ecx = ConstEvalCtxt::new(cx)
149-
&& let Some(const_1) = ecx.eval(const_1)
150-
&& let Some(const_2) = ecx.eval(const_2)
149+
&& let ctxt = expr.span.ctxt()
150+
&& let Some(const_1) = ecx.eval_local(const_1, ctxt)
151+
&& let Some(const_2) = ecx.eval_local(const_2, ctxt)
151152
&& path_to_local(first).is_some_and(|f| path_to_local(second).is_some_and(|s| f == s))
152153
// The actual infinity check, we also allow `NEG_INFINITY` before` INFINITY` just in
153154
// case somebody does that for some reason
154-
&& (is_infinity(&const_1) && is_neg_infinity(&const_2)
155-
|| is_neg_infinity(&const_1) && is_infinity(&const_2))
155+
&& (const_1.is_pos_infinity() && const_2.is_neg_infinity()
156+
|| const_1.is_neg_infinity() && const_2.is_pos_infinity())
156157
&& let Some(local_snippet) = first.span.get_source_text(cx)
157158
{
158159
let variant = match (kind.node, lhs_kind.node, rhs_kind.node) {
@@ -201,21 +202,3 @@ impl<'tcx> LateLintPass<'tcx> for ManualFloatMethods {
201202
}
202203
}
203204
}
204-
205-
fn is_infinity(constant: &Constant) -> bool {
206-
match constant {
207-
// FIXME(f16_f128): add f16 and f128 when constants are available
208-
Constant::F32(float) => *float == f32::INFINITY,
209-
Constant::F64(float) => *float == f64::INFINITY,
210-
_ => false,
211-
}
212-
}
213-
214-
fn is_neg_infinity(constant: &Constant) -> bool {
215-
match constant {
216-
// FIXME(f16_f128): add f16 and f128 when constants are available
217-
Constant::F32(float) => *float == f32::NEG_INFINITY,
218-
Constant::F64(float) => *float == f64::NEG_INFINITY,
219-
_ => false,
220-
}
221-
}

‎clippy_lints/src/manual_rotate.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ fn parse_shift<'tcx>(
6666
BinOpKind::Shr => ShiftDirection::Right,
6767
_ => return None,
6868
};
69-
let const_expr = ConstEvalCtxt::new(cx).eval(r)?;
69+
let const_expr = ConstEvalCtxt::new(cx).eval_local(r, expr.span.ctxt())?;
7070
if let Constant::Int(shift) = const_expr {
7171
return Some((dir, shift, l));
7272
}

‎clippy_lints/src/manual_strip.rs‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use rustc_lint::{LateContext, LateLintPass, LintContext as _};
1616
use rustc_middle::ty;
1717
use rustc_session::impl_lint_pass;
1818
use rustc_span::source_map::Spanned;
19-
use rustc_span::{Symbol, sym};
19+
use rustc_span::{Symbol, SyntaxContext, sym};
2020
use std::iter;
2121

2222
declare_clippy_lint! {
@@ -92,7 +92,7 @@ impl<'tcx> LateLintPass<'tcx> for ManualStrip {
9292
return;
9393
}
9494

95-
let (strippings, bindings) = find_stripping(cx, strip_kind, target_res, pattern, then);
95+
let (strippings, bindings) = find_stripping(cx, strip_kind, target_res, pattern, then, expr.span.ctxt());
9696
if !strippings.is_empty() && self.msrv.meets(cx, msrvs::STR_STRIP_PREFIX) {
9797
let kind_word = match strip_kind {
9898
StripKind::Prefix => "prefix",
@@ -166,8 +166,8 @@ fn len_arg<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>) -> Option<&'tcx E
166166
}
167167

168168
// Returns the length of the `expr` if it's a constant string or char.
169-
fn constant_length(cx: &LateContext<'_>, expr: &Expr<'_>) -> Option<u128> {
170-
let value = ConstEvalCtxt::new(cx).eval(expr)?;
169+
fn constant_length(cx: &LateContext<'_>, expr: &Expr<'_>, ctxt: SyntaxContext) -> Option<u128> {
170+
let value = ConstEvalCtxt::new(cx).eval_local(expr, ctxt)?;
171171
match value {
172172
Constant::Str(value) => Some(value.len() as u128),
173173
Constant::Char(value) => Some(value.len_utf8() as u128),
@@ -176,13 +176,18 @@ fn constant_length(cx: &LateContext<'_>, expr: &Expr<'_>) -> Option<u128> {
176176
}
177177

178178
// Tests if `expr` equals the length of the pattern.
179-
fn eq_pattern_length<'tcx>(cx: &LateContext<'tcx>, pattern: &Expr<'_>, expr: &'tcx Expr<'_>) -> bool {
179+
fn eq_pattern_length<'tcx>(
180+
cx: &LateContext<'tcx>,
181+
pattern: &Expr<'_>,
182+
expr: &'tcx Expr<'_>,
183+
ctxt: SyntaxContext,
184+
) -> bool {
180185
if let ExprKind::Lit(Spanned {
181186
node: LitKind::Int(n, _),
182187
..
183188
}) = expr.kind
184189
{
185-
constant_length(cx, pattern).is_some_and(|length| n == length)
190+
constant_length(cx, pattern, ctxt).is_some_and(|length| n == length)
186191
} else {
187192
len_arg(cx, expr).is_some_and(|arg| eq_expr_value(cx, pattern, arg))
188193
}
@@ -215,6 +220,7 @@ fn find_stripping<'tcx>(
215220
target: Res,
216221
pattern: &'tcx Expr<'_>,
217222
expr: &'tcx Expr<'tcx>,
223+
ctxt: SyntaxContext,
218224
) -> (Vec<&'tcx Expr<'tcx>>, FxHashMap<Symbol, usize>) {
219225
struct StrippingFinder<'a, 'tcx> {
220226
cx: &'a LateContext<'tcx>,
@@ -223,6 +229,7 @@ fn find_stripping<'tcx>(
223229
pattern: &'tcx Expr<'tcx>,
224230
results: Vec<&'tcx Expr<'tcx>>,
225231
bindings: FxHashMap<Symbol, usize>,
232+
ctxt: SyntaxContext,
226233
}
227234

228235
impl<'tcx> Visitor<'tcx> for StrippingFinder<'_, 'tcx> {
@@ -236,7 +243,7 @@ fn find_stripping<'tcx>(
236243
{
237244
match (self.strip_kind, start, end) {
238245
(StripKind::Prefix, Some(start), None) => {
239-
if eq_pattern_length(self.cx, self.pattern, start) {
246+
if eq_pattern_length(self.cx, self.pattern, start, self.ctxt) {
240247
self.results.push(ex);
241248
return;
242249
}
@@ -252,7 +259,7 @@ fn find_stripping<'tcx>(
252259
&& let Some(left_arg) = len_arg(self.cx, left)
253260
&& let ExprKind::Path(left_path) = &left_arg.kind
254261
&& self.cx.qpath_res(left_path, left_arg.hir_id) == self.target
255-
&& eq_pattern_length(self.cx, self.pattern, right)
262+
&& eq_pattern_length(self.cx, self.pattern, right, self.ctxt)
256263
{
257264
self.results.push(ex);
258265
return;
@@ -280,6 +287,7 @@ fn find_stripping<'tcx>(
280287
pattern,
281288
results: vec![],
282289
bindings: FxHashMap::default(),
290+
ctxt,
283291
};
284292
walk_expr(&mut finder, expr);
285293
(finder.results, finder.bindings)

‎clippy_lints/src/methods/ip_constant.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,12 @@ pub(super) fn check(cx: &LateContext<'_>, expr: &Expr<'_>, func: &Expr<'_>, args
1717
cx.tcx.get_diagnostic_name(func_def_id),
1818
Some(sym::Ipv4Addr | sym::Ipv6Addr)
1919
)
20+
&& let ecx = ConstEvalCtxt::new(cx)
21+
&& let ctxt = expr.span.ctxt()
2022
&& let Some(args) = args
2123
.iter()
2224
.map(|arg| {
23-
if let Some(Constant::Int(constant @ (0 | 1 | 127 | 255))) = ConstEvalCtxt::new(cx).eval(arg) {
25+
if let Some(Constant::Int(constant @ (0 | 1 | 127 | 255))) = ecx.eval_local(arg, ctxt) {
2426
u8::try_from(constant).ok()
2527
} else {
2628
None

‎clippy_lints/src/methods/iter_nth_zero.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pub(super) fn check(cx: &LateContext<'_>, expr: &hir::Expr<'_>, recv: &hir::Expr
1414
if let OwnerNode::Item(item) = cx.tcx.hir_owner_node(cx.tcx.hir_get_parent_item(expr.hir_id))
1515
&& let def_id = item.owner_id.to_def_id()
1616
&& is_trait_method(cx, expr, sym::Iterator)
17-
&& let Some(Constant::Int(0)) = ConstEvalCtxt::new(cx).eval(arg)
17+
&& let Some(Constant::Int(0)) = ConstEvalCtxt::new(cx).eval_local(arg, expr.span.ctxt())
1818
&& !is_lang_item_or_ctor(cx, def_id, LangItem::IteratorNext)
1919
{
2020
let mut app = Applicability::MachineApplicable;

‎clippy_lints/src/methods/iter_skip_zero.rs‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@ use super::ITER_SKIP_ZERO;
1111
pub(super) fn check<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'tcx>, arg_expr: &Expr<'_>) {
1212
if !expr.span.from_expansion()
1313
&& is_trait_method(cx, expr, sym::Iterator)
14-
&& let Some(arg) = ConstEvalCtxt::new(cx).eval(arg_expr).and_then(|constant| {
15-
if let Constant::Int(arg) = constant {
16-
Some(arg)
17-
} else {
18-
None
19-
}
20-
})
14+
&& let Some(arg) = ConstEvalCtxt::new(cx)
15+
.eval_local(arg_expr, expr.span.ctxt())
16+
.and_then(|constant| {
17+
if let Constant::Int(arg) = constant {
18+
Some(arg)
19+
} else {
20+
None
21+
}
22+
})
2123
&& arg == 0
2224
&& !is_from_proc_macro(cx, expr)
2325
{

‎clippy_lints/src/methods/repeat_once.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pub(super) fn check<'tcx>(
1414
recv: &'tcx Expr<'_>,
1515
repeat_arg: &'tcx Expr<'_>,
1616
) {
17-
if ConstEvalCtxt::new(cx).eval(repeat_arg) == Some(Constant::Int(1)) {
17+
if ConstEvalCtxt::new(cx).eval_local(repeat_arg, expr.span.ctxt()) == Some(Constant::Int(1)) {
1818
let ty = cx.typeck_results().expr_ty(recv).peel_refs();
1919
if ty.is_str() {
2020
span_lint_and_sugg(

‎clippy_lints/src/methods/str_splitn.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ fn parse_iter_usage<'tcx>(
304304
};
305305
},
306306
(sym::nth | sym::skip, [idx_expr]) if cx.tcx.trait_of_assoc(did) == Some(iter_id) => {
307-
if let Some(Constant::Int(idx)) = ConstEvalCtxt::new(cx).eval(idx_expr) {
307+
if let Some(Constant::Int(idx)) = ConstEvalCtxt::new(cx).eval_local(idx_expr, ctxt) {
308308
let span = if name.ident.as_str() == "nth" {
309309
e.span
310310
} else if let Some((_, Node::Expr(next_expr))) = iter.next()

0 commit comments

Comments
 (0)