Skip to content

Commit 289a1a8

Browse files
committed
Use flat_map instead of chaining map and flatten
Clippy emits: warning: called `map(..).flatten()` on an `Iterator` As suggested, use `flat_map` instead.
1 parent 90ba692 commit 289a1a8

File tree

1 file changed

+5
-12
lines changed

1 file changed

+5
-12
lines changed

src/policy/concrete.rs

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -230,20 +230,13 @@ impl<Pk: MiniscriptKey> Policy<Pk> {
230230
pub fn keys(&self) -> Vec<&Pk> {
231231
match *self {
232232
Policy::Key(ref pk) => vec![pk],
233-
Policy::Threshold(_k, ref subs) => subs
234-
.iter()
235-
.map(|sub| sub.keys())
236-
.flatten()
237-
.collect::<Vec<_>>(),
238-
Policy::And(ref subs) => subs
239-
.iter()
240-
.map(|sub| sub.keys())
241-
.flatten()
242-
.collect::<Vec<_>>(),
233+
Policy::Threshold(_k, ref subs) => {
234+
subs.iter().flat_map(|sub| sub.keys()).collect::<Vec<_>>()
235+
}
236+
Policy::And(ref subs) => subs.iter().flat_map(|sub| sub.keys()).collect::<Vec<_>>(),
243237
Policy::Or(ref subs) => subs
244238
.iter()
245-
.map(|(ref _k, ref sub)| sub.keys())
246-
.flatten()
239+
.flat_map(|(ref _k, ref sub)| sub.keys())
247240
.collect::<Vec<_>>(),
248241
// map all hashes and time
249242
_ => vec![],

0 commit comments

Comments
 (0)