From 31cb7c6c71b392a556d006f90419b689d027d7cc Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Fri, 13 Feb 2026 15:10:48 +0000
Subject: [PATCH] refactor: simplify NearbyCafeView iterator chain and remove
 unused _addr parameter

- Replace .iter().copied().cloned() with .into_iter() on str slices in
  NearbyCafeView::from
- Remove unused _addr: SocketAddr parameter from run_callback_server
  and its call site in tokens.rs
---
 src/presentation/cli/tokens.rs      | 10 +---------
 src/presentation/web/views/cafes.rs |  6 ++----
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/presentation/cli/tokens.rs b/src/presentation/cli/tokens.rs
index f04de92..ed38b30 100644
--- a/src/presentation/cli/tokens.rs
+++ b/src/presentation/cli/tokens.rs
@@ -1,5 +1,3 @@
-use std::net::SocketAddr;
-
 use anyhow::{Context, Result, anyhow};
 use clap::{Args, Subcommand};
 use tokio::net::TcpListener;
@@ -78,12 +76,7 @@ pub async fn create_token(client: &BrewlogClient, cmd: CreateTokenCommand) -> Re
     let (tx, rx) = oneshot::channel::<String>();
     let expected_state = state.clone();
 
-    let server = tokio::spawn(run_callback_server(
-        listener,
-        local_addr,
-        expected_state,
-        tx,
-    ));
+    let server = tokio::spawn(run_callback_server(listener, expected_state, tx));
 
     // Wait for the token with a timeout
     let token = tokio::select! {
@@ -110,7 +103,6 @@ pub async fn create_token(client: &BrewlogClient, cmd: CreateTokenCommand) -> Re
 
 async fn run_callback_server(
     listener: TcpListener,
-    _addr: SocketAddr,
     expected_state: String,
     tx: oneshot::Sender<String>,
 ) {
diff --git a/src/presentation/web/views/cafes.rs b/src/presentation/web/views/cafes.rs
index e6f6c13..a1bee55 100644
--- a/src/presentation/web/views/cafes.rs
+++ b/src/presentation/web/views/cafes.rs
@@ -151,11 +151,9 @@ impl From<NearbyCafeResult> for NearbyCafeView {
         } else {
             format!("{:.1} km", f64::from(cafe.distance_meters) / 1000.0)
         };
-        let location = [&cafe.city, &cafe.country]
-            .iter()
+        let location = [cafe.city.as_str(), cafe.country.as_str()]
+            .into_iter()
             .filter(|s| !s.is_empty())
-            .copied()
-            .cloned()
             .collect::<Vec<_>>()
             .join(", ");
         Self {