Make the JSON and checkstyle emitters work with stdin #3894
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
…or other --emit values.
be defaulted depending on the mode.
I've added #[rustfmt::skip] to a couple of long lines; this would probably be better as test files rather than inline.
src/test/mod.rs
Outdated
| init_log(); | ||
| let input = "\nfn\n some( )\n{\n}\nfn main () {}\n"; | ||
| #[rustfmt::skip] | ||
| let output = r#"[{"name":"stdin","mismatches":[{"original_begin_line":1,"original_end_line":6,"expected_begin_line":1,"expected_end_line":2,"original":"\nfn\n some( )\n{\n}\nfn main () {}","expected":"fn some() {}\nfn main() {}"}]}]"#; |
There was a problem hiding this comment.
Re: your question on the other thread, some of the tests for these emitters are already leveraging a separate file with the json/xml/etc. output for the exp values.
For example:
Lines 216 to 222 in 9543838
Those files with the exp output reside in https://github.com/rust-lang/rustfmt/tree/master/tests/writemode/target
There was a problem hiding this comment.
Thanks - I've added an assert_stdin_output which is similar and moved those ugly string literals into test files.
|
Closing in favor of #3896. |
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.
This is further work on #3871.
The JSON and checkstyle emitters now work and are tested.
The tests have some very long string literals (the JSON and checkstyle output); I guess those would be better loading from files instead? I'm assuming
#[rustfmt::skip]is frowned on in rustfmt.