Test fixes and rebase conflicts

alexcrichton · alexcrichton · commit 1b34c099a6a6 · 2015-04-29T17:05:20.000-07:00
diff --git a/src/libstd/sys/windows/backtrace.rs b/src/libstd/sys/windows/backtrace.rs
@@ -283,7 +283,6 @@ mod arch {
     }
 }
 
-#[repr(C)]
 struct Cleanup {
     handle: libc::HANDLE,
     SymCleanup: SymCleanupFn,
