Do not expand a derive invocation when derive is not allowed #47013
Conversation
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
1. Change the return type of `expand_invoc()` and its subroutines to `Option<Expansion>` from `Expansion`. 2. Return `None` when expanding a derive invocation if the item cannot have derive on it (in `expand_derive_invoc()`).
|
(rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors r+ |
|
📌 Commit f4a76f3 has been approved by |
|
💔 Test failed - status-travis |
estebank
requested changes
Dec 27, 2017
There was a problem hiding this comment.
test/run-pass-fulldeps/proc-macro/issue-40001.rs is failing:
[01:05:24] error: Missing 'whitelited_attr' attribute
[01:05:24] --> /checkout/src/test/run-pass-fulldeps/proc-macro/issue-40001.rs:18:1
[01:05:24] |
[01:05:24] 18 | fn main() {}
[01:05:24] | ^^^^^^^^^^^^
[01:05:24] |
[01:05:24] = note: #[deny(missing_whitelisted_attr)] on by default
[01:05:24]
[01:05:24] error: aborting due to previous error
| @@ -59,7 +60,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MissingWhitelistedAttrPass { | |||
| _ => cx.tcx.hir.expect_item(cx.tcx.hir.get_parent(id)), | |||
| }; | |||
|
|
|||
| if !item.attrs.iter().any(|a| a.check_name("whitelisted_attr")) { | |||
| if attr::contains_name(&item.attrs, "whitelisted_attr") { | |||
| cx.span_lint(MISSING_WHITELISTED_ATTR, span, | |||
| "Missing 'whitelited_attr' attribute"); | |||
There was a problem hiding this comment.
There is a typo: whitelited -> whitelisted
There was a problem hiding this comment.
Yeah I forgot !. I fixed the whitelited typo as well.
topecongiro
force-pushed
the
issue-46655
branch
from
f4a76f3 to
d882691
Compare
|
@bors r=petrochenkov |
|
📌 Commit d882691 has been approved by |
|
☀️ Test successful - status-appveyor, status-travis |
This was referenced Dec 28, 2017
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
Closes #46655.
The first commit is what actually closes #46655. The second one is just a refactoring I have done while waiting on a test.