From 350a8ddb8aa3206b7f2d1a16f0ab84b5a633d846 Mon Sep 17 00:00:00 2001 From: "Dr. Matthias Ratajczak" Date: Wed, 4 Jan 2023 13:43:30 +0100 Subject: [PATCH] fix trailing empty line --- src/lib.rs | 1 + src/main.rs | 7 +++---- src/response.rs | 6 +++++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index f895d80..850a4f8 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -2,3 +2,4 @@ mod query; pub mod response; pub use query::query_server; +pub use response::format_departures; diff --git a/src/main.rs b/src/main.rs index 3b9f39c..78ff66c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,11 +1,10 @@ use anyhow::Result; -use departure::query_server; +use departure::{format_departures, query_server}; fn main() -> Result<()> { let response = query_server()?; - for dep in response.departures { - println!("{dep}"); - } + let formatted = format_departures(response); + println!("{formatted}"); Ok(()) } diff --git a/src/response.rs b/src/response.rs index af3fd40..d3bd135 100644 --- a/src/response.rs +++ b/src/response.rs @@ -64,7 +64,11 @@ impl Display for Departure { f.write_str(&format!(" | delayed: {actual_time} "))?; } } - f.write_str("\n")?; Ok(()) } } + +pub fn format_departures(response: Response) -> String { + let departures: Vec = response.departures.iter().map(|d| d.to_string()).collect(); + departures.join("\n\n") +}