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::(); 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, ) { 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 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::>() .join(", "); Self {