Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move token gluing to token stream parsing #63709

Merged
merged 2 commits into from
Aug 20, 2019

Conversation

matklad
Copy link
Member

@matklad matklad commented Aug 19, 2019

work towards #63689, this moves token gluing from the lexer to the token tree layer. This is only a minimal step, but I like the negative diff here.

r? @petrochenkov

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 19, 2019
@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Aug 19, 2019

📌 Commit 0048fe322ce4030f26cb1ed21bcb7bba16207ea6 has been approved by petrochenkov

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 19, 2019
@rust-highfive

This comment has been minimized.

@Centril

This comment has been minimized.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 19, 2019
@matklad
Copy link
Member Author

matklad commented Aug 19, 2019

@bors r=petrochenkov

@bors
Copy link
Contributor

bors commented Aug 19, 2019

📌 Commit 914e1f4 has been approved by petrochenkov

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 19, 2019
Centril added a commit to Centril/rust that referenced this pull request Aug 20, 2019
…henkov

Move token gluing to token stream parsing

work towards rust-lang#63689, this moves token gluing from the lexer to the token tree layer. This is only a minimal step, but I like the negative diff here.

r? @petrochenkov
@bors
Copy link
Contributor

bors commented Aug 20, 2019

⌛ Testing commit 914e1f4 with merge 1489095...

bors added a commit that referenced this pull request Aug 20, 2019
Move token gluing to token stream parsing

work towards #63689, this moves token gluing from the lexer to the token tree layer. This is only a minimal step, but I like the negative diff here.

r? @petrochenkov
@bors
Copy link
Contributor

bors commented Aug 20, 2019

☀️ Test successful - checks-azure
Approved by: petrochenkov
Pushing 1489095 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 20, 2019
@bors bors merged commit 914e1f4 into rust-lang:master Aug 20, 2019
@matklad matklad deleted the decomposed-tokens branch August 20, 2019 12:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants