Merged
Conversation
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.
MacArgsis an enum with three variants:Empty,Delimited, andEq. It's used in two ways:AttrItem), where all three variants are used.MacCallandMacroDef), where only theDelimitedvariant is used.In other words,
MacArgsis used in two quite different places due to them having partial overlap. I find this makes the code hard to read. It also leads to various unreachable code paths, and allows invalid values (such as accidentally usingMacArgs::Emptyin aMacCall).This commit splits
MacArgsin two:DelimArgsis a new struct just for the "delimited arguments" case. It is now used inMacCallandMacroDef.AttrArgsis a renaming of the oldMacArgsenum for the attribute macro case. ItsDelimitedvariant now contains aDelimArgs.Various other related things are renamed as well.
These changes make the code clearer, avoids several unreachable paths, and disallows the invalid values.
r? @petrochenkov