syntax: add ast::ItemKind::MacroDef, simplify hygiene info#40220
Merged
bors merged 3 commits intorust-lang:masterfrom Mar 12, 2017
Merged
syntax: add ast::ItemKind::MacroDef, simplify hygiene info#40220bors merged 3 commits intorust-lang:masterfrom
ast::ItemKind::MacroDef, simplify hygiene info#40220bors merged 3 commits intorust-lang:masterfrom
Conversation
19 tasks
Contributor
Author
|
cc #39412 |
Collaborator
|
☔ The latest upstream changes (presumably #39927) made this pull request unmergeable. Please resolve the merge conflicts. |
Collaborator
|
☔ The latest upstream changes (presumably #40202) made this pull request unmergeable. Please resolve the merge conflicts. |
jseyfried
force-pushed
the
ast_macro_def
branch
2 times, most recently
from
dc42522 to
9057c8d
Compare
Member
|
@bors: r+ |
Collaborator
|
📌 Commit 9057c8d has been approved by |
Collaborator
|
🔒 Merge conflict |
Member
|
@bors: retry |
Collaborator
|
🔒 Merge conflict |
Member
|
@bors: retry |
Collaborator
|
🔒 Merge conflict |
Member
|
@bors: retry |
Member
|
(oops) @bors: r+ |
Collaborator
|
💡 This pull request was already approved, no need to approve it again.
|
Collaborator
|
📌 Commit 9057c8d has been approved by |
Member
|
@bors: retry |
alexcrichton
force-pushed
the
ast_macro_def
branch
from
9057c8d to
8c98996
Compare
Member
|
@bors: r=nrc |
Collaborator
|
📌 Commit 8c98996 has been approved by |
bors
added a commit
that referenced
this pull request
Mar 11, 2017
Rollup of 38 pull requests - Successful merges: #39202, #39820, #39918, #39921, #40092, #40146, #40199, #40225, #40239, #40257, #40259, #40261, #40277, #40278, #40287, #40297, #40311, #40315, #40319, #40324, #40336, #40340, #40344, #40345, #40367, #40369, #40372, #40373, #40379, #40385, #40386, #40389, #40400, #40404, #40410, #40422, #40423, #40424 - Failed merges: #40220, #40329, #40426
bors
added a commit
that referenced
this pull request
Mar 11, 2017
Rollup of 38 pull requests - Successful merges: #39202, #39820, #39918, #39921, #40092, #40146, #40199, #40225, #40239, #40257, #40259, #40261, #40277, #40278, #40287, #40297, #40311, #40315, #40319, #40324, #40336, #40340, #40344, #40345, #40367, #40369, #40372, #40373, #40379, #40385, #40386, #40389, #40400, #40404, #40410, #40422, #40423, #40424 - Failed merges: #40220, #40329, #40426
Collaborator
|
⌛ Testing commit 8c98996 with merge 223844a... |
Collaborator
|
💔 Test failed - status-appveyor |
Member
|
… On Sat, Mar 11, 2017 at 9:00 AM, bors ***@***.***> wrote:
💔 Test failed - status-appveyor
<https://ci.appveyor.com/project/rust-lang/rust/build/1.0.2342>
—
You are receiving this because you modified the open/close state.
Reply to this email directly, view it on GitHub
<#40220 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/AAD95INIAj8xo6Y54LqMqWe9AQUgapZjks5rkrcGgaJpZM4MRtJj>
.
|
Collaborator
bors
added a commit
that referenced
this pull request
Mar 11, 2017
syntax: add `ast::ItemKind::MacroDef`, simplify hygiene info
This PR
- adds a new variant `MacroDef` to `ast::ItemKind` for `macro_rules!` and eventually `macro` items,
- [breaking-change] forbids macro defs without a name (`macro_rules! { () => {} }` compiles today),
- removes `ast::MacroDef`, and
- no longer uses `Mark` and `Invocation` to identify and characterize macro definitions.
- We used to apply (at least) two `Mark`s to an expanded identifier's `SyntaxContext` -- the definition mark(s) and the expansion mark(s). We now only apply the latter.
r? @nrc
Collaborator
|
☀️ Test successful - status-appveyor, status-travis |
This was referenced Mar 12, 2017
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR
MacroDeftoast::ItemKindformacro_rules!and eventuallymacroitems,macro_rules! { () => {} }compiles today),ast::MacroDef, andMarkandInvocationto identify and characterize macro definitions.Marks to an expanded identifier'sSyntaxContext-- the definition mark(s) and the expansion mark(s). We now only apply the latter.r? @nrc