[panic_in_result_fn] remove todo!, unimplemented!, unreachable!

This commit fixes #11025 by removing checks for `todo!`,
`unimplemented!` and `unreachable!`.

Signed-off-by: Panagiotis Foliadis <pfoliadis@hotmail.com>
This commit is contained in:
Panagiotis Foliadis 2023-07-07 21:39:31 +03:00
parent 26edd5a2ab
commit c49c177e06
3 changed files with 16 additions and 80 deletions

View file

@ -13,7 +13,7 @@ use rustc_span::{sym, Span};
declare_clippy_lint! { declare_clippy_lint! {
/// ### What it does /// ### What it does
/// Checks for usage of `panic!`, `unimplemented!`, `todo!`, `unreachable!` or assertions in a function of type result. /// Checks for usage of `panic!` or assertions in a function of type result.
/// ///
/// ### Why is this bad? /// ### Why is this bad?
/// For some codebases, it is desirable for functions of type result to return an error instead of crashing. Hence panicking macros should be avoided. /// For some codebases, it is desirable for functions of type result to return an error instead of crashing. Hence panicking macros should be avoided.
@ -37,7 +37,7 @@ declare_clippy_lint! {
#[clippy::version = "1.48.0"] #[clippy::version = "1.48.0"]
pub PANIC_IN_RESULT_FN, pub PANIC_IN_RESULT_FN,
restriction, restriction,
"functions of type `Result<..>` that contain `panic!()`, `todo!()`, `unreachable()`, `unimplemented()` or assertion" "functions of type `Result<..>` that contain `panic!()` or assertion"
} }
declare_lint_pass!(PanicInResultFn => [PANIC_IN_RESULT_FN]); declare_lint_pass!(PanicInResultFn => [PANIC_IN_RESULT_FN]);
@ -70,7 +70,7 @@ fn lint_impl_body<'tcx>(cx: &LateContext<'tcx>, impl_span: Span, body: &'tcx hir
}; };
if matches!( if matches!(
cx.tcx.item_name(macro_call.def_id).as_str(), cx.tcx.item_name(macro_call.def_id).as_str(),
"unimplemented" | "unreachable" | "panic" | "todo" | "assert" | "assert_eq" | "assert_ne" "panic" | "assert" | "assert_eq" | "assert_ne"
) { ) {
panics.push(macro_call.span); panics.push(macro_call.span);
ControlFlow::Continue(Descend::No) ControlFlow::Continue(Descend::No)
@ -83,10 +83,10 @@ fn lint_impl_body<'tcx>(cx: &LateContext<'tcx>, impl_span: Span, body: &'tcx hir
cx, cx,
PANIC_IN_RESULT_FN, PANIC_IN_RESULT_FN,
impl_span, impl_span,
"used `unimplemented!()`, `unreachable!()`, `todo!()`, `panic!()` or assertion in a function that returns `Result`", "used `panic!()` or assertion in a function that returns `Result`",
move |diag| { move |diag| {
diag.help( diag.help(
"`unimplemented!()`, `unreachable!()`, `todo!()`, `panic!()` or assertions should not be used in a function that returns `Result` as `Result` is expected to return an error instead of crashing", "`panic!()` or assertions should not be used in a function that returns `Result` as `Result` is expected to return an error instead of crashing",
); );
diag.span_note(panics, "return Err() instead of panicking"); diag.span_note(panics, "return Err() instead of panicking");
}, },

View file

@ -1,4 +1,4 @@
error: used `unimplemented!()`, `unreachable!()`, `todo!()`, `panic!()` or assertion in a function that returns `Result` error: used `panic!()` or assertion in a function that returns `Result`
--> $DIR/panic_in_result_fn.rs:6:5 --> $DIR/panic_in_result_fn.rs:6:5
| |
LL | / fn result_with_panic() -> Result<bool, String> // should emit lint LL | / fn result_with_panic() -> Result<bool, String> // should emit lint
@ -7,7 +7,7 @@ LL | | panic!("error");
LL | | } LL | | }
| |_____^ | |_____^
| |
= help: `unimplemented!()`, `unreachable!()`, `todo!()`, `panic!()` or assertions should not be used in a function that returns `Result` as `Result` is expected to return an error instead of crashing = help: `panic!()` or assertions should not be used in a function that returns `Result` as `Result` is expected to return an error instead of crashing
note: return Err() instead of panicking note: return Err() instead of panicking
--> $DIR/panic_in_result_fn.rs:8:9 --> $DIR/panic_in_result_fn.rs:8:9
| |
@ -15,55 +15,7 @@ LL | panic!("error");
| ^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^
= note: `-D clippy::panic-in-result-fn` implied by `-D warnings` = note: `-D clippy::panic-in-result-fn` implied by `-D warnings`
error: used `unimplemented!()`, `unreachable!()`, `todo!()`, `panic!()` or assertion in a function that returns `Result` error: used `panic!()` or assertion in a function that returns `Result`
--> $DIR/panic_in_result_fn.rs:11:5
|
LL | / fn result_with_unimplemented() -> Result<bool, String> // should emit lint
LL | | {
LL | | unimplemented!();
LL | | }
| |_____^
|
= help: `unimplemented!()`, `unreachable!()`, `todo!()`, `panic!()` or assertions should not be used in a function that returns `Result` as `Result` is expected to return an error instead of crashing
note: return Err() instead of panicking
--> $DIR/panic_in_result_fn.rs:13:9
|
LL | unimplemented!();
| ^^^^^^^^^^^^^^^^
error: used `unimplemented!()`, `unreachable!()`, `todo!()`, `panic!()` or assertion in a function that returns `Result`
--> $DIR/panic_in_result_fn.rs:16:5
|
LL | / fn result_with_unreachable() -> Result<bool, String> // should emit lint
LL | | {
LL | | unreachable!();
LL | | }
| |_____^
|
= help: `unimplemented!()`, `unreachable!()`, `todo!()`, `panic!()` or assertions should not be used in a function that returns `Result` as `Result` is expected to return an error instead of crashing
note: return Err() instead of panicking
--> $DIR/panic_in_result_fn.rs:18:9
|
LL | unreachable!();
| ^^^^^^^^^^^^^^
error: used `unimplemented!()`, `unreachable!()`, `todo!()`, `panic!()` or assertion in a function that returns `Result`
--> $DIR/panic_in_result_fn.rs:21:5
|
LL | / fn result_with_todo() -> Result<bool, String> // should emit lint
LL | | {
LL | | todo!("Finish this");
LL | | }
| |_____^
|
= help: `unimplemented!()`, `unreachable!()`, `todo!()`, `panic!()` or assertions should not be used in a function that returns `Result` as `Result` is expected to return an error instead of crashing
note: return Err() instead of panicking
--> $DIR/panic_in_result_fn.rs:23:9
|
LL | todo!("Finish this");
| ^^^^^^^^^^^^^^^^^^^^
error: used `unimplemented!()`, `unreachable!()`, `todo!()`, `panic!()` or assertion in a function that returns `Result`
--> $DIR/panic_in_result_fn.rs:52:1 --> $DIR/panic_in_result_fn.rs:52:1
| |
LL | / fn function_result_with_panic() -> Result<bool, String> // should emit lint LL | / fn function_result_with_panic() -> Result<bool, String> // should emit lint
@ -72,28 +24,12 @@ LL | | panic!("error");
LL | | } LL | | }
| |_^ | |_^
| |
= help: `unimplemented!()`, `unreachable!()`, `todo!()`, `panic!()` or assertions should not be used in a function that returns `Result` as `Result` is expected to return an error instead of crashing = help: `panic!()` or assertions should not be used in a function that returns `Result` as `Result` is expected to return an error instead of crashing
note: return Err() instead of panicking note: return Err() instead of panicking
--> $DIR/panic_in_result_fn.rs:54:5 --> $DIR/panic_in_result_fn.rs:54:5
| |
LL | panic!("error"); LL | panic!("error");
| ^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^
error: used `unimplemented!()`, `unreachable!()`, `todo!()`, `panic!()` or assertion in a function that returns `Result` error: aborting due to 2 previous errors
--> $DIR/panic_in_result_fn.rs:67:1
|
LL | / fn main() -> Result<(), String> {
LL | | todo!("finish main method");
LL | | Ok(())
LL | | }
| |_^
|
= help: `unimplemented!()`, `unreachable!()`, `todo!()`, `panic!()` or assertions should not be used in a function that returns `Result` as `Result` is expected to return an error instead of crashing
note: return Err() instead of panicking
--> $DIR/panic_in_result_fn.rs:68:5
|
LL | todo!("finish main method");
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: aborting due to 6 previous errors

View file

@ -1,4 +1,4 @@
error: used `unimplemented!()`, `unreachable!()`, `todo!()`, `panic!()` or assertion in a function that returns `Result` error: used `panic!()` or assertion in a function that returns `Result`
--> $DIR/panic_in_result_fn_assertions.rs:7:5 --> $DIR/panic_in_result_fn_assertions.rs:7:5
| |
LL | / fn result_with_assert_with_message(x: i32) -> Result<bool, String> // should emit lint LL | / fn result_with_assert_with_message(x: i32) -> Result<bool, String> // should emit lint
@ -8,7 +8,7 @@ LL | | Ok(true)
LL | | } LL | | }
| |_____^ | |_____^
| |
= help: `unimplemented!()`, `unreachable!()`, `todo!()`, `panic!()` or assertions should not be used in a function that returns `Result` as `Result` is expected to return an error instead of crashing = help: `panic!()` or assertions should not be used in a function that returns `Result` as `Result` is expected to return an error instead of crashing
note: return Err() instead of panicking note: return Err() instead of panicking
--> $DIR/panic_in_result_fn_assertions.rs:9:9 --> $DIR/panic_in_result_fn_assertions.rs:9:9
| |
@ -16,7 +16,7 @@ LL | assert!(x == 5, "wrong argument");
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
= note: `-D clippy::panic-in-result-fn` implied by `-D warnings` = note: `-D clippy::panic-in-result-fn` implied by `-D warnings`
error: used `unimplemented!()`, `unreachable!()`, `todo!()`, `panic!()` or assertion in a function that returns `Result` error: used `panic!()` or assertion in a function that returns `Result`
--> $DIR/panic_in_result_fn_assertions.rs:13:5 --> $DIR/panic_in_result_fn_assertions.rs:13:5
| |
LL | / fn result_with_assert_eq(x: i32) -> Result<bool, String> // should emit lint LL | / fn result_with_assert_eq(x: i32) -> Result<bool, String> // should emit lint
@ -26,14 +26,14 @@ LL | | Ok(true)
LL | | } LL | | }
| |_____^ | |_____^
| |
= help: `unimplemented!()`, `unreachable!()`, `todo!()`, `panic!()` or assertions should not be used in a function that returns `Result` as `Result` is expected to return an error instead of crashing = help: `panic!()` or assertions should not be used in a function that returns `Result` as `Result` is expected to return an error instead of crashing
note: return Err() instead of panicking note: return Err() instead of panicking
--> $DIR/panic_in_result_fn_assertions.rs:15:9 --> $DIR/panic_in_result_fn_assertions.rs:15:9
| |
LL | assert_eq!(x, 5); LL | assert_eq!(x, 5);
| ^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^
error: used `unimplemented!()`, `unreachable!()`, `todo!()`, `panic!()` or assertion in a function that returns `Result` error: used `panic!()` or assertion in a function that returns `Result`
--> $DIR/panic_in_result_fn_assertions.rs:19:5 --> $DIR/panic_in_result_fn_assertions.rs:19:5
| |
LL | / fn result_with_assert_ne(x: i32) -> Result<bool, String> // should emit lint LL | / fn result_with_assert_ne(x: i32) -> Result<bool, String> // should emit lint
@ -43,7 +43,7 @@ LL | | Ok(true)
LL | | } LL | | }
| |_____^ | |_____^
| |
= help: `unimplemented!()`, `unreachable!()`, `todo!()`, `panic!()` or assertions should not be used in a function that returns `Result` as `Result` is expected to return an error instead of crashing = help: `panic!()` or assertions should not be used in a function that returns `Result` as `Result` is expected to return an error instead of crashing
note: return Err() instead of panicking note: return Err() instead of panicking
--> $DIR/panic_in_result_fn_assertions.rs:21:9 --> $DIR/panic_in_result_fn_assertions.rs:21:9
| |