diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-10-08 15:27:30 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-10-08 15:27:30 +0100 |
commit | e6a05e6566014d95cec416b5203fdf52bb8ac09c (patch) | |
tree | 6a2b183ddbcf674c7503b5646548610ee223a470 /crates/proc_macro_srv/src/proc_macro/bridge/server.rs | |
parent | e95e666b106b2f63ab2b350e656c9e8b96441fa7 (diff) | |
parent | 3d169bd3f4cdc2dc3dd09eadbbc17c19214d69f3 (diff) |
Merge #5651
5651: Add track_env_var to the proc macro server r=kjeremy a=lnicola
See https://github.com/rust-lang/rust/pull/74653.
Fixes #6054.
Fixes #5640, maybe.
Should be merged when 1.47 is released.
Proc macros still don't work for me, but it no longer crashes.
Co-authored-by: Laurențiu Nicola <[email protected]>
Diffstat (limited to 'crates/proc_macro_srv/src/proc_macro/bridge/server.rs')
-rw-r--r-- | crates/proc_macro_srv/src/proc_macro/bridge/server.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crates/proc_macro_srv/src/proc_macro/bridge/server.rs b/crates/proc_macro_srv/src/proc_macro/bridge/server.rs index 45d41ac02..3acb239af 100644 --- a/crates/proc_macro_srv/src/proc_macro/bridge/server.rs +++ b/crates/proc_macro_srv/src/proc_macro/bridge/server.rs | |||
@@ -11,6 +11,8 @@ use super::client::HandleStore; | |||
11 | /// Declare an associated item of one of the traits below, optionally | 11 | /// Declare an associated item of one of the traits below, optionally |
12 | /// adjusting it (i.e., adding bounds to types and default bodies to methods). | 12 | /// adjusting it (i.e., adding bounds to types and default bodies to methods). |
13 | macro_rules! associated_item { | 13 | macro_rules! associated_item { |
14 | (type FreeFunctions) => | ||
15 | (type FreeFunctions: 'static;); | ||
14 | (type TokenStream) => | 16 | (type TokenStream) => |
15 | (type TokenStream: 'static + Clone;); | 17 | (type TokenStream: 'static + Clone;); |
16 | (type TokenStreamBuilder) => | 18 | (type TokenStreamBuilder) => |