3fe11e776c
Fixes #7973 changelog: don't expand macros in suggestion of clippy::option_if_let_else
163 lines
3.7 KiB
Rust
163 lines
3.7 KiB
Rust
// run-rustfix
|
|
#![warn(clippy::option_if_let_else)]
|
|
#![allow(clippy::redundant_closure, clippy::ref_option_ref, clippy::equatable_if_let)]
|
|
|
|
fn bad1(string: Option<&str>) -> (bool, &str) {
|
|
string.map_or((false, "hello"), |x| (true, x))
|
|
}
|
|
|
|
fn else_if_option(string: Option<&str>) -> Option<(bool, &str)> {
|
|
if string.is_none() {
|
|
None
|
|
} else if let Some(x) = string {
|
|
Some((true, x))
|
|
} else {
|
|
Some((false, ""))
|
|
}
|
|
}
|
|
|
|
fn unop_bad(string: &Option<&str>, mut num: Option<i32>) {
|
|
let _ = string.map_or(0, |s| s.len());
|
|
let _ = num.as_ref().map_or(&0, |s| s);
|
|
let _ = num.as_mut().map_or(&mut 0, |s| {
|
|
*s += 1;
|
|
s
|
|
});
|
|
let _ = num.as_ref().map_or(&0, |s| s);
|
|
let _ = num.map_or(0, |mut s| {
|
|
s += 1;
|
|
s
|
|
});
|
|
let _ = num.as_mut().map_or(&mut 0, |s| {
|
|
*s += 1;
|
|
s
|
|
});
|
|
}
|
|
|
|
fn longer_body(arg: Option<u32>) -> u32 {
|
|
arg.map_or(13, |x| {
|
|
let y = x * x;
|
|
y * y
|
|
})
|
|
}
|
|
|
|
fn impure_else(arg: Option<i32>) {
|
|
let side_effect = || {
|
|
println!("return 1");
|
|
1
|
|
};
|
|
let _ = arg.map_or_else(|| side_effect(), |x| x);
|
|
}
|
|
|
|
fn test_map_or_else(arg: Option<u32>) {
|
|
let _ = arg.map_or_else(|| {
|
|
let mut y = 1;
|
|
y = (y + 2 / y) / 2;
|
|
y = (y + 2 / y) / 2;
|
|
y
|
|
}, |x| x * x * x * x);
|
|
}
|
|
|
|
fn negative_tests(arg: Option<u32>) -> u32 {
|
|
let _ = if let Some(13) = arg { "unlucky" } else { "lucky" };
|
|
for _ in 0..10 {
|
|
let _ = if let Some(x) = arg {
|
|
x
|
|
} else {
|
|
continue;
|
|
};
|
|
}
|
|
let _ = if let Some(x) = arg {
|
|
return x;
|
|
} else {
|
|
5
|
|
};
|
|
7
|
|
}
|
|
|
|
// #7973
|
|
fn pattern_to_vec(pattern: &str) -> Vec<String> {
|
|
pattern
|
|
.trim_matches('/')
|
|
.split('/')
|
|
.flat_map(|s| {
|
|
s.find('.').map_or_else(|| vec![s.to_string()], |idx| vec![s[..idx].to_string(), s[idx..].to_string()])
|
|
})
|
|
.collect::<Vec<_>>()
|
|
}
|
|
|
|
fn main() {
|
|
let optional = Some(5);
|
|
let _ = optional.map_or(5, |x| x + 2);
|
|
let _ = bad1(None);
|
|
let _ = else_if_option(None);
|
|
unop_bad(&None, None);
|
|
let _ = longer_body(None);
|
|
test_map_or_else(None);
|
|
let _ = negative_tests(None);
|
|
let _ = impure_else(None);
|
|
|
|
let _ = Some(0).map_or(0, |x| loop {
|
|
if x == 0 {
|
|
break x;
|
|
}
|
|
});
|
|
|
|
// #7576
|
|
const fn _f(x: Option<u32>) -> u32 {
|
|
// Don't lint, `map_or` isn't const
|
|
if let Some(x) = x { x } else { 10 }
|
|
}
|
|
|
|
// #5822
|
|
let s = String::new();
|
|
// Don't lint, `Some` branch consumes `s`, but else branch uses `s`
|
|
let _ = if let Some(x) = Some(0) {
|
|
let s = s;
|
|
s.len() + x
|
|
} else {
|
|
s.len()
|
|
};
|
|
|
|
let s = String::new();
|
|
// Lint, both branches immutably borrow `s`.
|
|
let _ = Some(0).map_or_else(|| s.len(), |x| s.len() + x);
|
|
|
|
let s = String::new();
|
|
// Lint, `Some` branch consumes `s`, but else branch doesn't use `s`.
|
|
let _ = Some(0).map_or(1, |x| {
|
|
let s = s;
|
|
s.len() + x
|
|
});
|
|
|
|
let s = Some(String::new());
|
|
// Don't lint, `Some` branch borrows `s`, but else branch consumes `s`
|
|
let _ = if let Some(x) = &s {
|
|
x.len()
|
|
} else {
|
|
let _s = s;
|
|
10
|
|
};
|
|
|
|
let mut s = Some(String::new());
|
|
// Don't lint, `Some` branch mutably borrows `s`, but else branch also borrows `s`
|
|
let _ = if let Some(x) = &mut s {
|
|
x.push_str("test");
|
|
x.len()
|
|
} else {
|
|
let _s = &s;
|
|
10
|
|
};
|
|
|
|
async fn _f1(x: u32) -> u32 {
|
|
x
|
|
}
|
|
|
|
async fn _f2() {
|
|
// Don't lint. `await` can't be moved into a closure.
|
|
let _ = if let Some(x) = Some(0) { _f1(x).await } else { 0 };
|
|
}
|
|
|
|
let _ = pattern_to_vec("hello world");
|
|
}
|