Test fixes and rebase conflicts

2015-01-21 09:23:27 -08:00 · 2015-01-21 09:23:27 -08:00 · 4ffde0814f
commit 4ffde0814f
parent 9c999c797c
11 changed files with 7 additions and 42 deletions
--- a/src/libstd/thread_local/mod.rs
+++ b/src/libstd/thread_local/mod.rs
@ -459,6 +459,7 @@ mod imp {

    use cell::UnsafeCell;
    use mem;
+    use ptr;
    use sys_common::thread_local::StaticKey as OsStaticKey;

    #[doc(hidden)]