Uh oh!
There was an error while loading. Please reload this page.
Fix regression involving custom derives on items with $crate - #37645
Merged
bors merged 2 commits intoNov 10, 2016
Conversation
jseyfriedforce-pushed
the
fix_crate_var_in_custom_derives
branch
from
November 8, 2016 04:40
475a339 to
97eba16Comparenrc
commented
Nov 9, 2016
Member
@bors: r+ |
bors
commented
Nov 9, 2016
Collaborator
📌 Commit 97eba16 has been approved by |
bors added a commit
that referenced
this pull request
Nov 9, 2016
bors
commented
Nov 9, 2016
Collaborator
☔ The latest upstream changes (presumably #37670) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
commented
Nov 10, 2016
Collaborator
🔒 Merge conflict |
jseyfriedforce-pushed
the
fix_crate_var_in_custom_derives
branch
from
November 10, 2016 10:07
97eba16 to
dd97e19Comparejseyfriedforce-pushed
the
fix_crate_var_in_custom_derives
branch
from
November 10, 2016 10:23
dd97e19 to
f5a0385Comparejseyfriedforce-pushed
the
fix_crate_var_in_custom_derives
branch
from
November 10, 2016 11:21
f5a0385 to
67eeb0aComparebors
commented
Nov 10, 2016
Collaborator
📌 Commit 67eeb0a has been approved by |
bors
commented
Nov 10, 2016
Collaborator
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
bors
commented
Nov 10, 2016
Collaborator
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 freeto 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.
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