diff options
| author | Steven Fackler <[email protected]> | 2017-11-26 21:34:42 -0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-11-26 21:34:42 -0800 |
| commit | f6085700eae052f040ae5ff1d25a8c220277598d (patch) | |
| tree | d825992569969ec07be9130a37561e8b5bc1471b /openssl/src/ssl | |
| parent | Merge pull request #779 from sfackler/revert-778-foreign-types (diff) | |
| parent | Upgrade foreign-types (diff) | |
| download | rust-openssl-f6085700eae052f040ae5ff1d25a8c220277598d.tar.xz rust-openssl-f6085700eae052f040ae5ff1d25a8c220277598d.zip | |
Merge pull request #781 from sfackler/foreign-types-bump
Upgrade foreign-types
Diffstat (limited to 'openssl/src/ssl')
| -rw-r--r-- | openssl/src/ssl/mod.rs | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs index 176863d6..e135535a 100644 --- a/openssl/src/ssl/mod.rs +++ b/openssl/src/ssl/mod.rs @@ -76,7 +76,6 @@ use libc::{c_int, c_long, c_ulong, c_void}; use libc::{c_uchar, c_uint}; use std::any::Any; use std::any::TypeId; -use std::borrow::Borrow; use std::cmp; use std::collections::HashMap; use std::ffi::{CStr, CString}; @@ -777,8 +776,7 @@ impl SslContextBuilder { #[cfg(not(osslconf = "OPENSSL_NO_PSK"))] pub fn set_psk_callback<F>(&mut self, callback: F) where - F: Fn(&mut SslRef, Option<&[u8]>, &mut [u8], &mut [u8]) - -> Result<usize, ErrorStack> + F: Fn(&mut SslRef, Option<&[u8]>, &mut [u8], &mut [u8]) -> Result<usize, ErrorStack> + Any + 'static + Sync @@ -1026,12 +1024,6 @@ impl Clone for SslSession { } } -impl Borrow<SslSessionRef> for SslSession { - fn borrow(&self) -> &SslSessionRef { - &self - } -} - impl ToOwned for SslSessionRef { type Owned = SslSession; |