Test fixes and rebase conflicts

1b34c099 · Alex Crichton · 2edb6438 · 1b34c099
隐藏空白更改
内联并排

Showing with 0 addition and 1 deletion

src/libstd/sys/windows/backtrace.rs src/libstd/sys/windows/backtrace.rs +0 -1

未找到文件。
--- 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,