Skip to content

Commit 758d0e8

Browse files
J-ZhengLiJ-ZhengLi
committed
change name to [infinite_loop];
& apply review suggestions;
1 parent 0d26f91 commit 758d0e8

File tree

6 files changed

+34
-27
lines changed

6 files changed

+34
-27
lines changed

‎CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5147,7 +5147,7 @@ Released 2018-09-13
51475147
[`inefficient_to_string`]: https://rust-lang.github.io/rust-clippy/master/index.html#inefficient_to_string
51485148
[`infallible_destructuring_match`]: https://rust-lang.github.io/rust-clippy/master/index.html#infallible_destructuring_match
51495149
[`infinite_iter`]: https://rust-lang.github.io/rust-clippy/master/index.html#infinite_iter
5150-
[`infinite_loops`]: https://rust-lang.github.io/rust-clippy/master/index.html#infinite_loops
5150+
[`infinite_loop`]: https://rust-lang.github.io/rust-clippy/master/index.html#infinite_loop
51515151
[`inherent_to_string`]: https://rust-lang.github.io/rust-clippy/master/index.html#inherent_to_string
51525152
[`inherent_to_string_shadow_display`]: https://rust-lang.github.io/rust-clippy/master/index.html#inherent_to_string_shadow_display
51535153
[`init_numbered_fields`]: https://rust-lang.github.io/rust-clippy/master/index.html#init_numbered_fields

‎clippy_lints/src/declared_lints.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ pub(crate) static LINTS: &[&crate::LintInfo] = &[
263263
crate::loops::EXPLICIT_INTO_ITER_LOOP_INFO,
264264
crate::loops::EXPLICIT_ITER_LOOP_INFO,
265265
crate::loops::FOR_KV_MAP_INFO,
266-
crate::loops::INFINITE_LOOPS_INFO,
266+
crate::loops::INFINITE_LOOP_INFO,
267267
crate::loops::ITER_NEXT_LOOP_INFO,
268268
crate::loops::MANUAL_FIND_INFO,
269269
crate::loops::MANUAL_FLATTEN_INFO,

‎clippy_lints/src/loops/infinite_loops.rs ‎clippy_lints/src/loops/infinite_loop.rs

+4-7
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ use rustc_errors::Applicability;
77
use rustc_hir as hir;
88
use rustc_lint::LateContext;
99

10-
use super::INFINITE_LOOPS;
10+
use super::INFINITE_LOOP;
1111

1212
pub(super) fn check<'tcx>(
1313
cx: &LateContext<'tcx>,
1414
expr: &Expr<'_>,
1515
loop_block: &'tcx hir::Block<'_>,
1616
label: Option<Label>,
1717
) {
18-
if is_lint_allowed(cx, INFINITE_LOOPS, expr.hir_id) {
18+
if is_lint_allowed(cx, INFINITE_LOOP, expr.hir_id) {
1919
return;
2020
}
2121

@@ -45,7 +45,7 @@ pub(super) fn check<'tcx>(
4545
let is_finite_loop = loop_visitor.is_finite;
4646

4747
if !is_finite_loop {
48-
span_lint_and_then(cx, INFINITE_LOOPS, expr.span, "infinite loop detected", |diag| {
48+
span_lint_and_then(cx, INFINITE_LOOP, expr.span, "infinite loop detected", |diag| {
4949
if let FnRetTy::DefaultReturn(ret_span) = parent_fn_ret {
5050
diag.span_suggestion(
5151
ret_span,
@@ -54,10 +54,7 @@ pub(super) fn check<'tcx>(
5454
Applicability::MaybeIncorrect,
5555
);
5656
} else {
57-
diag.span_help(
58-
expr.span,
59-
"if this is not intended, try adding a `break` or `return` condition in this loop",
60-
);
57+
diag.help("if this is not intended, try adding a `break` or `return` condition in the loop");
6158
}
6259
});
6360
}

‎clippy_lints/src/loops/mod.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ mod explicit_counter_loop;
33
mod explicit_into_iter_loop;
44
mod explicit_iter_loop;
55
mod for_kv_map;
6-
mod infinite_loops;
6+
mod infinite_loop;
77
mod iter_next_loop;
88
mod manual_find;
99
mod manual_flatten;
@@ -642,7 +642,7 @@ declare_clippy_lint! {
642642
/// and lint accordingly.
643643
///
644644
/// ### Why is this bad?
645-
/// A loop should be gently exited somewhere, or at lease mark its parent function as
645+
/// A loop should be gently exited somewhere, or at least mark its parent function as
646646
/// never return (`!`).
647647
///
648648
/// ### Example
@@ -673,9 +673,9 @@ declare_clippy_lint! {
673673
/// }
674674
/// ```
675675
#[clippy::version = "1.75.0"]
676-
pub INFINITE_LOOPS,
676+
pub INFINITE_LOOP,
677677
restriction,
678-
"possibly unintended infinite loops"
678+
"possibly unintended infinite loop"
679679
}
680680

681681
pub struct Loops {
@@ -712,7 +712,7 @@ impl_lint_pass!(Loops => [
712712
MANUAL_FIND,
713713
MANUAL_WHILE_LET_SOME,
714714
UNUSED_ENUMERATE_INDEX,
715-
INFINITE_LOOPS,
715+
INFINITE_LOOP,
716716
]);
717717

718718
impl<'tcx> LateLintPass<'tcx> for Loops {
@@ -755,7 +755,7 @@ impl<'tcx> LateLintPass<'tcx> for Loops {
755755
// also check for empty `loop {}` statements, skipping those in #[panic_handler]
756756
empty_loop::check(cx, expr, block);
757757
while_let_loop::check(cx, expr, block);
758-
infinite_loops::check(cx, expr, block, label);
758+
infinite_loop::check(cx, expr, block, label);
759759
}
760760

761761
while_let_on_iterator::check(cx, expr);

‎tests/ui/infinite_loops.rs

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//@no-rustfix
22
#![allow(clippy::never_loop)]
3-
#![warn(clippy::infinite_loops)]
3+
#![warn(clippy::infinite_loop)]
44

55
fn do_something() {}
66

@@ -357,4 +357,10 @@ fn inf_loop_in_closure() {
357357
};
358358
}
359359

360+
fn inf_loop_in_res() -> Result<(), i32> {
361+
Ok(loop {
362+
do_something()
363+
})
364+
}
365+
360366
fn main() {}

‎tests/ui/infinite_loops.stderr

+15-11
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ LL | | do_something();
77
LL | | }
88
| |_____^
99
|
10-
= note: `-D clippy::infinite-loops` implied by `-D warnings`
11-
= help: to override `-D warnings` add `#[allow(clippy::infinite_loops)]`
10+
= note: `-D clippy::infinite-loop` implied by `-D warnings`
11+
= help: to override `-D warnings` add `#[allow(clippy::infinite_loop)]`
1212
help: if this is intentional, consider specifing `!` as function return
1313
|
1414
LL | fn no_break() -> ! {
@@ -71,14 +71,7 @@ LL | | do_something();
7171
LL | | }
7272
| |_____^
7373
|
74-
help: if this is not intended, try adding a `break` or `return` condition in this loop
75-
--> $DIR/infinite_loops.rs:33:5
76-
|
77-
LL | / loop {
78-
LL | |
79-
LL | | do_something();
80-
LL | | }
81-
| |_____^
74+
= help: if this is not intended, try adding a `break` or `return` condition in the loop
8275

8376
error: infinite loop detected
8477
--> $DIR/infinite_loops.rs:46:5
@@ -251,5 +244,16 @@ help: if this is intentional, consider specifing `!` as function return
251244
LL | let _loop_forever = || -> ! {
252245
| ++++
253246

254-
error: aborting due to 16 previous errors
247+
error: infinite loop detected
248+
--> $DIR/infinite_loops.rs:361:8
249+
|
250+
LL | Ok(loop {
251+
| ________^
252+
LL | | do_something()
253+
LL | | })
254+
| |_____^
255+
|
256+
= help: if this is not intended, try adding a `break` or `return` condition in the loop
257+
258+
error: aborting due to 17 previous errors
255259

0 commit comments

Comments
 (0)