From 04fa5e2719375e789e6ef1984eece96c30a68d66 Mon Sep 17 00:00:00 2001 From: Watermelon <34957838+WatermelonArray@users.noreply.github.com> Date: Thu, 30 Jun 2022 00:04:28 +0100 Subject: [PATCH] Added address reference to CLI output (#556) * Added address reference to CLI output * Stored loopback check address as a variable * Changed other loopback references to the new variable * Fixed mistake on address_string variable * Merge write calls Co-authored-by: Lucien Greathouse --- src/cli/serve.rs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/cli/serve.rs b/src/cli/serve.rs index 9d2aa3434..0e35785e3 100644 --- a/src/cli/serve.rs +++ b/src/cli/serve.rs @@ -67,15 +67,17 @@ fn show_start_message(bind_address: IpAddr, port: u16, color: ColorChoice) -> io let writer = BufferWriter::stdout(color); let mut buffer = writer.buffer(); + let address_string = if bind_address.is_loopback() { + "localhost".to_owned() + } else { + bind_address.to_string() + }; + writeln!(&mut buffer, "Rojo server listening:")?; write!(&mut buffer, " Address: ")?; buffer.set_color(&green)?; - if bind_address.is_loopback() { - writeln!(&mut buffer, "localhost")?; - } else { - writeln!(&mut buffer, "{}", bind_address)?; - } + writeln!(&mut buffer, "{}", address_string)?; buffer.set_color(&ColorSpec::new())?; write!(&mut buffer, " Port: ")?; @@ -88,7 +90,7 @@ fn show_start_message(bind_address: IpAddr, port: u16, color: ColorChoice) -> io write!(&mut buffer, "Visit ")?; buffer.set_color(&green)?; - write!(&mut buffer, "http://localhost:{}/", port)?; + write!(&mut buffer, "http://{}:{}/", address_string, port)?; buffer.set_color(&ColorSpec::new())?; writeln!(&mut buffer, " in your browser for more information.")?;