Introduce BoxMarker to improve pretty-printing correctness
#140316
Merged
Conversation
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
rustbot
added
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
|
☔ The latest upstream changes (presumably #140366) made this pull request unmergeable. Please resolve the merge conflicts. |
|
Details in the individual commits. |
dtolnay
reviewed
Apr 28, 2025
The pretty-printers open and close "boxes" of text a lot. The open and close operations must be matched. The matching is currently all implicit and very easy to get wrong. (rust-lang#140280 and rust-lang#140246 are two recent pretty-printing fixes that both involved unclosed boxes.) This commit introduces `BoxMarker`, a marker type that represents an open box. It makes box opening/closing explicit, which makes it much easier to understand and harder to get wrong. The commit also removes many comments are on `end` calls saying things like "end outer head-block", "Close the outer-box". These demonstrate how confusing the implicit approach was, but aren't necessary any more.
They all have a single call site, aren't that big, and removing them avoids having to pass some `BoxMarker`s.
|
I addressed @dtolnay's comments. |
|
@bors r+ |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 28, 2025
…llaumeGomez Rollup of 7 pull requests Successful merges: - rust-lang#140056 (Fix a wrong error message in 2024 edition) - rust-lang#140220 (Fix detection of main function if there are expressions around it) - rust-lang#140249 (Remove `weak` alias terminology) - rust-lang#140316 (Introduce `BoxMarker` to improve pretty-printing correctness) - rust-lang#140347 (ci: clean more disk space in codebuild) - rust-lang#140349 (ci: use aws codebuild for the `dist-x86_64-linux` job) - rust-lang#140379 (rustc-dev-guide subtree update) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 28, 2025
…llaumeGomez Rollup of 7 pull requests Successful merges: - rust-lang#140056 (Fix a wrong error message in 2024 edition) - rust-lang#140220 (Fix detection of main function if there are expressions around it) - rust-lang#140249 (Remove `weak` alias terminology) - rust-lang#140316 (Introduce `BoxMarker` to improve pretty-printing correctness) - rust-lang#140347 (ci: clean more disk space in codebuild) - rust-lang#140349 (ci: use aws codebuild for the `dist-x86_64-linux` job) - rust-lang#140379 (rustc-dev-guide subtree update) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 28, 2025
Rollup merge of rust-lang#140316 - nnethercote:BoxMarker, r=dtolnay Introduce `BoxMarker` to improve pretty-printing correctness Box opening/closing is really easy to get wrong in the pretty-printers. This PR makes it much harder to get wrong. r? `@Urgau`
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.
Box opening/closing is really easy to get wrong in the pretty-printers. This PR makes it much harder to get wrong.
r? @Urgau