Merge pull request #19729 from vhbit/ios-oibit-fix

Fixed iOS build after oibit

Reviewed-by: alexcrichton

Author: bors

src/librustrt/lib.rs

@@ -128,5 +128,5 @@ pub mod shouldnt_be_public {
 
 #[cfg(not(test))]
 mod std {
-    pub use core::{fmt, option, cmp};
+    pub use core::{fmt, option, cmp, kinds};
 }

src/librustrt/libunwind.rs

@@ -25,6 +25,7 @@ use libc;
 
 #[cfg(any(not(target_arch = "arm"), target_os = "ios"))]
 #[repr(C)]
+#[deriving(Copy)]
 pub enum _Unwind_Action {
     _UA_SEARCH_PHASE = 1,
     _UA_CLEANUP_PHASE = 2,