Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added address reference to CLI output #556

Merged
merged 7 commits into from
Jun 29, 2022
Merged

Added address reference to CLI output #556

Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
59079c5
Added address reference to CLI output
WatermelonArray Jun 14, 2022
bc13a0d
Stored loopback check address as a variable
WatermelonArray Jun 14, 2022
9f72a5b
Changed other loopback references to the new variable
WatermelonArray Jun 14, 2022
05d655a
Fixed mistake on address_string variable
WatermelonArray Jun 14, 2022
bf6a0dd
Merge branch 'master' into CLIAddressFix
LPGhatguy Jun 29, 2022
ab2f8f0
Merge write calls
LPGhatguy Jun 29, 2022
20ca54d
Merge branch 'master' into CLIAddressFix
LPGhatguy Jun 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/cli/serve.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,14 @@ 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"} else {stringify!(bind_address)};
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

stringify! is definitely not what you want here, it's just going to return "bind_address" itself.

Change "localhost" to "localhost".to_owned(), and the other side to bind_address.to_string().

Then run cargo fmt, since this is going to fail that test 😛

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I tried doing that before but my rust linter was saying that .to_string() wasn't a function in the struct.
Turns out my linter is slow and didn't catch up when I was trying to debug it! So I just tried using stringify!() and the problem went away - forgot that stringify!() does not do what I was trying to.

Anyway, sorted!


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: ")?;
Expand All @@ -88,7 +86,10 @@ 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)?;

buffer.set_color(&green)?;
write!(&mut buffer, "{}/", port)?;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's merge these calls together. You can pass multiple arguments into the same format string, something like this should work:

write!(&mut buffer, "http://{}:{}/", address_string, port)?;


buffer.set_color(&ColorSpec::new())?;
writeln!(&mut buffer, " in your browser for more information.")?;
Expand Down