diff options
| author | bors <bors@rust-lang.org> | 2018-04-05 19:25:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-04-05 19:25:37 +0000 |
| commit | 48fa6f9631868b07309b02f479e2ec523bb58c2b (patch) | |
| tree | f42e4285226c191c4448946f440ba79642ba1080 /src/libsyntax_ext | |
| parent | 7222241e7c2d7caf9ad6ee6e34748e4addfb8dd3 (diff) | |
| parent | cd615e9863fa4593ff87243920875ad5bb73906a (diff) | |
| download | rust-48fa6f9631868b07309b02f479e2ec523bb58c2b.tar.gz rust-48fa6f9631868b07309b02f479e2ec523bb58c2b.zip | |
Auto merge of #49696 - alexcrichton:rollup, r=alexcrichton
Rollup of 8 pull requests
Successful merges:
- #49045 (Make queries thread safe)
- #49350 (Expand macros in `extern {}` blocks)
- #49497 (Chalkify - Tweak `Clause` definition and HRTBs)
- #49597 (proc_macro: Reorganize public API)
- #49686 (typos)
- #49621
- #49697
- #49705
Failed merges:
Diffstat (limited to 'src/libsyntax_ext')
| -rw-r--r-- | src/libsyntax_ext/deriving/custom.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libsyntax_ext/deriving/custom.rs b/src/libsyntax_ext/deriving/custom.rs index 80557078d54..5fd5e299488 100644 --- a/src/libsyntax_ext/deriving/custom.rs +++ b/src/libsyntax_ext/deriving/custom.rs @@ -55,6 +55,7 @@ impl MultiItemModifier for ProcMacroDerive { Annotatable::Item(item) => item, Annotatable::ImplItem(_) | Annotatable::TraitItem(_) | + Annotatable::ForeignItem(_) | Annotatable::Stmt(_) | Annotatable::Expr(_) => { ecx.span_err(span, "proc-macro derives may only be \ |