From 379f6b8638e6adbf41c15dc4a822b971b8aef0ba Mon Sep 17 00:00:00 2001
From: Konstantin Knizhnik <knizhnik@garret.ru>
Date: Tue, 21 Sep 2021 16:52:44 +0300
Subject: [PATCH] Fix clippy errors

---
 walkeeper/src/timeline.rs | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/walkeeper/src/timeline.rs b/walkeeper/src/timeline.rs
index d593d9f619..12d17f5f43 100644
--- a/walkeeper/src/timeline.rs
+++ b/walkeeper/src/timeline.rs
@@ -36,6 +36,12 @@ pub struct ReplicaState {
     pub hs_feedback: HotStandbyFeedback,
 }
 
+impl Default for ReplicaState {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl ReplicaState {
     pub fn new() -> ReplicaState {
         ReplicaState {
@@ -71,15 +77,12 @@ impl SharedState {
     /// Get combined stateof all alive replicas
     pub fn get_replicas_state(&self) -> ReplicaState {
         let mut acc = ReplicaState::new();
-        for replica in &self.replicas {
-            if let Some(state) = replica {
-                acc.hs_feedback.ts = max(acc.hs_feedback.ts, state.hs_feedback.ts);
-                acc.hs_feedback.xmin = min(acc.hs_feedback.xmin, state.hs_feedback.xmin);
-                acc.hs_feedback.catalog_xmin =
-                    min(acc.hs_feedback.catalog_xmin, state.hs_feedback.catalog_xmin);
-                acc.disk_consistent_lsn =
-                    Lsn::min(acc.disk_consistent_lsn, state.disk_consistent_lsn);
-            }
+        for state in self.replicas.iter().flatten() {
+            acc.hs_feedback.ts = max(acc.hs_feedback.ts, state.hs_feedback.ts);
+            acc.hs_feedback.xmin = min(acc.hs_feedback.xmin, state.hs_feedback.xmin);
+            acc.hs_feedback.catalog_xmin =
+                min(acc.hs_feedback.catalog_xmin, state.hs_feedback.catalog_xmin);
+            acc.disk_consistent_lsn = Lsn::min(acc.disk_consistent_lsn, state.disk_consistent_lsn);
         }
         acc
     }