Skip to content

reject macros with empty repetitions - #36721

Merged
bors merged 1 commit into
rust-lang:masterfrom
TimNN:infinite-emptiness
Sep 27, 2016
Merged

reject macros with empty repetitions#36721
bors merged 1 commit into
rust-lang:masterfrom
TimNN:infinite-emptiness

Conversation

@TimNN

@TimNNTimNN commented Sep 25, 2016

Copy link
Copy Markdown
Contributor

Fixes#5067 by checking the lhs of macro_rules! for repetitions which could match an empty token tree.

@rust-highfive

rust-highfive commented Sep 25, 2016

Copy link
Copy Markdown
Contributor

r? @nrc

(rust_highfive has picked a reviewer for you, use r? to override)

nrc
nrc reviewed Sep 25, 2016
View reviewed changes
Comment threadsrc/libsyntax/ext/tt/macro_rules.rs Outdated

@nrcnrcSep 25, 2016

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

could use lhses.iter().all() instead of the for loop.

@TimNNTimNNSep 25, 2016

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

The for loop was mainly used to use the same style as the loop of the rhses directly above.

Also .iter().all() would abort early, I think, which means that not all lhses would be checked, ie. not all errors we could report would be reported.

@nrcnrcSep 25, 2016

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ok, good point on not reporting all errors. Could you add a comment to explain that please?

@TimNNTimNNSep 25, 2016

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Done.

@nrc

nrc commented Sep 25, 2016

Copy link
Copy Markdown
Member

r=me with the for loop replaced

@nrc

nrc commented Sep 25, 2016

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Sep 25, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit d06a9ca has been approved by nrc

@bors

bors commented Sep 25, 2016

Copy link
Copy Markdown
Collaborator

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

@TimNN

TimNN commented Sep 26, 2016

Copy link
Copy Markdown
ContributorAuthor

Rebased.

@nrc

nrc commented Sep 26, 2016

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Sep 26, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 51ea050 has been approved by nrc

sophiajt pushed a commit to sophiajt/rust that referenced this pull request Sep 26, 2016
Jonathan Turner
Rollup merge ofrust-lang#36721- TimNN:infinite-emptiness, r=nrc
c4fc532
reject macros with empty repetitions
Fixesrust-lang#5067 by checking the lhs of `macro_rules!` for repetitions which could match an empty token tree.
@sophiajtsophiajt mentioned this pull request Sep 26, 2016
Closed
sophiajt pushed a commit to sophiajt/rust that referenced this pull request Sep 27, 2016
Jonathan Turner
Rollup merge ofrust-lang#36721- TimNN:infinite-emptiness, r=nrc
02cc578
reject macros with empty repetitions
Fixesrust-lang#5067 by checking the lhs of `macro_rules!` for repetitions which could match an empty token tree.
@sophiajtsophiajt mentioned this pull request Sep 27, 2016
Merged
bors added a commit that referenced this pull request Sep 27, 2016
@bors
Auto merge of#36764- jonathandturner:rollup, r=jonathandturner
ec7679b
Rollup of 14 pull requests
- Successful merges: #36563, #36574, #36586, #36662, #36663, #36669, #36676, #36721, #36723, #36727, #36729, #36742, #36754, #36756
- Failed merges:
@bors
bors merged commit 51ea050 into rust-lang:masterSep 27, 2016
@TimNN
TimNN deleted the infinite-emptiness branch September 28, 2016 09:29
@jonas-schievinkjonas-schievink mentioned this pull request Jan 14, 2019
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@nrcnrcnrc left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@nrcnrc

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@TimNN@rust-highfive@nrc@bors