Skip to content

Commit 25fe419

Browse files
committed
change applicability type to MaybeIncorrect
1 parent 4d1b976 commit 25fe419

File tree

1 file changed

+16
-11
lines changed

1 file changed

+16
-11
lines changed

clippy_lints/src/loops/explicit_counter_loop.rs

+16-11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use super::{make_iterator_snippet, IncrementVisitor, InitializeVisitor, EXPLICIT_COUNTER_LOOP};
2-
use clippy_utils::diagnostics::{span_lint_and_sugg, span_lint_and_then};
2+
use clippy_utils::diagnostics::span_lint_and_then;
33
use clippy_utils::source::snippet_with_applicability;
44
use clippy_utils::{get_enclosing_block, is_integer_const};
55
use if_chain::if_chain;
@@ -34,24 +34,29 @@ pub(super) fn check<'tcx>(
3434
if let Some((name, ty, initializer)) = initialize_visitor.get_result();
3535
if is_integer_const(cx, initializer, 0);
3636
then {
37-
let mut applicability = Applicability::MachineApplicable;
37+
let mut applicability = Applicability::MaybeIncorrect;
3838

3939
let int_name = match ty.map(Ty::kind) {
4040
// usize or inferred
4141
Some(ty::Uint(UintTy::Usize)) | None => {
42-
span_lint_and_sugg(
42+
span_lint_and_then(
4343
cx,
4444
EXPLICIT_COUNTER_LOOP,
4545
expr.span.with_hi(arg.span.hi()),
4646
&format!("the variable `{}` is used as a loop counter", name),
47-
"consider using",
48-
format!(
49-
"for ({}, {}) in {}.enumerate()",
50-
name,
51-
snippet_with_applicability(cx, pat.span, "item", &mut applicability),
52-
make_iterator_snippet(cx, arg, &mut applicability),
53-
),
54-
applicability,
47+
|diag| {
48+
diag.span_suggestion(
49+
expr.span.with_hi(arg.span.hi()),
50+
"consider using",
51+
format!(
52+
"for ({}, {}) in {}.enumerate()",
53+
name,
54+
snippet_with_applicability(cx, pat.span, "item", &mut applicability),
55+
make_iterator_snippet(cx, arg, &mut applicability),
56+
),
57+
applicability,
58+
);
59+
}
5560
);
5661
return;
5762
}

0 commit comments

Comments
 (0)