From 9dfeea6ca9f8527e8be56c208e21a1a48f22f6cf Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Fri, 9 Jan 2015 08:07:39 -0800
Subject: Update to rust master

---
 openssl-sys/src/build.rs |  2 ++
 openssl-sys/src/lib.rs   | 12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'openssl-sys/src')

diff --git a/openssl-sys/src/build.rs b/openssl-sys/src/build.rs
index ca71f791..3f3053f0 100644
--- a/openssl-sys/src/build.rs
+++ b/openssl-sys/src/build.rs
@@ -1,3 +1,5 @@
+#![allow(unstable)]
+
 extern crate "pkg-config" as pkg_config;
 
 use std::os;
diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs
index fb1ecb78..7384340c 100644
--- a/openssl-sys/src/lib.rs
+++ b/openssl-sys/src/lib.rs
@@ -1,5 +1,5 @@
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
-#![allow(dead_code)]
+#![allow(dead_code, unstable)]
 
 extern crate libc;
 
@@ -197,12 +197,12 @@ static mut GUARDS: *mut Vec<Option<MutexGuard<'static, ()>>> = 0 as *mut Vec<Opt
 extern fn locking_function(mode: c_int, n: c_int, _file: *const c_char,
                                _line: c_int) {
     unsafe {
-        let mutex = &(*MUTEXES)[n as uint];
+        let mutex = &(*MUTEXES)[n as usize];
 
         if mode & CRYPTO_LOCK != 0 {
-            (*GUARDS)[n as uint] = Some(mutex.lock().unwrap());
+            (*GUARDS)[n as usize] = Some(mutex.lock().unwrap());
         } else {
-            &(*GUARDS)[n as uint].take();
+            &(*GUARDS)[n as usize].take();
         }
     }
 }
@@ -216,10 +216,10 @@ pub fn init() {
             SSL_load_error_strings();
 
             let num_locks = CRYPTO_num_locks();
-            let mutexes = box range(0, num_locks).map(|_| MUTEX_INIT).collect::<Vec<_>>();
+            let mutexes = Box::new(range(0, num_locks).map(|_| MUTEX_INIT).collect::<Vec<_>>());
             MUTEXES = mem::transmute(mutexes);
             let guards: Box<Vec<Option<MutexGuard<()>>>> =
-                box range(0, num_locks).map(|_| None).collect();
+                Box::new(range(0, num_locks).map(|_| None).collect());
             GUARDS = mem::transmute(guards);
 
             CRYPTO_set_locking_callback(locking_function);
-- 
cgit v1.2.3