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鈥檒l 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

Projects
None yet
6 participants
@mark-i-m
Copy link
Contributor

commented Jan 25, 2018

Similar to #47603

cc @theotherphil since you reviewed my other PR 馃槃

And because they are already assigned on #47603:

r? @arielb1

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

commented Jan 25, 2018

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.

@bors

This comment has been minimized.

Copy link
Contributor

commented Jan 26, 2018

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

@arielb1

This comment has been minimized.

Copy link
Contributor

commented Jan 29, 2018

r? @jsseyfried

@arielb1

This comment has been minimized.

Copy link
Contributor

commented Jan 29, 2018

@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`.

This comment has been minimized.

Copy link
@jseyfried

jseyfried Jan 29, 2018

Contributor

Maybe: constituent top level token trees.

This comment has been minimized.

Copy link
@mark-i-m

mark-i-m Jan 29, 2018

Author Contributor

Updated

@jseyfried

This comment has been minimized.

Copy link
Contributor

commented Jan 29, 2018

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

@bors

This comment has been minimized.

Copy link
Contributor

commented Jan 29, 2018

馃搶 Commit 2184400 has been approved by jseyfried

@mark-i-m

This comment has been minimized.

Copy link
Contributor Author

commented Jan 29, 2018

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

Rollup merge of rust-lang#47732 - mark-i-m:markim_comments_0001, r=js鈥
鈥yfried

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

Auto merge of #47870 - kennytm:rollup, r=kennytm
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

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@mark-i-m mark-i-m deleted the mark-i-m:markim_comments_0001 branch Nov 14, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can鈥檛 perform that action at this time.