Skip to content

syntax: integrate TokenStream #40202

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 6 commits into from
Mar 4, 2017
Merged

syntax: integrate TokenStream #40202

merged 6 commits into from
Mar 4, 2017

Conversation

@jseyfried
Copy link
Contributor

@jseyfried jseyfried commented Mar 2, 2017 •
edited
Loading

Use TokenStream instead of Vec<TokenTree> in TokenTree::Delimited and elsewhere.
r? @nrc

@jseyfried jseyfried mentioned this pull request Mar 2, 2017
Closed
31 tasks
@jseyfried
Copy link
Contributor Author

jseyfried commented Mar 2, 2017

cc #38356
cc @abonander @keeperofdakeys

abonander
abonander reviewed Mar 2, 2017
View reviewed changes
src/libsyntax/util/parser_testing.rs Outdated
Copy link
Contributor

@abonander abonander Mar 2, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will this filename appear anywhere? If so, it might be a good idea to use something more meaningful.

Copy link
Contributor Author

@jseyfried jseyfried Mar 2, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No -- this is only used in internal unit tests.

nrc
nrc approved these changes Mar 2, 2017
View reviewed changes
Copy link
Member

@nrc nrc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me with the renaming and comments

src/libsyntax/parse/parser.rs Outdated
Copy link
Member

@nrc nrc Mar 2, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: as a field name this is a bit uninformative, it would be good to have an indication of what this is a cursor over

src/libsyntax/parse/parser.rs Outdated
Copy link
Member

@nrc nrc Mar 2, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this could also have a more informative name I think - TokenCursor or something?

Copy link
Contributor Author

@jseyfried jseyfried Mar 2, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, TokenCursor sounds good.

src/libsyntax/tokenstream.rs Outdated
Copy link
Member

@nrc nrc Mar 2, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be good to have a comment describing what this is and where it should be used.

Copy link
Contributor Author

@jseyfried jseyfried Mar 2, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will do.

@jseyfried jseyfried force-pushed the integrate_tokenstream branch from 710e2c0 to 0d55413 Compare March 3, 2017 02:16
@jseyfried
Copy link
Contributor Author

jseyfried commented Mar 3, 2017

@bors r=nrc

@bors
Copy link
Collaborator

bors commented Mar 3, 2017

📌 Commit 0d55413 has been approved by nrc

@bors
Copy link
Collaborator

bors commented Mar 3, 2017

⌛ Testing commit 0d55413 with merge bd77267...

@bors
Copy link
Collaborator

bors commented Mar 3, 2017

💔 Test failed - status-travis

@alexcrichton
Copy link
Member

alexcrichton commented Mar 3, 2017 via email

@bors
Copy link
Collaborator

bors commented Mar 4, 2017

⌛ Testing commit 0d55413 with merge be304af...

bors added a commit that referenced this pull request Mar 4, 2017
@bors
Auto merge of #40202 - jseyfried:integrate_tokenstream, r=nrc
be304af 
syntax: integrate `TokenStream`

Use `TokenStream` instead of `Vec<TokenTree>` in `TokenTree::Delimited` and elsewhere.
r? @nrc
@bors
Copy link
Collaborator

bors commented Mar 4, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: nrc
Pushing be304af to master...

@bors bors merged commit 0d55413 into rust-lang:master Mar 4, 2017
@bors bors mentioned this pull request Mar 4, 2017
Merged
@jseyfried jseyfried deleted the integrate_tokenstream branch March 8, 2017 05:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@abonander abonander abonander left review comments

@nrc nrc nrc approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@nrc nrc

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@jseyfried @bors @alexcrichton @nrc @abonander