Skip to content

Fix regression involving custom derives on items with $crate #37645

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Nov 10, 2016
Merged

Fix regression involving custom derives on items with $crate #37645

merged 2 commits into from
Nov 10, 2016

Conversation

jseyfried
Copy link
Contributor

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

@jseyfried jseyfried force-pushed the fix_crate_var_in_custom_derives branch from 475a339 to 97eba16 Compare November 8, 2016 04:40
@jseyfried jseyfried mentioned this pull request Nov 8, 2016
Closed
@nrc
Copy link
Member

nrc commented Nov 9, 2016

@bors: r+

@bors
Copy link
Collaborator

bors commented Nov 9, 2016

📌 Commit 97eba16 has been approved by nrc

@eddyb eddyb mentioned this pull request Nov 9, 2016
Merged
bors added a commit that referenced this pull request Nov 9, 2016
@bors
Auto merge of #37670 - eddyb:rollup, r=eddyb
da2ce22 
Rollup of 15 pull requests

- Successful merges: #36868, #37134, #37229, #37250, #37370, #37428, #37432, #37472, #37524, #37614, #37622, #37627, #37636, #37644, #37654
- Failed merges: #37463, #37542, #37645
@bors
Copy link
Collaborator

bors commented Nov 9, 2016

☔ The latest upstream changes (presumably #37670) made this pull request unmergeable. Please resolve the merge conflicts.

@bors
Copy link
Collaborator

bors commented Nov 10, 2016

🔒 Merge conflict

@jseyfried jseyfried force-pushed the fix_crate_var_in_custom_derives branch from 97eba16 to dd97e19 Compare November 10, 2016 10:07
@jseyfried jseyfried force-pushed the fix_crate_var_in_custom_derives branch from dd97e19 to f5a0385 Compare November 10, 2016 10:23
@jseyfried jseyfried force-pushed the fix_crate_var_in_custom_derives branch from f5a0385 to 67eeb0a Compare November 10, 2016 11:21
@bors
Copy link
Collaborator

bors commented Nov 10, 2016

📌 Commit 67eeb0a has been approved by nrc

@bors
Copy link
Collaborator

bors commented Nov 10, 2016

⌛ Testing commit 67eeb0a with merge 3dced6f...

bors added a commit that referenced this pull request Nov 10, 2016
@bors
Auto merge of #37645 - jseyfried:fix_crate_var_in_custom_derives, r=nrc
3dced6f 
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 alexcrichton added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Nov 10, 2016
@bors bors mentioned this pull request Nov 10, 2016
Merged
@bors
Copy link
Collaborator

bors commented Nov 10, 2016

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-cargotest, auto-linux-64-cross-freebsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-rustbuild
Approved by: nrc
Pushing 3dced6f to master...

@bors bors merged commit 67eeb0a into rust-lang:master Nov 10, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nrc nrc

Labels
T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jseyfried @nrc @bors @alexcrichton