-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
panic_in_result_fn: Extend to also check usages of [debug_]assert* ma…
…cros Also, the macro-finding logic has been moved to the util module, for use by future lints. Reformat code assert_in_result_fn: also check debug_assert*!() macros assert_in_result_fn: make stderr file for uitest shorter Put 'assert_in_result_fn' checks into 'panic_in_result_fn' Update doc & test Update doc Remove assert_in_result_fn Fix tests
- Loading branch information
Showing
7 changed files
with
285 additions
and
50 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
#![warn(clippy::panic_in_result_fn)] | ||
#![allow(clippy::unnecessary_wraps)] | ||
|
||
struct A; | ||
|
||
impl A { | ||
fn result_with_assert_with_message(x: i32) -> Result<bool, String> // should emit lint | ||
{ | ||
assert!(x == 5, "wrong argument"); | ||
Ok(true) | ||
} | ||
|
||
fn result_with_assert_eq(x: i32) -> Result<bool, String> // should emit lint | ||
{ | ||
assert_eq!(x, 5); | ||
Ok(true) | ||
} | ||
|
||
fn result_with_assert_ne(x: i32) -> Result<bool, String> // should emit lint | ||
{ | ||
assert_ne!(x, 1); | ||
Ok(true) | ||
} | ||
|
||
fn other_with_assert_with_message(x: i32) // should not emit lint | ||
{ | ||
assert!(x == 5, "wrong argument"); | ||
} | ||
|
||
fn other_with_assert_eq(x: i32) // should not emit lint | ||
{ | ||
assert_eq!(x, 5); | ||
} | ||
|
||
fn other_with_assert_ne(x: i32) // should not emit lint | ||
{ | ||
assert_ne!(x, 1); | ||
} | ||
|
||
fn result_without_banned_functions() -> Result<bool, String> // should not emit lint | ||
{ | ||
let assert = "assert!"; | ||
println!("No {}", assert); | ||
Ok(true) | ||
} | ||
} | ||
|
||
fn main() {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
error: used `unimplemented!()`, `unreachable!()`, `todo!()`, `panic!()` or assertion in a function that returns `Result` | ||
--> $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 | | { | ||
LL | | assert!(x == 5, "wrong argument"); | ||
LL | | Ok(true) | ||
LL | | } | ||
| |_____^ | ||
| | ||
= note: `-D clippy::panic-in-result-fn` implied by `-D warnings` | ||
= 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_assertions.rs:9:9 | ||
| | ||
LL | assert!(x == 5, "wrong argument"); | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
= note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) | ||
|
||
error: used `unimplemented!()`, `unreachable!()`, `todo!()`, `panic!()` or assertion in a function that returns `Result` | ||
--> $DIR/panic_in_result_fn_assertions.rs:13:5 | ||
| | ||
LL | / fn result_with_assert_eq(x: i32) -> Result<bool, String> // should emit lint | ||
LL | | { | ||
LL | | assert_eq!(x, 5); | ||
LL | | Ok(true) | ||
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_assertions.rs:15:9 | ||
| | ||
LL | assert_eq!(x, 5); | ||
| ^^^^^^^^^^^^^^^^^ | ||
= note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) | ||
|
||
error: used `unimplemented!()`, `unreachable!()`, `todo!()`, `panic!()` or assertion in a function that returns `Result` | ||
--> $DIR/panic_in_result_fn_assertions.rs:19:5 | ||
| | ||
LL | / fn result_with_assert_ne(x: i32) -> Result<bool, String> // should emit lint | ||
LL | | { | ||
LL | | assert_ne!(x, 1); | ||
LL | | Ok(true) | ||
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_assertions.rs:21:9 | ||
| | ||
LL | assert_ne!(x, 1); | ||
| ^^^^^^^^^^^^^^^^^ | ||
= note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) | ||
|
||
error: aborting due to 3 previous errors | ||
|
Oops, something went wrong.