c60222dc12
if the msrv is not >= 1.70 then the `map_or` is suggested instead of `is_some_and` (even when `unwrap_or` returns false)
144 lines
3.4 KiB
Rust
144 lines
3.4 KiB
Rust
//@aux-build:option_helpers.rs
|
|
|
|
#![warn(clippy::map_unwrap_or)]
|
|
#![allow(clippy::uninlined_format_args, clippy::unnecessary_lazy_evaluations)]
|
|
|
|
#[macro_use]
|
|
extern crate option_helpers;
|
|
|
|
use std::collections::HashMap;
|
|
|
|
#[rustfmt::skip]
|
|
fn option_methods() {
|
|
let opt = Some(1);
|
|
|
|
// Check for `option.map(_).unwrap_or(_)` use.
|
|
// Single line case.
|
|
let _ = opt.map(|x| x + 1)
|
|
// Should lint even though this call is on a separate line.
|
|
.unwrap_or(0);
|
|
// Multi-line cases.
|
|
let _ = opt.map(|x| {
|
|
x + 1
|
|
}
|
|
).unwrap_or(0);
|
|
let _ = opt.map(|x| x + 1)
|
|
.unwrap_or({
|
|
0
|
|
});
|
|
// Single line `map(f).unwrap_or(None)` case.
|
|
let _ = opt.map(|x| Some(x + 1)).unwrap_or(None);
|
|
// Multi-line `map(f).unwrap_or(None)` cases.
|
|
let _ = opt.map(|x| {
|
|
Some(x + 1)
|
|
}
|
|
).unwrap_or(None);
|
|
let _ = opt
|
|
.map(|x| Some(x + 1))
|
|
.unwrap_or(None);
|
|
// macro case
|
|
let _ = opt_map!(opt, |x| x + 1).unwrap_or(0); // should not lint
|
|
|
|
// Should not lint if not copyable
|
|
let id: String = "identifier".to_string();
|
|
let _ = Some("prefix").map(|p| format!("{}.{}", p, id)).unwrap_or(id);
|
|
// ...but DO lint if the `unwrap_or` argument is not used in the `map`
|
|
let id: String = "identifier".to_string();
|
|
let _ = Some("prefix").map(|p| format!("{}.", p)).unwrap_or(id);
|
|
|
|
// Check for `option.map(_).unwrap_or_else(_)` use.
|
|
// Multi-line cases.
|
|
let _ = opt.map(|x| {
|
|
x + 1
|
|
}
|
|
).unwrap_or_else(|| 0);
|
|
let _ = opt.map(|x| x + 1)
|
|
.unwrap_or_else(||
|
|
0
|
|
);
|
|
|
|
// Check for `map(f).unwrap_or(false)` use.
|
|
let _ = opt.map(|x| x > 5).unwrap_or(false);
|
|
|
|
}
|
|
|
|
#[rustfmt::skip]
|
|
fn result_methods() {
|
|
let res: Result<i32, ()> = Ok(1);
|
|
|
|
// Check for `result.map(_).unwrap_or_else(_)` use.
|
|
// multi line cases
|
|
let _ = res.map(|x| {
|
|
x + 1
|
|
}
|
|
).unwrap_or_else(|_e| 0);
|
|
let _ = res.map(|x| x + 1)
|
|
.unwrap_or_else(|_e| {
|
|
0
|
|
});
|
|
// macro case
|
|
let _ = opt_map!(res, |x| x + 1).unwrap_or_else(|_e| 0); // should not lint
|
|
}
|
|
|
|
fn main() {
|
|
option_methods();
|
|
result_methods();
|
|
}
|
|
|
|
#[clippy::msrv = "1.40"]
|
|
fn msrv_1_40() {
|
|
let res: Result<i32, ()> = Ok(1);
|
|
|
|
let _ = res.map(|x| x + 1).unwrap_or_else(|_e| 0);
|
|
}
|
|
|
|
#[clippy::msrv = "1.41"]
|
|
fn msrv_1_41() {
|
|
let res: Result<i32, ()> = Ok(1);
|
|
|
|
let _ = res.map(|x| x + 1).unwrap_or_else(|_e| 0);
|
|
}
|
|
|
|
#[clippy::msrv = "1.69"]
|
|
fn msrv_1_69() {
|
|
let opt: Option<i32> = Some(1);
|
|
|
|
let _ = opt.map(|x| x > 5).unwrap_or(false);
|
|
}
|
|
|
|
#[clippy::msrv = "1.70"]
|
|
fn msrv_1_70() {
|
|
let opt: Option<i32> = Some(1);
|
|
|
|
let _ = opt.map(|x| x > 5).unwrap_or(false);
|
|
}
|
|
|
|
mod issue_10579 {
|
|
// Different variations of the same issue.
|
|
fn v1() {
|
|
let x = vec![1, 2, 3, 0];
|
|
let y = x.strip_suffix(&[0]).map(|s| s.to_vec()).unwrap_or(x);
|
|
println!("{y:?}");
|
|
}
|
|
fn v2() {
|
|
let x = vec![1, 2, 3, 0];
|
|
let y = Some(()).map(|_| x.to_vec()).unwrap_or(x);
|
|
println!("{y:?}");
|
|
}
|
|
fn v3() {
|
|
let x = vec![1, 2, 3, 0];
|
|
let xref = &x;
|
|
let y = Some(()).map(|_| xref.to_vec()).unwrap_or(x);
|
|
println!("{y:?}");
|
|
}
|
|
fn v4() {
|
|
struct VecInStruct {
|
|
v: Vec<u8>,
|
|
}
|
|
let s = VecInStruct { v: vec![1, 2, 3, 0] };
|
|
|
|
let y = Some(()).map(|_| s.v.clone()).unwrap_or(s.v);
|
|
println!("{y:?}");
|
|
}
|
|
}
|