cli: Introduce write_labeled! template formatter macro
#4539
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Veykril
force-pushed
the
veykril/push-zoouknwvtors
branch
from
66f0460 to
e185b4f
Compare
Veykril
commented
Sep 26, 2024
| @@ -384,14 +385,14 @@ fn write_modified_change_summary( | |||
| ) -> Result<(), std::io::Error> { | |||
| writeln!(formatter, "Change {}", short_change_hash(change_id))?; | |||
| for commit in modified_change.added_commits.iter() { | |||
| formatter.with_label("diff", |formatter| write!(formatter.labeled("added"), "+"))?; | |||
| formatter.with_label("diff", |formatter| write_labeled!(formatter, "added", "+"))?; | |||
There was a problem hiding this comment.
Interesting one being nested. Could make the macro accept something like
Suggested change
| formatter.with_label("diff", |formatter| write_labeled!(formatter, "added", "+"))?; | |
| write_labeled!(formatter, "diff" & "added", "+")?; |
There was a problem hiding this comment.
label string could be separated by whitespace (and split by formatter.labeled()), but I don't know if we like it.
yuja
reviewed
Sep 26, 2024
| @@ -775,12 +776,12 @@ fn print_error_sources(ui: &Ui, source: Option<&dyn error::Error>) -> io::Result | |||
| ui.stderr_formatter() | |||
| .with_label("error_source", |formatter| { | |||
| if err.source().is_none() { | |||
| write!(formatter.labeled("heading"), "Caused by: ")?; | |||
| write_labeled!(formatter, "heading", "Caused by: ")?; | |||
There was a problem hiding this comment.
I like the original code because it's clearer which string literal is a label.
| @@ -384,14 +385,14 @@ fn write_modified_change_summary( | |||
| ) -> Result<(), std::io::Error> { | |||
| writeln!(formatter, "Change {}", short_change_hash(change_id))?; | |||
| for commit in modified_change.added_commits.iter() { | |||
| formatter.with_label("diff", |formatter| write!(formatter.labeled("added"), "+"))?; | |||
| formatter.with_label("diff", |formatter| write_labeled!(formatter, "added", "+"))?; | |||
There was a problem hiding this comment.
label string could be separated by whitespace (and split by formatter.labeled()), but I don't know if we like it.
|
I personally don't like the macro variant, as it doesn't improve the readability of the code. |
|
Fair, I am indifferent to the change so mainly opened it to see opinions. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Mainly an experiment to see if this looks more readable / uniform.
Checklist
If applicable:
CHANGELOG.md