-
Notifications
You must be signed in to change notification settings - Fork 12.8k
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.
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
Pretty print break and continue without redundant space #91568
Merged
Merged
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
r? @nagisa (rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
label
Dec 5, 2021
@bors r+ |
📌 Commit abb8893 has been approved by |
bors
added
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
and removed
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
Dec 8, 2021
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Dec 8, 2021
Pretty print break and continue without redundant space **Repro:** ```rust macro_rules! m { ($e:expr) => { stringify!($e) }; } fn main() { println!("{:?}", m!(loop { break; })); println!("{:?}", m!(loop { break 'a; })); println!("{:?}", m!(loop { break false; })); } ``` **Before:** - `"loop { break ; }"` - `"loop { break 'a ; }"` - `"loop { break false ; }"` **After:** - `"loop { break; }"` - `"loop { break 'a; }"` - `"loop { break false; }"` <br> Notice that `return` and `yield` already follow the same approach as this PR of printing the space *before* each additional piece following the keyword, rather than *after* each thing. https://github.com/rust-lang/rust/blob/772d51f887fa407216860bf8ecf3f1a32fb795b4/compiler/rustc_ast_pretty/src/pprust/state.rs#L2148-L2154 https://github.com/rust-lang/rust/blob/772d51f887fa407216860bf8ecf3f1a32fb795b4/compiler/rustc_ast_pretty/src/pprust/state.rs#L2221-L2228
This was referenced Dec 8, 2021
☔ The latest upstream changes (presumably #91665) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
and removed
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
labels
Dec 8, 2021
|
@bors r=nagisa |
📌 Commit f0f7b8d has been approved by |
bors
added
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
and removed
S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
labels
Dec 8, 2021
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 9, 2021
…askrgr Rollup of 5 pull requests Successful merges: - rust-lang#91245 (suggest casting between i/u32 and char) - rust-lang#91337 (Add a suggestion if `macro_rules` is misspelled) - rust-lang#91534 (Make rustdoc headings black, and markdown blue) - rust-lang#91637 (Add test for packed drops in generators) - rust-lang#91667 (Fix indent of itemTypes in search.js) Failed merges: - rust-lang#91568 (Pretty print break and continue without redundant space) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 9, 2021
…askrgr Rollup of 5 pull requests Successful merges: - rust-lang#91042 (Use Vec extend instead of repeated pushes on several places) - rust-lang#91476 (Improve 'cannot contain emoji' error.) - rust-lang#91568 (Pretty print break and continue without redundant space) - rust-lang#91645 (Implement `core::future::join!`) - rust-lang#91666 (update Miri) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Dec 28, 2021
…acrum Add a test suite for stringify macro This attempts to cover the behavior of `stringify!` on various interpolated syntax tree nodes. The pretty printer has a history of unsightly whitespace (double spaces, missing spaces, spaces where there shouldn't be spaces) — rust-lang#91437, rust-lang#91562, rust-lang#91568. There are several such issues left; the test cases that I consider to be currently behaving incorrectly are marked with `// FIXME` in the PR.
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Dec 28, 2021
…acrum Add a test suite for stringify macro This attempts to cover the behavior of `stringify!` on various interpolated syntax tree nodes. The pretty printer has a history of unsightly whitespace (double spaces, missing spaces, spaces where there shouldn't be spaces) — rust-lang#91437, rust-lang#91562, rust-lang#91568. There are several such issues left; the test cases that I consider to be currently behaving incorrectly are marked with `// FIXME` in the PR.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
A-pretty
Area: Pretty printing (including `-Z unpretty`)
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
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.
Repro:
Before:
"loop { break ; }"
"loop { break 'a ; }"
"loop { break false ; }"
After:
"loop { break; }"
"loop { break 'a; }"
"loop { break false; }"
Notice that
return
andyield
already follow the same approach as this PR of printing the space before each additional piece following the keyword, rather than after each thing.rust/compiler/rustc_ast_pretty/src/pprust/state.rs
Lines 2148 to 2154 in 772d51f
rust/compiler/rustc_ast_pretty/src/pprust/state.rs
Lines 2221 to 2228 in 772d51f