about summary refs log tree commit diff
path: root/src/rustllvm/RustWrapper.cpp
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2018-07-21 02:59:09 +0800
committerkennytm <kennytm@gmail.com>2018-07-21 04:08:10 +0800
commit863ed13c6c079e835fbd4aa6706cc68356229ea8 (patch)
treec756a6ce17335593d503569d9ce18625828dd9cf /src/rustllvm/RustWrapper.cpp
parent63da8122fb93838dc3a20c0ba94665658df55166 (diff)
parentf2f7ab9da835f5fd66722f2efec9285ea72ad0f4 (diff)
downloadrust-863ed13c6c079e835fbd4aa6706cc68356229ea8.tar.gz
rust-863ed13c6c079e835fbd4aa6706cc68356229ea8.zip
Rollup merge of #52539 - alexcrichton:two-attrs, r=petrochenkov
rustc: Fix two custom attributes with custom derive

This commit fixes an issue where multiple custom attributes could not be fed
into a custom derive in some situations with the `use_extern_macros` feature
enabled. The problem was that the macro expander didn't consider that it was
making progress when we were deducing that attributes should be lumped in with
custom derive invocations.

The fix applied here was to track in the expander if our attribute is changing
(getting stashed away elsewhere and replaced with a new invocation). If it is
swapped then it's considered progress, otherwise behavior should remain the
same.

Closes #52525
Diffstat (limited to 'src/rustllvm/RustWrapper.cpp')
0 files changed, 0 insertions, 0 deletions