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

Run rustfmt and add doc comments to libsyntax/ext/tt/macro_parser.rs #47732

Merged
merged 7 commits into from
Jan 30, 2018

Conversation

mark-i-m
Copy link
Member

Similar to #47603

cc @theotherphil since you reviewed my other PR 😄

And because they are already assigned on #47603:

r? @arielb1

@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 @arielb1 (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.

@kennytm kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 26, 2018
@bors
Copy link
Contributor

bors commented Jan 26, 2018

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

@arielb1
Copy link
Contributor

arielb1 commented Jan 29, 2018

r? @jsseyfried

@arielb1
Copy link
Contributor

arielb1 commented Jan 29, 2018

r? @jseyfried

@rust-highfive rust-highfive assigned jseyfried and unassigned arielb1 Jan 29, 2018
#[derive(Clone)]
enum TokenTreeOrTokenTreeVec {
Tt(TokenTree),
TtSeq(Vec<TokenTree>),
}

impl TokenTreeOrTokenTreeVec {
/// Returns the number of constituent token trees of `self`.
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe: constituent top level token trees.

Copy link
Member Author

Choose a reason for hiding this comment

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

Updated

@jseyfried
Copy link
Contributor

jseyfried commented Jan 29, 2018

Excellent, thanks! This is ancient code and IMO some of the most difficult in libsyntax to understand.
@bors r+

@bors
Copy link
Contributor

bors commented Jan 29, 2018

📌 Commit 2184400 has been approved by jseyfried

@mark-i-m
Copy link
Member Author

Lol, yes... git blame shows that most of it hasn't really been touched in years. It took me a couple of weeks to work through it 😛

@rust-lang rust-lang deleted a comment from bors Jan 29, 2018
@rust-lang rust-lang deleted a comment from bors Jan 29, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Jan 30, 2018
…eyfried

Run rustfmt and add doc comments to libsyntax/ext/tt/macro_parser.rs

Similar to rust-lang#47603

cc @theotherphil since you reviewed my other PR 😄

And because they are already assigned on rust-lang#47603:

r? @arielb1
bors added a commit that referenced this pull request Jan 30, 2018
Rollup of 12 pull requests

- Successful merges: #47515, #47603, #47718, #47732, #47760, #47780, #47822, #47826, #47836, #47839, #47853, #47855
- Failed merges:
@bors bors merged commit 2184400 into rust-lang:master Jan 30, 2018
@mark-i-m mark-i-m deleted the markim_comments_0001 branch November 14, 2018 16:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants