aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--openssl/Cargo.toml2
-rw-r--r--openssl/src/bn.rs6
-rw-r--r--openssl/src/ssl/mod.rs7
-rw-r--r--openssl/src/x509/mod.rs13
4 files changed, 1 insertions, 27 deletions
diff --git a/openssl/Cargo.toml b/openssl/Cargo.toml
index 5ed46998..ded67075 100644
--- a/openssl/Cargo.toml
+++ b/openssl/Cargo.toml
@@ -20,7 +20,7 @@ v110 = []
[dependencies]
bitflags = "0.9"
-foreign-types = "0.2"
+foreign-types = "0.3"
lazy_static = "0.2"
libc = "0.2"
openssl-sys = { version = "0.9.21", path = "../openssl-sys" }
diff --git a/openssl/src/bn.rs b/openssl/src/bn.rs
index fc6e0bb8..82ec38b6 100644
--- a/openssl/src/bn.rs
+++ b/openssl/src/bn.rs
@@ -1090,12 +1090,6 @@ impl BigNum {
}
}
-impl AsRef<BigNumRef> for BigNum {
- fn as_ref(&self) -> &BigNumRef {
- self.deref()
- }
-}
-
impl fmt::Debug for BigNumRef {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match self.to_dec_str() {
diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs
index 176863d6..f3f1d219 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};
@@ -1026,12 +1025,6 @@ impl Clone for SslSession {
}
}
-impl Borrow<SslSessionRef> for SslSession {
- fn borrow(&self) -> &SslSessionRef {
- &self
- }
-}
-
impl ToOwned for SslSessionRef {
type Owned = SslSession;
diff --git a/openssl/src/x509/mod.rs b/openssl/src/x509/mod.rs
index db61262c..dff65222 100644
--- a/openssl/src/x509/mod.rs
+++ b/openssl/src/x509/mod.rs
@@ -2,7 +2,6 @@
use libc::{c_int, c_long};
use ffi;
use foreign_types::{ForeignType, ForeignTypeRef};
-use std::borrow::Borrow;
use std::collections::HashMap;
use std::error::Error;
use std::ffi::{CStr, CString};
@@ -620,24 +619,12 @@ impl Clone for X509 {
}
}
-impl AsRef<X509Ref> for X509 {
- fn as_ref(&self) -> &X509Ref {
- &*self
- }
-}
-
impl AsRef<X509Ref> for X509Ref {
fn as_ref(&self) -> &X509Ref {
self
}
}
-impl Borrow<X509Ref> for X509 {
- fn borrow(&self) -> &X509Ref {
- &*self
- }
-}
-
impl Stackable for X509 {
type StackType = ffi::stack_st_X509;
}