diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-12-27 13:30:06 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-12-27 13:30:06 +0000 |
commit | 0fd75c98ac81c9f6581712ec8802940e547315e3 (patch) | |
tree | 7d7dc80327900207912b1d4e952c012d4dd403b7 /crates/proc_macro_srv/src/proc_macro/bridge/mod.rs | |
parent | 1d874a2a65278548a781c6cc518ae7dd7c741229 (diff) | |
parent | da92f46cc8b5fc7e45cd35117ca4cb0cff80405e (diff) |
Merge #7047
7047: Add force_show_panics flag for proc-macro bridge r=jonas-schievink a=edwin0cheng
https://github.com/rust-lang/rust/pull/75082 and https://github.com/rust-lang/rust/pull/76292 added a new flag in `proc_macro::Bridge` such that the ABI was changed. These ABI changing are the reason of some weird panics which caused #6880 and maybe related to the panic mentioned in #6820.
These changes are landed on rust stable 1.48 so I think it is okay to apply it now.
fixes #6880
r @jonas-schievink
Co-authored-by: Edwin Cheng <[email protected]>
Diffstat (limited to 'crates/proc_macro_srv/src/proc_macro/bridge/mod.rs')
-rw-r--r-- | crates/proc_macro_srv/src/proc_macro/bridge/mod.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crates/proc_macro_srv/src/proc_macro/bridge/mod.rs b/crates/proc_macro_srv/src/proc_macro/bridge/mod.rs index b97886eb9..e4006a5ab 100644 --- a/crates/proc_macro_srv/src/proc_macro/bridge/mod.rs +++ b/crates/proc_macro_srv/src/proc_macro/bridge/mod.rs | |||
@@ -225,6 +225,9 @@ pub struct Bridge<'a> { | |||
225 | 225 | ||
226 | /// Server-side function that the client uses to make requests. | 226 | /// Server-side function that the client uses to make requests. |
227 | dispatch: closure::Closure<'a, Buffer<u8>, Buffer<u8>>, | 227 | dispatch: closure::Closure<'a, Buffer<u8>, Buffer<u8>>, |
228 | |||
229 | /// If 'true', always invoke the default panic hook | ||
230 | force_show_panics: bool, | ||
228 | } | 231 | } |
229 | 232 | ||
230 | // impl<'a> !Sync for Bridge<'a> {} | 233 | // impl<'a> !Sync for Bridge<'a> {} |