Skip to content

Commit 4d497dd

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 eea3eec commit 4d497dd

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
@@ -232,20 +232,13 @@ impl<Pk: MiniscriptKey> Policy<Pk> {
232232
pub fn keys(&self) -> Vec<&Pk> {
233233
match *self {
234234
Policy::Key(ref pk) => vec![pk],
235-
Policy::Threshold(_k, ref subs) => subs
236-
.iter()
237-
.map(|sub| sub.keys())
238-
.flatten()
239-
.collect::<Vec<_>>(),
240-
Policy::And(ref subs) => subs
241-
.iter()
242-
.map(|sub| sub.keys())
243-
.flatten()
244-
.collect::<Vec<_>>(),
235+
Policy::Threshold(_k, ref subs) => {
236+
subs.iter().flat_map(|sub| sub.keys()).collect::<Vec<_>>()
237+
}
238+
Policy::And(ref subs) => subs.iter().flat_map(|sub| sub.keys()).collect::<Vec<_>>(),
245239
Policy::Or(ref subs) => subs
246240
.iter()
247-
.map(|(ref _k, ref sub)| sub.keys())
248-
.flatten()
241+
.flat_map(|(ref _k, ref sub)| sub.keys())
249242
.collect::<Vec<_>>(),
250243
// map all hashes and time
251244
_ => vec![],

0 commit comments

Comments
 (0)