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

Factor TokenTrees into their own file in preparation for TokenStreams. #34044

Closed
wants to merge 0 commits into from

Conversation

cgswords
Copy link
Contributor

@cgswords cgswords commented Jun 2, 2016

syntax-[breaking-change] cc #31645
(Only breaking because ast::TokenTree is now tokenstream::TokenTree.)

This pull request refactors TokenTrees into their own file as src/libsyntax/tokenstream.rs, moving them out of src/libsyntax/ast.rs, in order to prepare for an accompanying TokenStream implementation (per RFC 1566).

r? @nrc

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @nrc (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@cgswords
Copy link
Contributor Author

cgswords commented Jun 2, 2016

Travis build failure seems unrelated to code; failed on an apt-get update.

@GuillaumeGomez
Copy link
Member

@cgswords: Don't worry, travis is broken for the moment.

use print::pprust;
use ptr::P;
use tokenstream::{TokenTree};
Copy link
Contributor

Choose a reason for hiding this comment

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

Would a pub use here avoid the breakage?

@nrc
Copy link
Member

nrc commented Jun 7, 2016

r=me with the formatting nit addressed and the tests fixed.

@cgswords
Copy link
Contributor Author

cgswords commented Jun 9, 2016

Formatting and tests are fixed.

@bors
Copy link
Contributor

bors commented Jun 17, 2016

☔ The latest upstream changes (presumably #34272) made this pull request unmergeable. Please resolve the merge conflicts.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants