Test fixes and rebase conflicts, round 4

alexcrichton · alexcrichton · commit d252d0ad5434 · 2015-03-24T10:23:47.000-07:00
diff --git a/src/test/run-pass/x86stdcall.rs b/src/test/run-pass/x86stdcall.rs
@@ -10,8 +10,6 @@
 
 // GetLastError doesn't seem to work with stack switching
 
-// pretty-expanded FIXME #23616
-
 #[cfg(windows)]
 mod kernel32 {
   extern "system" {
