pr: write all characters in each row in a single loop - #10475
Open
jfinkels wants to merge 5 commits into
Open
Conversation
Remove some unneeded parameters from the `get_line_for_printing()` helper function since the values are already contained in the `OutputOptions` parameter.
Write the contents of the entire row to a single String before writing the full row to stdout. Before this commit, each cell was put in its own String and then that String was written to stdout before moving on to the next cell in the row. After this commit, the contents of each cell in a row is appended to a single String, and that String is written to stdout only after all cells in the row have been processed. This change will make it much easier to make improvements to the logic of which characters to write at each point in the row, since the current logic does not match the output GNU `pr` very well. For example, the decision about whether to write a tab or multiple spaces requires knowing how many characters have been written in the current row, which was not easily accessible before.
jfinkels
force-pushed
the
pr-format-row
branch
from
January 25, 2026 15:32
7291b8f to
13690b7
Compare
|
GNU testsuite comparison: |
jfinkels
marked this pull request as ready for review
January 25, 2026 16:40
ChrisDryden
reviewed
Jan 25, 2026
| if cell.is_none() && !merge { | ||
| out.write_all(result.as_bytes())?; | ||
| out.write_all(options.content_line_separator.as_bytes())?; | ||
| return Ok(false); |
Collaborator
There was a problem hiding this comment.
In the docs it says that "A bool indicating whether printing terminated early due to a" and here its false instead of true I think this is swapped
Collaborator
Author
There was a problem hiding this comment.
Thanks. I'll try to cook up the missing test case to cover this.
ChrisDryden
reviewed
Jan 25, 2026
|
|
||
| // Finally, terminate the line with the specified separator. | ||
| out.write_all(options.content_line_separator.as_bytes())?; | ||
| Ok(true) |
Collaborator
There was a problem hiding this comment.
Same for swapping this
ChrisDryden
reviewed
Jan 25, 2026
| // If the cell is None, terminate the line early. | ||
| if cell.is_none() && !merge { | ||
| out.write_all(result.as_bytes())?; | ||
| out.write_all(options.content_line_separator.as_bytes())?; |
Collaborator
There was a problem hiding this comment.
I don't think we can determine if the content_line_seperator is written here, because that depends on the terminated_early variable used by the caller of this method since it should only be printed if "feed_line_present" is not equal to true
ChrisDryden
reviewed
Jan 25, 2026
| result.push(' '); | ||
| } | ||
| } | ||
| result.truncate(col_start + min_width); |
Collaborator
There was a problem hiding this comment.
Here its truncating by bytes not by characters:
let prefix: String = result[..col_start].to_string();
let cell_truncated: String = result[col_start..].chars().take(min_width).collect();
result = prefix + &cell_truncated;
|
GNU testsuite comparison: |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Depends on #10474
Write the contents of the entire row to a single String before writing the full row to stdout. Before this commit, each cell was put in its own String and then that String was written to stdout before moving on to the next cell in the row. After this commit, the contents of each cell in a row is appended to a single String, and that String is written to stdout only after all cells in the row have been processed.
This change will make it much easier to make improvements to the logic of which characters to write at each point in the row, since the current logic does not match the output GNU
prvery well. For example, the decision about whether to write a tab or multiple spaces requires knowing how many characters have been written in the current row, which was not easily accessible before.