From d2d5a01522159d85c3ea438f7c2e28ab682ddd1a Mon Sep 17 00:00:00 2001
From: Eric Seppanen <eric@zenith.tech>
Date: Wed, 9 Jun 2021 16:42:57 -0700
Subject: [PATCH] minor clippy fixes

---
 pageserver/src/page_service.rs    | 3 ++-
 pageserver/src/rocksdb_storage.rs | 4 ++--
 zenith_utils/src/pq_proto.rs      | 7 +++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pageserver/src/page_service.rs b/pageserver/src/page_service.rs
index cc801ef7a8..bd5a1841e2 100644
--- a/pageserver/src/page_service.rs
+++ b/pageserver/src/page_service.rs
@@ -458,7 +458,8 @@ impl postgres_backend::Handler for PageServerHandler {
                 .parse()?;
             let timeline = page_cache::get_repository().get_timeline(timeline_id)?;
 
-            let postgres_connection_uri = it.next().ok_or(anyhow!("missing postgres uri"))?;
+            let postgres_connection_uri =
+                it.next().ok_or_else(|| anyhow!("missing postgres uri"))?;
 
             let mut conn = postgres::Client::connect(postgres_connection_uri, postgres::NoTls)?;
             let mut copy_in = conn.copy_in(format!("push {}", timeline_id.to_string()).as_str())?;
diff --git a/pageserver/src/rocksdb_storage.rs b/pageserver/src/rocksdb_storage.rs
index a8903fa4c8..b442053f6c 100644
--- a/pageserver/src/rocksdb_storage.rs
+++ b/pageserver/src/rocksdb_storage.rs
@@ -68,7 +68,7 @@ impl GarbageCollector {
     fn was_deleted(&self, key: &[u8]) -> bool {
         let key = key.to_vec();
         let mut garbage = self.garbage.lock().unwrap();
-        return garbage.remove(&key);
+        garbage.remove(&key)
     }
 }
 
@@ -198,9 +198,9 @@ impl ObjectStore for RocksObjectStore {
         ));
 
         Ok(Box::new(RocksObjects {
+            iter,
             timeline,
             lsn,
-            iter,
         }))
     }
 }
diff --git a/zenith_utils/src/pq_proto.rs b/zenith_utils/src/pq_proto.rs
index e1f43067e5..77d73d50da 100644
--- a/zenith_utils/src/pq_proto.rs
+++ b/zenith_utils/src/pq_proto.rs
@@ -93,10 +93,9 @@ impl FeMessage {
         let len = stream.read_u32::<BE>()?;
 
         // The message length includes itself, so it better be at least 4
-        let bodylen = len.checked_sub(4).ok_or(io::Error::new(
-            io::ErrorKind::InvalidInput,
-            "invalid message length: parsing u32",
-        ))?;
+        let bodylen = len
+            .checked_sub(4)
+            .ok_or_else(|| anyhow!("invalid message length: parsing u32"))?;
 
         // Read message body
         let mut body_buf: Vec<u8> = vec![0; bodylen as usize];