Run rustfmt and add doc comments to libsyntax/ext/tt/quoted.rs #47603

mark-i-m · 2018-01-19T22:45:18Z

I was already going to try to understand this code to try to implement rust-lang/rfcs#2298. I figured I would put that knowledge into comments and share... This PR contains no changes to the code itself -- just formatting and comments.

I'm not sure what the best way to do this is. I plan to make more such PR for other files, but I figured it would have fewer conflicts if I do it file by file...

rust-highfive · 2018-01-19T22:45:23Z

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.

theotherphil · 2018-01-21T11:35:35Z

src/libsyntax/ext/tt/quoted.rs

 use tokenstream;

 use std::rc::Rc;

+/// Contains the sub-token-trees of a "delimited" token tree, such as the contents of `(`. Note
+/// thatthat the delimiter itself might be `NoDelim`.


theotherphil · 2018-01-21T11:36:27Z

src/libsyntax/ext/tt/quoted.rs

    ZeroOrMore,
+    /// Kleene star (`+`) for one or more repetitions


Kleene plus

theotherphil · 2018-01-21T11:37:40Z

src/libsyntax/ext/tt/quoted.rs

                let sequence = parse(delimited.tts.into(), expect_matchers, sess);
+                // Get the Kleen operator and optional separator


Haha... it originally autocorrected to Kleenex, and my fix was incorrect 😛

mark-i-m · 2018-01-21T22:04:26Z

@theotherphil Thanks! Fixed.

shepmaster · 2018-01-26T18:35:36Z

Ping from triage for you, @arielb1 !

arielb1 · 2018-01-27T16:46:36Z

r? @jseyfried

arielb1 · 2018-01-27T16:47:14Z

That is not quite my area of the code

mark-i-m · 2018-01-27T21:55:31Z

@arielb1 I'm guessing the same would be to of #47732 too?

jseyfried

Excellent! r=me

jseyfried · 2018-01-29T22:31:16Z

src/libsyntax/ext/tt/quoted.rs

    pub fn close_token(&self) -> token::Token {
        token::CloseDelim(self.delim)
    }

+    /// Return a `self::TokenTree` witha a `Span` corresponding to the opening delimiter.


typo: witha

jseyfried · 2018-01-29T22:31:32Z

src/libsyntax/ext/tt/quoted.rs

@@ -42,6 +47,7 @@ impl Delimited {
        TokenTree::Token(open_span, self.open_token())
    }

+    /// Return a `self::TokenTree` witha a `Span` corresponding to the closing delimiter.


typo: witha

jseyfried · 2018-01-29T22:51:25Z

src/libsyntax/ext/tt/quoted.rs

+///
+/// # Parameters
+///
+/// - `tree`: the tree wish to convert.


we wish to convert

jseyfried · 2018-01-29T22:53:36Z

src/libsyntax/ext/tt/quoted.rs

+/// separator, and `*` is the Kleene operator. This function is specifically concerned with parsing
+/// the last two tokens of such a pattern: namely, the optional separator and the Kleene operator
+/// itself. Note that here we are parsing the _macro_ itself, rather than trying to match some
+/// stream of tokens in an invokation of a macro.


sp: invocation

jseyfried · 2018-01-29T22:58:08Z

I'm not sure what the best way to do this is. I plan to make more such PR for other files, but I figured it would have fewer conflicts if I do it file by file...

I wouldn't worry too much about conflicts; there isn't too much churn in this area of the compiler now. That being said, nothing wrong with smaller PRs :)

mark-i-m · 2018-01-29T23:08:57Z

@jseyfried Thanks! Fixed.

jseyfried · 2018-01-30T00:59:22Z

@bors r+

bors · 2018-01-30T00:59:23Z

📌 Commit 5762942 has been approved by jseyfried

@theotherphil

…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

…eyfried Run rustfmt and add doc comments to libsyntax/ext/tt/quoted.rs I was already going to try to understand this code to try to implement rust-lang/rfcs#2298. I figured I would put that knowledge into comments and share... This PR contains _no changes_ to the code itself -- just formatting and comments. I'm not sure what the best way to do this is. I plan to make more such PR for other files, but I figured it would have fewer conflicts if I do it file by file...

Rollup of 12 pull requests - Successful merges: #47515, #47603, #47718, #47732, #47760, #47780, #47822, #47826, #47836, #47839, #47853, #47855 - Failed merges:

mark-i-m added 2 commits January 19, 2018 15:46

Run rustfmt and add comments

c4befe1

Add a bunch of doc comments

49431d4

rust-highfive assigned arielb1 Jan 19, 2018

shepmaster added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 20, 2018

theotherphil reviewed Jan 21, 2018

View reviewed changes

src/libsyntax/ext/tt/quoted.rs Outdated

ZeroOrMore,

/// Kleene star (`+`) for one or more repetitions

Copy link

Contributor

theotherphil Jan 21, 2018

Choose a reason for hiding this comment

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

Kleene plus

theotherphil reviewed Jan 21, 2018

View reviewed changes

Fix typos

ca0c080

This was referenced Jan 25, 2018

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

Merged

RFC: ? repetition in macro rules rust-lang/rfcs#2298

Merged

kennytm mentioned this pull request Jan 25, 2018

Implement ? macro repetition #47752

Merged

rust-highfive assigned jseyfried and unassigned arielb1 Jan 27, 2018

jseyfried approved these changes Jan 29, 2018

View reviewed changes

fix typos

5762942

kennytm mentioned this pull request Jan 30, 2018

Rollup of 12 pull requests #47870

Merged

bors added a commit that referenced this pull request Jan 30, 2018

Auto merge of #47870 - kennytm:rollup, r=kennytm

def3269

Rollup of 12 pull requests - Successful merges: #47515, #47603, #47718, #47732, #47760, #47780, #47822, #47826, #47836, #47839, #47853, #47855 - Failed merges:

bors merged commit 5762942 into rust-lang:master Jan 30, 2018

mark-i-m deleted the markim_comments_0000 branch November 14, 2018 16:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Run rustfmt and add doc comments to libsyntax/ext/tt/quoted.rs #47603

Run rustfmt and add doc comments to libsyntax/ext/tt/quoted.rs #47603

mark-i-m commented Jan 19, 2018

rust-highfive commented Jan 19, 2018

theotherphil Jan 21, 2018

theotherphil Jan 21, 2018

theotherphil Jan 21, 2018

mark-i-m Jan 21, 2018

mark-i-m commented Jan 21, 2018

shepmaster commented Jan 26, 2018

arielb1 commented Jan 27, 2018

arielb1 commented Jan 27, 2018

mark-i-m commented Jan 27, 2018

jseyfried left a comment

jseyfried Jan 29, 2018 •

edited

Loading

jseyfried Jan 29, 2018

jseyfried Jan 29, 2018

jseyfried Jan 29, 2018

jseyfried commented Jan 29, 2018

mark-i-m commented Jan 29, 2018

jseyfried commented Jan 30, 2018

bors commented Jan 30, 2018

		ZeroOrMore,
		/// Kleene star (`+`) for one or more repetitions

		let sequence = parse(delimited.tts.into(), expect_matchers, sess);
		// Get the Kleen operator and optional separator

Run rustfmt and add doc comments to libsyntax/ext/tt/quoted.rs #47603

Run rustfmt and add doc comments to libsyntax/ext/tt/quoted.rs #47603

Conversation

mark-i-m commented Jan 19, 2018

rust-highfive commented Jan 19, 2018

theotherphil Jan 21, 2018

Choose a reason for hiding this comment

theotherphil Jan 21, 2018

Choose a reason for hiding this comment

theotherphil Jan 21, 2018

Choose a reason for hiding this comment

mark-i-m Jan 21, 2018

Choose a reason for hiding this comment

mark-i-m commented Jan 21, 2018

shepmaster commented Jan 26, 2018

arielb1 commented Jan 27, 2018

arielb1 commented Jan 27, 2018

mark-i-m commented Jan 27, 2018

jseyfried left a comment

Choose a reason for hiding this comment

jseyfried Jan 29, 2018 • edited Loading

Choose a reason for hiding this comment

jseyfried Jan 29, 2018

Choose a reason for hiding this comment

jseyfried Jan 29, 2018

Choose a reason for hiding this comment

jseyfried Jan 29, 2018

Choose a reason for hiding this comment

jseyfried commented Jan 29, 2018

mark-i-m commented Jan 29, 2018

jseyfried commented Jan 30, 2018

bors commented Jan 30, 2018

jseyfried Jan 29, 2018 •

edited

Loading