aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/ssl/mod.rs
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2016-11-19 10:19:52 -0800
committerSteven Fackler <[email protected]>2016-11-27 21:00:59 -0800
commit234f126d7d9718bd95655aca5fa6f57dc2c4270a (patch)
tree2b389e1abb4419c03c70eaa7daa68d72539a02d0 /openssl/src/ssl/mod.rs
parentReturn Option from group (diff)
downloadrust-openssl-234f126d7d9718bd95655aca5fa6f57dc2c4270a.tar.xz
rust-openssl-234f126d7d9718bd95655aca5fa6f57dc2c4270a.zip
Cleanup
Diffstat (limited to 'openssl/src/ssl/mod.rs')
-rw-r--r--openssl/src/ssl/mod.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs
index ac41dec6..6e0c92c3 100644
--- a/openssl/src/ssl/mod.rs
+++ b/openssl/src/ssl/mod.rs
@@ -84,6 +84,7 @@ use std::io::prelude::*;
use std::marker::PhantomData;
use std::mem;
use std::ops::{Deref, DerefMut};
+use std::panic::resume_unwind;
use std::path::Path;
use std::ptr;
use std::slice;
@@ -1601,7 +1602,7 @@ impl<S> SslStream<S> {
fn check_panic(&mut self) {
if let Some(err) = unsafe { bio::take_panic::<S>(self.ssl.get_raw_rbio()) } {
- ::std::panic::resume_unwind(err)
+ resume_unwind(err)
}
}