diff options
| author | Steven Fackler <[email protected]> | 2014-11-26 08:45:47 -0800 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2014-11-26 08:45:47 -0800 |
| commit | ccb134e3200a654c41eb1653e6c7e8063bd98211 (patch) | |
| tree | 2c5ecbaa182daea3fced586097a64850e9f31ec4 | |
| parent | Bump to 0.1.0 (diff) | |
| parent | Sync is now part of the standard library (diff) | |
| download | rust-openssl-ccb134e3200a654c41eb1653e6c7e8063bd98211.tar.xz rust-openssl-ccb134e3200a654c41eb1653e6c7e8063bd98211.zip | |
Merge pull request #105 from andor44/master
Sync is now part of the standard library
| -rwxr-xr-x | openssl-sys/src/lib.rs | 3 | ||||
| -rw-r--r-- | src/lib.rs | 1 | ||||
| -rw-r--r-- | src/ssl/mod.rs | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs index 3a92a8d4..50186ae0 100755 --- a/openssl-sys/src/lib.rs +++ b/openssl-sys/src/lib.rs @@ -3,13 +3,12 @@ extern crate libc; extern crate rustrt; -extern crate sync; use libc::{c_void, c_int, c_char, c_ulong, c_long, c_uint, c_uchar, size_t}; use std::mem; use std::ptr; use rustrt::mutex::NativeMutex; -use sync::one::{Once, ONCE_INIT}; +use std::sync::{Once, ONCE_INIT}; pub type ASN1_INTEGER = c_void; pub type ASN1_STRING = c_void; @@ -7,7 +7,6 @@ extern crate libc; #[cfg(test)] extern crate serialize; -extern crate sync; extern crate "openssl-sys" as ffi; diff --git a/src/ssl/mod.rs b/src/ssl/mod.rs index 1985dcd0..c9e33e8e 100644 --- a/src/ssl/mod.rs +++ b/src/ssl/mod.rs @@ -2,7 +2,7 @@ use libc::{c_int, c_void, c_long}; use std::io::{IoResult, IoError, EndOfFile, Stream, Reader, Writer}; use std::mem; use std::ptr; -use sync::one::{Once, ONCE_INIT}; +use std::sync::{Once, ONCE_INIT}; use bio::{MemBio}; use ffi; |