diff options
| author | bors <bors@rust-lang.org> | 2014-12-19 16:02:31 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-12-19 16:02:31 +0000 |
| commit | 95c2ed31aeb66b2662933200dbfd661a573b1f49 (patch) | |
| tree | 3e397ee769c09211083f8aa12377e41104575f7f /src/libstd/rt | |
| parent | bd90b936d73c0ea2c261cd8e7b9c43764cb2da05 (diff) | |
| parent | f975b10310b2f38a5ac1e50f30778b85ed963849 (diff) | |
| download | rust-95c2ed31aeb66b2662933200dbfd661a573b1f49.tar.gz rust-95c2ed31aeb66b2662933200dbfd661a573b1f49.zip | |
auto merge of #19867 : japaric/rust/deriving-copy, r=acrichto
r? @alexcrichton
Diffstat (limited to 'src/libstd/rt')
| -rw-r--r-- | src/libstd/rt/unwind.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/libstd/rt/unwind.rs b/src/libstd/rt/unwind.rs index 5d5440b887d..f572141642c 100644 --- a/src/libstd/rt/unwind.rs +++ b/src/libstd/rt/unwind.rs @@ -384,7 +384,6 @@ pub mod eabi { pub use self::EXCEPTION_DISPOSITION::*; use rt::libunwind as uw; use libc::{c_void, c_int}; - use kinds::Copy; #[repr(C)] #[allow(missing_copy_implementations)] @@ -397,6 +396,7 @@ pub mod eabi { pub struct DISPATCHER_CONTEXT; #[repr(C)] + #[deriving(Copy)] pub enum EXCEPTION_DISPOSITION { ExceptionContinueExecution, ExceptionContinueSearch, @@ -404,8 +404,6 @@ pub mod eabi { ExceptionCollidedUnwind } - impl Copy for EXCEPTION_DISPOSITION {} - type _Unwind_Personality_Fn = extern "C" fn( version: c_int, |