Repository navigation
fix: prevent newlines around quotes in macro invocations #7157
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
Open
penguinawesome1
wants to merge
4
commits into
rust-lang:main
Choose a base branch
from
penguinawesome1:macro-string-indent
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
cf7e558
fix: allow single multiline string lit to overflow after long ident
penguinawesome1 26018db
test: ensure call with multiline string wraps on max width and fn cal…
penguinawesome1 0f2d98f
chore: update issue_5029 test directives to new //@ syntax
penguinawesome1 c202318
test: add multiline string cases for function calls
penguinawesome1 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| //@ rustfmt-style_edition: 2027 | ||
|
|
||
| pub const MAC: &str = foo!(" | ||
| foo | ||
| bar | ||
| "); | ||
|
|
||
| pub const SHORT_MAC: &str = f!(" | ||
| foo | ||
| bar | ||
| "); | ||
|
|
||
| pub const LONG_MAC: &str = long_foo!(" | ||
| foo | ||
| bar | ||
| "); | ||
|
|
||
| pub const FUN: &str = foo(" | ||
| foo | ||
| bar | ||
| "); | ||
|
|
||
| pub const SHORT_FUN: &str = f(" | ||
| foo | ||
| bar | ||
| "); | ||
|
|
||
| pub const LONG_FUN: &str = long_foo(" | ||
| foo | ||
| bar | ||
| "); | ||
|
|
||
| pub const BAR: &str = bar!(" | ||
| foo bar | ||
| "); | ||
|
|
||
| pub const BAZ: &str = baz!( | ||
| " | ||
| foo | ||
| bar | ||
| " | ||
| ); | ||
|
|
||
| fn main() { | ||
| let bytes1 = hex!(" | ||
| 00010203 04050607 | ||
| 08090a0b 0c0d0e0f | ||
| "); | ||
| } | ||
|
|
||
| // Default settings: `fn_call_width` is 60. `max_width` is 100. | ||
|
|
||
| // functions: | ||
|
|
||
| // First line string length is 59. Line length is 98. | ||
| pub const ABCDEFGHIJKLMNO: &str = foo("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456 | ||
| next_line | ||
| "); | ||
|
|
||
| // First line string length is 60. Line length is 98. | ||
| pub const ABCDEFGHIJKLMN: &str = foo("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz01234567 | ||
| next_line | ||
| "); | ||
|
|
||
| // First line string length is 59. Line length is 99. | ||
| pub const ABCDEFGHIJKLMNOP: &str = foo("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456 | ||
| next_line | ||
| "); | ||
|
|
||
| // First line string length is 60. Line length is 99. | ||
| pub const ABCDEFGHIJKLMNO: &str = foo("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz01234567 | ||
| next_line | ||
| "); | ||
|
|
||
| // function macros: | ||
|
|
||
| // First line string length is 59. Line length is 98. | ||
| pub const ABCDEFGHIJKLMN: &str = foo!("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456 | ||
| next_line | ||
| "); | ||
|
|
||
| // First line string length is 60. Line length is 98. | ||
| pub const ABCDEFGHIJKLM: &str = foo!("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz01234567 | ||
| next_line | ||
| "); | ||
|
|
||
| // First line string length is 59. Line length is 99. | ||
| pub const ABCDEFGHIJKLMNO: &str = foo!("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456 | ||
| next_line | ||
| "); | ||
|
|
||
| // First line string length is 60. Line length is 99. | ||
| pub const ABCDEFGHIJKLMN: &str = foo!("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz01234567 | ||
| next_line | ||
| "); |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| //@ rustfmt-style_edition: 2027 | ||
|
|
||
| pub const MAC: &str = foo!(" | ||
| foo | ||
| bar | ||
| "); | ||
|
|
||
| pub const SHORT_MAC: &str = f!(" | ||
| foo | ||
| bar | ||
| "); | ||
|
|
||
| pub const LONG_MAC: &str = long_foo!(" | ||
| foo | ||
| bar | ||
| "); | ||
|
|
||
| pub const FUN: &str = foo(" | ||
| foo | ||
| bar | ||
| "); | ||
|
|
||
| pub const SHORT_FUN: &str = f(" | ||
| foo | ||
| bar | ||
| "); | ||
|
|
||
| pub const LONG_FUN: &str = long_foo(" | ||
| foo | ||
| bar | ||
| "); | ||
|
|
||
| pub const BAR: &str = bar!(" | ||
| foo bar | ||
| "); | ||
|
|
||
| pub const BAZ: &str = baz!(" | ||
| foo | ||
| bar | ||
| "); | ||
|
|
||
| fn main() { | ||
| let bytes1 = hex!(" | ||
| 00010203 04050607 | ||
| 08090a0b 0c0d0e0f | ||
| "); | ||
| } | ||
|
|
||
| // Default settings: `fn_call_width` is 60. `max_width` is 100. | ||
|
|
||
| // functions: | ||
|
|
||
| // First line string length is 59. Line length is 98. | ||
| pub const ABCDEFGHIJKLMNO: &str = foo("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456 | ||
| next_line | ||
| "); | ||
|
|
||
| // First line string length is 60. Line length is 98. | ||
| pub const ABCDEFGHIJKLMN: &str = foo( | ||
| "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz01234567 | ||
| next_line | ||
| ", | ||
| ); | ||
|
|
||
| // First line string length is 59. Line length is 99. | ||
| pub const ABCDEFGHIJKLMNOP: &str = | ||
| foo("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456 | ||
| next_line | ||
| "); | ||
|
|
||
| // First line string length is 60. Line length is 99. | ||
| pub const ABCDEFGHIJKLMNO: &str = foo( | ||
| "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz01234567 | ||
| next_line | ||
| ", | ||
| ); | ||
|
|
||
| // function macros: | ||
|
|
||
| // First line string length is 59. Line length is 98. | ||
| pub const ABCDEFGHIJKLMN: &str = foo!("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456 | ||
| next_line | ||
| "); | ||
|
|
||
| // First line string length is 60. Line length is 98. | ||
| pub const ABCDEFGHIJKLM: &str = foo!( | ||
| "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz01234567 | ||
| next_line | ||
| " | ||
| ); | ||
|
|
||
| // First line string length is 59. Line length is 99. | ||
| pub const ABCDEFGHIJKLMNO: &str = | ||
| foo!("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456 | ||
| next_line | ||
| "); | ||
|
|
||
| // First line string length is 60. Line length is 99. | ||
| pub const ABCDEFGHIJKLMN: &str = foo!( | ||
| "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz01234567 | ||
| next_line | ||
| " | ||
| ); |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't we also check that the first line of the string literal fits within
max_width?Can you add some test cases where the first line of the string literal is at exactly the max_width after reformatting and then
max_width + 1.View changes since the review
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I added the test cases, and the formatter moves the string to a new line once the line reaches
max_width - 1.Is this intentional, or possibly a known issue? To my understanding, it should only do that once the line exceeds
max_width.