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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

internal: Lazy eager macros #14998

Merged
merged 1 commit into from Jun 9, 2023
Merged

internal: Lazy eager macros #14998

merged 1 commit into from Jun 9, 2023

Conversation

Veykril
Copy link
Member

@Veykril Veykril commented Jun 7, 2023

This PR makes eager macros less eager. We now only eagerly expand the input of them, while the actual expansion of the macro itself now happens like other lazy macros.
This change allows unifying a lot of macro handling between the two now, most of the special casing now happens for include! specifically as it is a very unique macro (by having two inputs that come from differing files).
Fixes #14841
Fixes #14996

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 7, 2023
@Veykril Veykril marked this pull request as draft June 7, 2023 12:53
@Veykril Veykril changed the title fix: Fix eager macro token mapping internal: Lazy eager macros Jun 9, 2023
@Veykril Veykril force-pushed the eager-mapping branch 2 times, most recently from 0f60b0c to 03d97de Compare June 9, 2023 09:47
@Veykril Veykril marked this pull request as ready for review June 9, 2023 11:10
@Veykril
Copy link
Member Author

Veykril commented Jun 9, 2023

@bors r+

@bors
Copy link
Collaborator

bors commented Jun 9, 2023

📌 Commit a02b9b2 has been approved by Veykril

It is now in the queue for this repository.

@bors
Copy link
Collaborator

bors commented Jun 9, 2023

⌛ Testing commit a02b9b2 with merge 2796851...

@bors
Copy link
Collaborator

bors commented Jun 9, 2023

☀️ Test successful - checks-actions
Approved by: Veykril
Pushing 2796851 to master...

@bors bors merged commit 2796851 into rust-lang:master Jun 9, 2023
10 checks passed
@Veykril Veykril deleted the eager-mapping branch June 9, 2023 11:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Auto Completion Position Error Eager macro breaks token mapping for arguments after a macro
3 participants