1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
|
//@aux-build:option_helpers.rs
//@no-rustfix
#![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)
//~^ map_unwrap_or
// Should lint even though this call is on a separate line.
.unwrap_or(0);
// Multi-line cases.
let _ = opt.map(|x| {
//~^ map_unwrap_or
x + 1
}
).unwrap_or(0);
let _ = opt.map(|x| x + 1)
//~^ map_unwrap_or
.unwrap_or({
0
});
// Single line `map(f).unwrap_or(None)` case.
let _ = opt.map(|x| Some(x + 1)).unwrap_or(None);
//~^ map_unwrap_or
// Multi-line `map(f).unwrap_or(None)` cases.
let _ = opt.map(|x| {
//~^ map_unwrap_or
Some(x + 1)
}
).unwrap_or(None);
let _ = opt
//~^ map_unwrap_or
.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);
//~^ map_unwrap_or
// Check for `option.map(_).unwrap_or_else(_)` use.
// Multi-line cases.
let _ = opt.map(|x| {
//~^ map_unwrap_or
x + 1
}
).unwrap_or_else(|| 0);
let _ = opt.map(|x| x + 1)
//~^ map_unwrap_or
.unwrap_or_else(||
0
);
// Check for `map(f).unwrap_or(false)` use.
let _ = opt.map(|x| x > 5).unwrap_or(false);
//~^ map_unwrap_or
}
#[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| {
//~^ map_unwrap_or
x + 1
}
).unwrap_or_else(|_e| 0);
let _ = res.map(|x| x + 1)
//~^ map_unwrap_or
.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);
//~^ map_unwrap_or
}
#[clippy::msrv = "1.69"]
fn msrv_1_69() {
let opt: Option<i32> = Some(1);
let _ = opt.map(|x| x > 5).unwrap_or(false);
//~^ map_unwrap_or
}
#[clippy::msrv = "1.70"]
fn msrv_1_70() {
let opt: Option<i32> = Some(1);
let _ = opt.map(|x| x > 5).unwrap_or(false);
//~^ map_unwrap_or
}
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:?}");
}
}
|
