mirror of
https://github.com/rust-lang/rust-clippy
synced 2024-11-10 15:14:29 +00:00
40b558af76
add more test cases with `match`; minor fixes in message output regarding review feedback
89 lines
2 KiB
Rust
89 lines
2 KiB
Rust
#![warn(clippy::blocks_in_conditions)]
|
|
#![allow(
|
|
unused,
|
|
clippy::let_and_return,
|
|
clippy::needless_if,
|
|
clippy::unnecessary_literal_unwrap
|
|
)]
|
|
|
|
fn predicate<F: FnOnce(T) -> bool, T>(pfn: F, val: T) -> bool {
|
|
pfn(val)
|
|
}
|
|
|
|
fn pred_test() {
|
|
let v = 3;
|
|
let sky = "blue";
|
|
// This is a sneaky case, where the block isn't directly in the condition,
|
|
// but is actually inside a closure that the condition is using.
|
|
// The same principle applies -- add some extra expressions to make sure
|
|
// linter isn't confused by them.
|
|
if v == 3
|
|
&& sky == "blue"
|
|
&& predicate(
|
|
|x| {
|
|
//~^ ERROR: in an `if` condition, avoid complex blocks or closures with blocks
|
|
//~| NOTE: `-D clippy::blocks-in-conditions` implied by `-D warnings`
|
|
let target = 3;
|
|
x == target
|
|
},
|
|
v,
|
|
)
|
|
{}
|
|
|
|
if predicate(
|
|
|x| {
|
|
//~^ ERROR: in an `if` condition, avoid complex blocks or closures with blocks; in
|
|
let target = 3;
|
|
x == target
|
|
},
|
|
v,
|
|
) {}
|
|
}
|
|
|
|
fn closure_without_block() {
|
|
if predicate(|x| x == 3, 6) {}
|
|
}
|
|
|
|
fn macro_in_closure() {
|
|
let option = Some(true);
|
|
|
|
if option.unwrap_or_else(|| unimplemented!()) {
|
|
unimplemented!()
|
|
}
|
|
}
|
|
|
|
fn closure(_: impl FnMut()) -> bool {
|
|
true
|
|
}
|
|
|
|
fn function_with_empty_closure() {
|
|
if closure(|| {}) {}
|
|
}
|
|
|
|
// issue #11814
|
|
fn match_with_pred() {
|
|
let v = 3;
|
|
match Some(predicate(
|
|
|x| {
|
|
//~^ ERROR: in a `match` scrutinee, avoid complex blocks or closures with blocks
|
|
let target = 3;
|
|
x == target
|
|
},
|
|
v,
|
|
)) {
|
|
Some(true) => 1,
|
|
Some(false) => 2,
|
|
None => 3,
|
|
};
|
|
}
|
|
|
|
#[rustfmt::skip]
|
|
fn main() {
|
|
let mut range = 0..10;
|
|
range.all(|i| {i < 10} );
|
|
|
|
let v = vec![1, 2, 3];
|
|
if v.into_iter().any(|x| {x == 4}) {
|
|
println!("contains 4!");
|
|
}
|
|
}
|