clippy::filter_map_identity

This commit is contained in:
Matthias Krüger 2021-07-21 21:53:45 +02:00
parent 066eb6ab5d
commit 053aedce2c
3 changed files with 3 additions and 4 deletions

View File

@ -476,7 +476,7 @@ impl<T> PerNS<Option<T>> {
/// Returns an iterator over the items which are `Some`.
pub fn present_items(self) -> impl Iterator<Item = T> {
IntoIter::new([self.type_ns, self.value_ns, self.macro_ns]).filter_map(|it| it)
IntoIter::new([self.type_ns, self.value_ns, self.macro_ns]).flatten()
}
}

View File

@ -1107,8 +1107,7 @@ impl<'a> Parser<'a> {
e
})?;
let enum_definition =
EnumDef { variants: variants.into_iter().filter_map(|v| v).collect() };
let enum_definition = EnumDef { variants: variants.into_iter().flatten().collect() };
Ok((id, ItemKind::Enum(enum_definition, generics)))
}

View File

@ -791,7 +791,7 @@ fn fn_sig_suggestion<'tcx>(
})
})
.chain(std::iter::once(if sig.c_variadic { Some("...".to_string()) } else { None }))
.filter_map(|arg| arg)
.flatten()
.collect::<Vec<String>>()
.join(", ");
let output = sig.output();