aboutsummaryrefslogtreecommitdiff
path: root/openssl/src
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2016-10-31 20:56:51 -0700
committerSteven Fackler <[email protected]>2016-10-31 20:56:51 -0700
commit96a77cf5a8388cea89e61e5d610f78bae1842d3a (patch)
treee33a63376ff9418ea0ac1401503d4d416af96813 /openssl/src
parentUpdate x509 (diff)
downloadrust-openssl-96a77cf5a8388cea89e61e5d610f78bae1842d3a.tar.xz
rust-openssl-96a77cf5a8388cea89e61e5d610f78bae1842d3a.zip
Remove Opaque
Diffstat (limited to 'openssl/src')
-rw-r--r--openssl/src/lib.rs1
-rw-r--r--openssl/src/opaque.rs6
-rw-r--r--openssl/src/types.rs5
3 files changed, 2 insertions, 10 deletions
diff --git a/openssl/src/lib.rs b/openssl/src/lib.rs
index 8fa53f3b..d053606f 100644
--- a/openssl/src/lib.rs
+++ b/openssl/src/lib.rs
@@ -59,7 +59,6 @@ macro_rules! type_ {
}
mod bio;
-mod opaque;
mod util;
pub mod asn1;
pub mod bn;
diff --git a/openssl/src/opaque.rs b/openssl/src/opaque.rs
deleted file mode 100644
index 9545471c..00000000
--- a/openssl/src/opaque.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use std::cell::UnsafeCell;
-
-/// This is intended to be used as the inner type for types designed to be pointed to by references
-/// converted from raw C pointers. It has an `UnsafeCell` internally to inform the compiler about
-/// aliasability and doesn't implement `Copy`, so it can't be dereferenced.
-pub struct Opaque(UnsafeCell<()>);
diff --git a/openssl/src/types.rs b/openssl/src/types.rs
index 16829ea4..7302bca9 100644
--- a/openssl/src/types.rs
+++ b/openssl/src/types.rs
@@ -1,7 +1,6 @@
+use std::cell::UnsafeCell;
use std::marker::PhantomData;
-use opaque::Opaque;
-
pub unsafe trait OpenSslType {
type CType;
@@ -10,7 +9,7 @@ pub unsafe trait OpenSslType {
fn as_ptr(&self) -> *mut Self::CType;
}
-pub struct Ref<T>(Opaque, PhantomData<T>);
+pub struct Ref<T>(UnsafeCell<()>, PhantomData<T>);
impl<T: OpenSslType> Ref<T> {
pub unsafe fn from_ptr<'a>(ptr: *mut T::CType) -> &'a Ref<T> {