Skip to content

Use reparsed TokenStream if we captured any inner attributes #78677

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Nov 4, 2020
Merged

Use reparsed TokenStream if we captured any inner attributes #78677

merged 1 commit into from
Nov 4, 2020

Conversation

Aaron1011
Copy link
Member

Fixes #78675

We now bail out of prepend_attrs if we ended up capturing any inner
attributes (which can happen in several places, due to token capturing
for macro_rules! arguments.

@Aaron1011
Use reparsed TokenStream if we captured any inner attributes
22383b3 
Fixes rust-lang#78675

We now bail out of `prepend_attrs` if we ended up capturing any inner
attributes (which can happen in several places, due to token capturing
for `macro_rules!` arguments.
@rust-highfive
Copy link
Contributor

r? @lcnr

(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 Nov 2, 2020
@lcnr
Copy link
Contributor

lcnr commented Nov 2, 2020

r? @petrochenkov

@rust-highfive rust-highfive assigned petrochenkov and unassigned lcnr Nov 2, 2020
@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Nov 2, 2020

📌 Commit 22383b3 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 Nov 2, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Nov 3, 2020
@Dylan-DPC
Rollup merge of rust-lang#78677 - Aaron1011:fix/capture-inner-attrs, …
86ef8d6 
…r=petrochenkov

Use reparsed `TokenStream` if we captured any inner attributes

Fixes rust-lang#78675

We now bail out of `prepend_attrs` if we ended up capturing any inner
attributes (which can happen in several places, due to token capturing
for `macro_rules!` arguments.
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Nov 3, 2020
Closed
@bors
Copy link
Collaborator

bors commented Nov 4, 2020

⌛ Testing commit 22383b3 with merge d2eee11c497f87aa2caf0fb844e50861123145dd...

@bors
Copy link
Collaborator

bors commented Nov 4, 2020

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 4, 2020
@Aaron1011
Copy link
Member Author

@bors retry

@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 Nov 4, 2020
@bors
Copy link
Collaborator

bors commented Nov 4, 2020

⌛ Testing commit 22383b3 with merge 9160b30990bf3b9deb6c6705f14394f2fa64b3dd...

@bors
Copy link
Collaborator

bors commented Nov 4, 2020

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 4, 2020
@Aaron1011
Copy link
Member Author

@bors retry

@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 Nov 4, 2020
@bors
Copy link
Collaborator

bors commented Nov 4, 2020

⌛ Testing commit 22383b3 with merge 25eaa85bcb679a16066aabb7baa628eb66f7f648...

@rust-log-analyzer
Copy link
Collaborator

The job i686-msvc-1 of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @rust-lang/infra. (Feature Requests)

@bors
Copy link
Collaborator

bors commented Nov 4, 2020

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 4, 2020
@petrochenkov
Copy link
Contributor

failed to fetch https://github.com/rust-lang/crates.io-index

@bors retry

@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 Nov 4, 2020
@bors
Copy link
Collaborator

bors commented Nov 4, 2020

⌛ Testing commit 22383b3 with merge 601c13c...

@bors
Copy link
Collaborator

bors commented Nov 4, 2020

☀️ Test successful - checks-actions
Approved by: petrochenkov
Pushing 601c13c to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 4, 2020
@bors bors merged commit 601c13c into rust-lang:master Nov 4, 2020
@rustbot rustbot added this to the 1.49.0 milestone Nov 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@danielhenrymantilla danielhenrymantilla danielhenrymantilla approved these changes

Assignees

@petrochenkov petrochenkov

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.49.0
Development

Successfully merging this pull request may close these issues.

ICE when forwarding $item with inner attr through a proc-macro layer
8 participants
@Aaron1011 @rust-highfive @lcnr @petrochenkov @bors @rust-log-analyzer @danielhenrymantilla @rustbot