From ec333380e03eb1fb94c4938db888d5bed40b8fd6 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Fri, 12 Jun 2015 10:49:39 -0700
Subject: [PATCH] Fix libstd tests

---
 src/librustc_trans/lib.rs                           |  1 -
 src/librustc_typeck/lib.rs                          |  1 +
 src/libstd/lib.rs                                   |  5 ++++-
 src/libstd/sys/windows/thread_local.rs              |  3 +--
 src/libstd/thread/local.rs                          |  3 +--
 src/test/run-pass/issue-13259-windows-tcb-trash.rs  |  2 --
 src/test/run-pass/sync-send-iterators-in-libcore.rs | 10 +++++-----
 src/test/run-pass/x86stdcall2.rs                    |  2 --
 8 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/librustc_trans/lib.rs b/src/librustc_trans/lib.rs
index 8ced85d336b..bb7e95cd4ae 100644
--- a/src/librustc_trans/lib.rs
+++ b/src/librustc_trans/lib.rs
@@ -28,7 +28,6 @@
 #![feature(box_patterns)]
 #![feature(box_syntax)]
 #![feature(const_fn)]
-#![feature(fs)]
 #![feature(iter_cmp)]
 #![feature(iter_arith)]
 #![feature(libc)]
diff --git a/src/librustc_typeck/lib.rs b/src/librustc_typeck/lib.rs
index 76491010036..7519cd05195 100644
--- a/src/librustc_typeck/lib.rs
+++ b/src/librustc_typeck/lib.rs
@@ -75,6 +75,7 @@ This API is completely unstable and subject to change.
 
 #![allow(non_camel_case_types)]
 
+#![feature(append)]
 #![feature(box_patterns)]
 #![feature(box_syntax)]
 #![feature(drain)]
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)
         }
diff --git a/src/test/run-pass/issue-13259-windows-tcb-trash.rs b/src/test/run-pass/issue-13259-windows-tcb-trash.rs
index 9ebbddf5141..2e03a9a7244 100644
--- a/src/test/run-pass/issue-13259-windows-tcb-trash.rs
+++ b/src/test/run-pass/issue-13259-windows-tcb-trash.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
-
 #![feature(libc, std_misc)]
 
 extern crate libc;
diff --git a/src/test/run-pass/sync-send-iterators-in-libcore.rs b/src/test/run-pass/sync-send-iterators-in-libcore.rs
index 8dda2365ac7..d76bf89d053 100644
--- a/src/test/run-pass/sync-send-iterators-in-libcore.rs
+++ b/src/test/run-pass/sync-send-iterators-in-libcore.rs
@@ -10,15 +10,15 @@
 
 // pretty-expanded FIXME #23616
 
-#![allow(unused_mut)]
-#![feature(core)]
-#![feature(collections)]
-#![feature(step_by)]
+#![allow(warnings)]
 #![feature(iter_empty)]
 #![feature(iter_once)]
+#![feature(iter_unfold)]
+#![feature(range_inclusive)]
+#![feature(step_by)]
+#![feature(str_escape)]
 
 use std::iter::{empty, once, range_inclusive, repeat, Unfold};
->>>>>>> Fallout in tests and docs from feature renamings
 
 fn is_sync<T>(_: T) where T: Sync {}
 fn is_send<T>(_: T) where T: Send {}
diff --git a/src/test/run-pass/x86stdcall2.rs b/src/test/run-pass/x86stdcall2.rs
index 62da9c9d14b..c9742b0645e 100644
--- a/src/test/run-pass/x86stdcall2.rs
+++ b/src/test/run-pass/x86stdcall2.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
-
 #![feature(std_misc)]
 
 pub type HANDLE = u32;