mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-11 18:04:18 +00:00
Update to Rust 1.59 and 2021 edition (#3038)
## Proposed Changes Lots of lint updates related to `flat_map`, `unwrap_or_else` and string patterns. I did a little more creative refactoring in the op pool, but otherwise followed Clippy's suggestions. ## Additional Info We need this PR to unblock CI.
This commit is contained in:
@@ -560,9 +560,8 @@ impl<T: EthSpec> OperationPool<T> {
|
||||
pub fn get_all_attestations(&self) -> Vec<Attestation<T>> {
|
||||
self.attestations
|
||||
.read()
|
||||
.iter()
|
||||
.map(|(_, attns)| attns.iter().cloned())
|
||||
.flatten()
|
||||
.values()
|
||||
.flat_map(|attns| attns.iter().cloned())
|
||||
.collect()
|
||||
}
|
||||
|
||||
@@ -575,10 +574,10 @@ impl<T: EthSpec> OperationPool<T> {
|
||||
{
|
||||
self.attestations
|
||||
.read()
|
||||
.iter()
|
||||
.map(|(_, attns)| attns.iter().cloned())
|
||||
.flatten()
|
||||
.filter(filter)
|
||||
.values()
|
||||
.flat_map(|attns| attns.iter())
|
||||
.filter(|attn| filter(*attn))
|
||||
.cloned()
|
||||
.collect()
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user