Simplify LazyAttrTokenStream#127516
Merged
bors merged 3 commits intorust-lang:masterfrom Apr 30, 2025
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.
LazyAttrTokenStreamis an unpleasant type:Lrc<Box<dyn ToAttrTokenStream>>. Why does it look like that?ToAttrTokenStreamimpls, one for the lazy case, and one for the case where we already have anAttrTokenStream.LazyAttrTokenStreamImpl) is implemented inrustc_parse, butLazyAttrTokenStreamis defined inrustc_ast, which does not depend onrustc_parse. The use of the trait letsrustc_astimplicitly depend onrustc_parse. This explains thedyn.LazyAttrTokenStreammust have asize_ofas small as possible, because it's used in many AST nodes. This explains theLrc<Box<_>>, which keeps it to one word. (It's requiredLrc<dyn _>would be a fat pointer.)This PR moves
LazyAttrTokenStreamImpl(and a few other token stream things) fromrustc_parsetorustc_ast. This lets us replace theToAttrTokenStreamtrait with a two-variant enum and also remove theBox, changingLazyAttrTokenStreamtoLrc<LazyAttrTokenStreamInner>. Plus it does a few cleanups.r? @petrochenkov