rustc: Fix proc_macro expansions on trait methods #44089
Merged
Conversation
This file contains 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
|
r? @nrc |
|
r? @pnkfelix (rust_highfive has picked a reviewer for you, use r? to override) |
jseyfried
reviewed
Aug 25, 2017
src/librustc_resolve/macros.rs
Outdated
| @@ -402,7 +402,7 @@ impl<'a> Resolver<'a> { | |||
| let ast::Path { ref segments, span } = *path; | |||
| let path: Vec<_> = segments.iter().map(|seg| respan(seg.span, seg.identifier)).collect(); | |||
| let invocation = self.invocations[&scope]; | |||
| self.current_module = invocation.module.get(); | |||
| self.current_module = self.module_map[&invocation.module.get().normal_ancestor_id]; | |||
There was a problem hiding this comment.
Tests are failing; this should be:
let module = invocation.module.get();
self.current_module = if module.is_trait() { module.parent.unwrap() } else { module };This commit fixes procedural macro attributes being attached to trait methods, ensuring that they get resolved and expanded as other procedural macro attributes. The bug here was that `current_module` on the resolver was accidentally set to be a trait when it's otherwise only ever expecting a `mod`/block module. The actual fix here came from @jseyfried, I'm just helping to land it in the compiler! Closes rust-lang#42493
alexcrichton
force-pushed
the
trait-proc-macro
branch
from
19e85c7
to
ce322ee
Compare
carols10cents
added
the
S-waiting-on-review
|
@bors: r+ |
|
📌 Commit ce322ee has been approved by |
|
⌛ Testing commit ce322ee with merge 8f3556f704699e504138184f1e4428bd512014ff... |
|
💔 Test failed - status-travis |
arielb1
added
S-waiting-on-bors
alexcrichton
added a commit
to alexcrichton/rust
that referenced
this pull request
Aug 30, 2017
rustc: Fix proc_macro expansions on trait methods This commit fixes procedural macro attributes being attached to trait methods, ensuring that they get resolved and expanded as other procedural macro attributes. The bug here was that `current_module` on the resolver was accidentally set to be a trait when it's otherwise only ever expecting a `mod`/block module. The actual fix here came from @jseyfried, I'm just helping to land it in the compiler! Closes rust-lang#42493
bors
added a commit
that referenced
this pull request
Aug 31, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 commit fixes procedural macro attributes being attached to trait methods,
ensuring that they get resolved and expanded as other procedural macro
attributes. The bug here was that
current_moduleon the resolver wasaccidentally set to be a trait when it's otherwise only ever expecting a
mod/block module. The actual fix here came from @jseyfried, I'm just helpingto land it in the compiler!
Closes #42493