Change format_snippet to return None when it has failed to format macro call #2775
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
|
There's a few test failures, but r+ with those fixed |
|
Thank you for you review! I have fixed the test failures. N.B. rustfmt is now unable to format code block with invalid syntax macro calls, like the one in tests/target/issue-2523.rs. |
t-botz
reviewed
Jun 9, 2018
| where | ||
| F: FnMut(&FileName, &mut String, &[(usize, usize)], &FormatReport) -> Result<bool, io::Error>, | ||
| { | ||
| let mut result = FileMap::new(); | ||
| // diff mode: check if any files are differing | ||
| let mut has_diff = false; | ||
| let mut has_macro_rewrite_failure = false; |
There was a problem hiding this comment.
@topecongiro @nrc
Shouldn't has_macro_rewrite_failure be part of the FormatReport instead?
IMO That should be a new ErrorKind
There was a problem hiding this comment.
I figure the two will get merged in some way, so it doesn't really matter what we do right now
Closed
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.
rustfmt manually adds/removes indentation when trying to format macro def's body. This does not work when the macro body contains a macro call that rustfmt cannot format, and causes an issue like #2607 or #2770. This PR fixes it by changing the
format_snippetto returnNonewhen it has failed to format the macro call in the snippet.Closes #2607.
Closes #2770.