Test fixes and rebase conflicts

diff --git a/src/libstd/sys/windows/backtrace.rs b/src/libstd/sys/windows/backtrace.rs
index 385834a6226e05ec82d77b760fa897484b2d56d9..d94dfdeeea494fe1d315e441562b7c5c74576989 100644 (file)
--- a/src/libstd/sys/windows/backtrace.rs
+++ b/src/libstd/sys/windows/backtrace.rs
@@ -283,7 +283,6 @@ pub fn init_frame(frame: &mut super::STACKFRAME64,
     }
 }
 
-#[repr(C)]
 struct Cleanup {
     handle: libc::HANDLE,
     SymCleanup: SymCleanupFn,