Test fixes and rebase conflicts, round 4

diff --git a/src/test/run-pass/x86stdcall.rs b/src/test/run-pass/x86stdcall.rs
index 4a58c67d0ecc3c060e05123e50b606294a0a7e24..b884adb7a6ec3e92d1ed1e10cbdfee7097672fab 100644 (file)
--- 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" {