diff options
| author | Steven Fackler <[email protected]> | 2016-04-13 19:30:08 -0700 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2016-04-13 19:30:08 -0700 |
| commit | b94ea8598ca5e70309df51a02d85b282ed8fe020 (patch) | |
| tree | b05603d394018dbaa88bbf7932c2275e57fe1ecf /openssl/src/ssl/mod.rs | |
| parent | Update lazy_static (diff) | |
| download | rust-openssl-b94ea8598ca5e70309df51a02d85b282ed8fe020.tar.xz rust-openssl-b94ea8598ca5e70309df51a02d85b282ed8fe020.zip | |
Update for nightly changes
Diffstat (limited to 'openssl/src/ssl/mod.rs')
| -rw-r--r-- | openssl/src/ssl/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs index 71a6ccda..e21cc3dd 100644 --- a/openssl/src/ssl/mod.rs +++ b/openssl/src/ssl/mod.rs @@ -1323,7 +1323,7 @@ impl<S> SslStream<S> { #[cfg(feature = "nightly")] fn check_panic(&mut self) { if let Some(err) = unsafe { bio::take_panic::<S>(self.ssl.get_raw_rbio()) } { - ::std::panic::propagate(err) + ::std::panic::resume_unwind(err) } } |