Format inner attributes #4207
Merged
Format inner attributes #4207
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
| @@ -178,7 +220,6 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> { | |||
| fn insert_sub_mod( | |||
| &mut self, | |||
| sub_mod_kind: SubModKind<'c, 'ast>, | |||
| _sub_mod: Cow<'ast, ast::Mod>, | |||
There was a problem hiding this comment.
Oops! I made this change during a previous rustc-ap-* round to get the code compiling again and forgot to remove this after 🤦♂️
| // FIXME(topecongiro) Format inner attributes (#3606). | ||
| match Parser::parse_inner_attrs(&mut parser) { | ||
| Ok(_attrs) => (), | ||
| match parser.parse_mod(&TokenKind::Eof) { |
| let mut ignore_builder = GitignoreBuilder::new(ignore_list.rustfmt_toml_path()); | ||
| let root = ignore_list | ||
| .rustfmt_toml_path() | ||
| .parent() |
There was a problem hiding this comment.
Looking at this CI failure, I noticed that we are ought to pass a directory to GitignoreBuilder::new, hence this change.
calebcartwright
approved these changes
May 26, 2020
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.
Close #4206.