Skip to content

List allowed tokens after macro fragments #55301

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 1 commit into from
Oct 26, 2018
Merged

List allowed tokens after macro fragments #55301

merged 1 commit into from
Oct 26, 2018

Conversation

estebank
Copy link
Contributor

Fix #34069.

@rust-highfive
Copy link
Contributor

r? @petrochenkov

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 24, 2018
@rust-highfive

This comment has been minimized.

# to view
estebank
estebank commented Oct 24, 2018
View reviewed changes
src/test/ui/macros/macro-follow.stderr

error: `$p:path` is followed by `(`, which is not allowed for `path` fragments
--> $DIR/macro-follow.rs:104:15
|
LL | ($p:path ()) => {}; //~ERROR `$p:path` is followed by `(`
| ^
| ^ not allowed after `path` fragments
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Filed #55322 to deal with the off-by-one span here.

@petrochenkov
Copy link
Contributor

Nice.
@bors r+

@bors
Copy link
Collaborator

bors commented Oct 24, 2018

📌 Commit 4bb01e19836e034d6e2d108270a703825aef68b4 has been approved by petrochenkov

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 24, 2018
@bors

This comment has been minimized.

# to view
@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 25, 2018
@estebank
Copy link
Contributor Author

@bors r=petrochenkov rollup

@bors
Copy link
Collaborator

bors commented Oct 25, 2018

📌 Commit 2cfd790 has been approved by petrochenkov

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 25, 2018
pietroalbini added a commit to pietroalbini/rust that referenced this pull request Oct 25, 2018
@pietroalbini
Rollup merge of rust-lang#55301 - estebank:macro-allowed, r=petrochenkov
c7ca552 
List allowed tokens after macro fragments

Fix rust-lang#34069.
@pietroalbini pietroalbini mentioned this pull request Oct 25, 2018
Closed
kennytm added a commit to kennytm/rust that referenced this pull request Oct 26, 2018
@kennytm
Rollup merge of rust-lang#55301 - estebank:macro-allowed, r=petrochenkov
5b2512f 
List allowed tokens after macro fragments

Fix rust-lang#34069.
@kennytm kennytm mentioned this pull request Oct 26, 2018
Closed
@kennytm kennytm mentioned this pull request Oct 26, 2018
Merged
kennytm added a commit to kennytm/rust that referenced this pull request Oct 26, 2018
@kennytm
Rollup merge of rust-lang#55301 - estebank:macro-allowed, r=petrochenkov
e897fe7 
List allowed tokens after macro fragments

Fix rust-lang#34069.
bors added a commit that referenced this pull request Oct 26, 2018
@bors
Auto merge of #55382 - kennytm:rollup, r=kennytm
3e6f30e 
Rollup of 21 pull requests

Successful merges:

 - #54816 (Don't try to promote already promoted out temporaries)
 - #54824 (Cleanup rustdoc tests with `@!has` and `@!matches`)
 - #54921 (Add line numbers option to rustdoc)
 - #55167 (Add a "cheap" mode for `compute_missing_ctors`.)
 - #55258 (Fix Rustdoc ICE when checking blanket impls)
 - #55264 (Compile the libstd we distribute with -Ccodegen-unit=1)
 - #55271 (Unimplement ExactSizeIterator for MIR traversing iterators)
 - #55292 (Macro diagnostics tweaks)
 - #55298 (Point at macro definition when no rules expect token)
 - #55301 (List allowed tokens after macro fragments)
 - #55302 (Extend the impl_stable_hash_for! macro for miri.)
 - #55325 (Fix link to macros chapter)
 - #55343 (rustbuild: fix remap-debuginfo when building a release)
 - #55346 (Shrink `Statement`.)
 - #55358 (Remove redundant clone (2))
 - #55370 (Update mailmap for estebank)
 - #55375 (Typo fixes in configure_cmake comments)
 - #55378 (rustbuild: use configured linker to build boostrap)
 - #55379 (validity: assert that unions are non-empty)
 - #55383 (Use `SmallVec` for the queue in `coerce_unsized`.)
 - #55391 (bootstrap: clean up a few clippy findings)
@bors
Copy link
Collaborator

bors commented Oct 26, 2018

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

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 26, 2018
@bors bors merged commit 2cfd790 into rust-lang:master Oct 26, 2018
@pietroalbini pietroalbini mentioned this pull request Oct 29, 2018
Merged
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@petrochenkov petrochenkov

Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@estebank @rust-highfive @petrochenkov @bors