-
Notifications
You must be signed in to change notification settings - Fork 12.9k
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
Fix regression involving custom derives on items with $crate
#37645
Merged
bors
merged 2 commits into
rust-lang:master
from
jseyfried:fix_crate_var_in_custom_derives
Nov 10, 2016
Merged
Fix regression involving custom derives on items with $crate
#37645
bors
merged 2 commits into
rust-lang:master
from
jseyfried:fix_crate_var_in_custom_derives
Nov 10, 2016
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
jseyfried
force-pushed
the
fix_crate_var_in_custom_derives
branch
from
November 8, 2016 04:40
475a339
to
97eba16
Compare
@bors: r+ |
📌 Commit 97eba16 has been approved by |
bors
added a commit
that referenced
this pull request
Nov 9, 2016
☔ The latest upstream changes (presumably #37670) made this pull request unmergeable. Please resolve the merge conflicts. |
🔒 Merge conflict |
jseyfried
force-pushed
the
fix_crate_var_in_custom_derives
branch
from
November 10, 2016 10:07
97eba16
to
dd97e19
Compare
jseyfried
force-pushed
the
fix_crate_var_in_custom_derives
branch
from
November 10, 2016 10:23
dd97e19
to
f5a0385
Compare
jseyfried
force-pushed
the
fix_crate_var_in_custom_derives
branch
from
November 10, 2016 11:21
f5a0385
to
67eeb0a
Compare
📌 Commit 67eeb0a has been approved by |
bors
added a commit
that referenced
this pull request
Nov 10, 2016
Fix regression involving custom derives on items with `$crate` The regression was introduced in #37213. I believe we cannot make the improvements from #37213 work with the current custom derive setup (c.f. #37637 (comment)) -- we'll have to wait for `TokenStream`'s API to improve. Fixes #37637. r? @nrc
alexcrichton
added
the
T-compiler
Relevant to the compiler team, which will review and decide on the PR/issue.
label
Nov 10, 2016
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.
The regression was introduced in #37213.
I believe we cannot make the improvements from #37213 work with the current custom derive setup (c.f. #37637 (comment)) -- we'll have to wait for
TokenStream
's API to improve.Fixes #37637.
r? @nrc