]> git.lizzy.rs Git - rust.git/commit
Auto merge of #37645 - jseyfried:fix_crate_var_in_custom_derives, r=nrc
authorbors <bors@rust-lang.org>
Thu, 10 Nov 2016 19:25:17 +0000 (11:25 -0800)
committerGitHub <noreply@github.com>
Thu, 10 Nov 2016 19:25:17 +0000 (11:25 -0800)
commit3dced6f71e6e8cf8f59e3614194a61427a3a408b
treed774bf9b6a1fda191695d4917979b0243652812d
parentbc1cc1db6ddee8d57d20adc05b740e3b73649ab5
parent67eeb0a72081ae7db45a07de55fd2cb77b2ebee1
Auto merge of #37645 - jseyfried:fix_crate_var_in_custom_derives, r=nrc

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. https://github.com/rust-lang/rust/issues/37637#issuecomment-258959145) -- we'll have to wait for `TokenStream`'s API to improve.

Fixes #37637.
r? @nrc
src/librustc_resolve/macros.rs