diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-06-12 10:49:39 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-06-18 10:51:31 -0700 |
| commit | ec333380e03eb1fb94c4938db888d5bed40b8fd6 (patch) | |
| tree | d61a76778a5f1b0bb2de0f754e033f09234e70da /src/libstd | |
| parent | 913c2273eba32c7a33e068a5ac68007d7f8419d1 (diff) | |
| download | rust-ec333380e03eb1fb94c4938db888d5bed40b8fd6.tar.gz rust-ec333380e03eb1fb94c4938db888d5bed40b8fd6.zip | |
Fix libstd tests
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/lib.rs | 5 | ||||
| -rw-r--r-- | src/libstd/sys/windows/thread_local.rs | 3 | ||||
| -rw-r--r-- | src/libstd/thread/local.rs | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 251f962c5e3..e5242c5bf86 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -106,6 +106,7 @@ #![feature(alloc)] #![feature(allow_internal_unstable)] #![feature(associated_consts)] +#![feature(borrow_state)] #![feature(box_raw)] #![feature(box_syntax)] #![feature(char_internals)] @@ -130,7 +131,6 @@ #![feature(slice_concat_ext)] #![feature(slice_position_elem)] #![feature(no_std)] -#![feature(num_bits_bytes)] #![feature(oom)] #![feature(optin_builtin_traits)] #![feature(rand)] @@ -148,6 +148,9 @@ #![feature(vec_push_all)] #![feature(wrapping)] #![feature(zero_one)] +#![cfg_attr(all(unix, not(target_os = "macos"), not(target_os = "ios")), + feature(num_bits_bytes))] +#![cfg_attr(windows, feature(str_utf16))] #![cfg_attr(test, feature(float_from_str_radix, range_inclusive, float_extras))] #![cfg_attr(test, feature(test, rustc_private, float_consts))] diff --git a/src/libstd/sys/windows/thread_local.rs b/src/libstd/sys/windows/thread_local.rs index a3d522d1757..5002de55988 100644 --- a/src/libstd/sys/windows/thread_local.rs +++ b/src/libstd/sys/windows/thread_local.rs @@ -12,7 +12,6 @@ use prelude::v1::*; use libc::types::os::arch::extra::{DWORD, LPVOID, BOOL}; -use boxed; use ptr; use rt; use sys_common::mutex::Mutex; @@ -143,7 +142,7 @@ unsafe fn init_dtors() { DTOR_LOCK.unlock(); }); if res.is_ok() { - DTORS = boxed::into_raw(dtors); + DTORS = Box::into_raw(dtors); } else { DTORS = 1 as *mut _; } diff --git a/src/libstd/thread/local.rs b/src/libstd/thread/local.rs index 2c4b716cc6e..60563340d10 100644 --- a/src/libstd/thread/local.rs +++ b/src/libstd/thread/local.rs @@ -405,7 +405,6 @@ mod imp { mod imp { use prelude::v1::*; - use alloc::boxed; use cell::{Cell, UnsafeCell}; use marker; use ptr; @@ -447,7 +446,7 @@ mod imp { key: self, value: UnsafeCell::new(None), }; - let ptr = boxed::into_raw(ptr); + let ptr = Box::into_raw(ptr); self.os.set(ptr as *mut u8); Some(&(*ptr).value) } |