diff options
| author | bors <bors@rust-lang.org> | 2016-11-09 11:58:25 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-09 11:58:25 -0800 |
| commit | da2ce2276873242a101f205537e7ce297d68f8dd (patch) | |
| tree | b0de0fa6de932ca2ebeb973b7c92014903edb54e /src/libproc_macro | |
| parent | bca365e688f0424fb99d38d477a9b7863bb070d3 (diff) | |
| parent | 60c74b76c4698d0223223e42853c5a89fd33fd09 (diff) | |
Auto merge of #37670 - eddyb:rollup, r=eddyb
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
Diffstat (limited to 'src/libproc_macro')
| -rw-r--r-- | src/libproc_macro/lib.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libproc_macro/lib.rs b/src/libproc_macro/lib.rs index 1d2c64d6d93..5ee9fecfb21 100644 --- a/src/libproc_macro/lib.rs +++ b/src/libproc_macro/lib.rs @@ -95,7 +95,8 @@ pub mod __internal { pub trait Registry { fn register_custom_derive(&mut self, trait_name: &str, - expand: fn(TokenStream) -> TokenStream); + expand: fn(TokenStream) -> TokenStream, + attributes: &[&'static str]); } // Emulate scoped_thread_local!() here essentially |