From 980d3ba8b0c161269668984efbac88055c724beb Mon Sep 17 00:00:00 2001
From: John Spray <john@neon.tech>
Date: Tue, 29 Aug 2023 15:35:52 +0100
Subject: [PATCH] clippy

---
 libs/utils/src/generation.rs                             | 2 +-
 pageserver/src/tenant/remote_timeline_client.rs          | 9 ++++-----
 pageserver/src/tenant/remote_timeline_client/download.rs | 4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/libs/utils/src/generation.rs b/libs/utils/src/generation.rs
index 33594f383f..7deb98f750 100644
--- a/libs/utils/src/generation.rs
+++ b/libs/utils/src/generation.rs
@@ -55,7 +55,7 @@ impl Generation {
         if self.0 == Self::NONE {
             "".into()
         } else {
-            format!("-{:08x}", self.0).into()
+            format!("-{:08x}", self.0)
         }
     }
 }
diff --git a/pageserver/src/tenant/remote_timeline_client.rs b/pageserver/src/tenant/remote_timeline_client.rs
index 71589a0581..cf51194d07 100644
--- a/pageserver/src/tenant/remote_timeline_client.rs
+++ b/pageserver/src/tenant/remote_timeline_client.rs
@@ -660,7 +660,7 @@ impl RemoteTimelineClient {
             // makes that are unexpectedly missing from our metadata.
             let with_generations: Vec<_> = names
                 .iter()
-                .map(|name| {
+                .filter_map(|name| {
                     // Remove from latest_files, learning the file's remote generation in the process
                     let meta = upload_queue.latest_files.remove(name);
 
@@ -672,11 +672,10 @@ impl RemoteTimelineClient {
                         None
                     } else {
                         upload_queue.latest_files_changes_since_metadata_upload_scheduled += 1;
-                        let generation = meta.map(|m| m.generation).flatten();
+                        let generation = meta.and_then(|m| m.generation);
                         Some((name, generation))
                     }
                 })
-                .filter_map(|i| i)
                 .collect();
 
             if upload_queue.latest_files_changes_since_metadata_upload_scheduled > 0 {
@@ -689,7 +688,7 @@ impl RemoteTimelineClient {
                     file_kind: RemoteOpFileKind::Layer,
                     layer_file_name: name.clone(),
                     scheduled_from_timeline_delete: false,
-                    generation: generation,
+                    generation,
                 });
                 self.calls_unfinished_metric_begin(&op);
                 upload_queue.queued_operations.push_back(op);
@@ -1577,7 +1576,7 @@ mod tests {
                 runtime: tokio::runtime::Handle::current(),
                 tenant_id: harness.tenant_id,
                 timeline_id: TIMELINE_ID,
-                generation: generation,
+                generation,
                 storage_impl: storage,
                 upload_queue: Mutex::new(UploadQueue::Uninitialized),
                 metrics: Arc::new(RemoteTimelineClientMetrics::new(
diff --git a/pageserver/src/tenant/remote_timeline_client/download.rs b/pageserver/src/tenant/remote_timeline_client/download.rs
index 087f6be58c..8f8dba2863 100644
--- a/pageserver/src/tenant/remote_timeline_client/download.rs
+++ b/pageserver/src/tenant/remote_timeline_client/download.rs
@@ -173,8 +173,8 @@ pub fn is_temp_download_file(path: &Path) -> bool {
 }
 
 /// List timelines of given tenant in remote storage
-pub async fn list_remote_timelines<'a>(
-    storage: &'a GenericRemoteStorage,
+pub async fn list_remote_timelines(
+    storage: &GenericRemoteStorage,
     tenant_id: TenantId,
 ) -> anyhow::Result<HashSet<TimelineId>> {
     let remote_path = remote_timelines_path(&tenant_id);