---

yaml
---
r: 60063
b: refs/heads/master
c: 4cd51c4
h: refs/heads/master
i:
  60061: c8e683e
  60059: 592d7ca
  60055: 6ebc562
  60047: 868bb47
  60031: b40d7e5
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 506392830052ec5da8ad0cdb0afc3439ec69f938
+refs/heads/master: 4cd51c416b8cf1a9d89089c99b8a1e2ac2f7255a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/try: c50a9d5b664478e533ba1d1d353213d70c8ad589

trunk/src/rt/rust_kernel.cpp

@@ -257,25 +257,6 @@ rust_kernel::generate_task_id() {
     return id;
 }
 
-#ifdef __WIN32__
-void
-rust_kernel::win32_require(LPCTSTR fn, BOOL ok) {
-    if (!ok) {
-        LPTSTR buf;
-        DWORD err = GetLastError();
-        FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
-                      FORMAT_MESSAGE_FROM_SYSTEM |
-                      FORMAT_MESSAGE_IGNORE_INSERTS,
-                      NULL, err,
-                      MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-                      (LPTSTR) &buf, 0, NULL );
-        KLOG_ERR_(dom, "%s failed with error %ld: %s", fn, err, buf);
-        LocalFree((HLOCAL)buf);
-        assert(ok);
-    }
-}
-#endif
-
 void
 rust_kernel::set_exit_status(int code) {
     scoped_lock with(rval_lock);

trunk/src/rt/rust_kernel.h

@@ -147,10 +147,6 @@ class rust_kernel {
     void wait_for_schedulers();
     int run();
 
-#ifdef __WIN32__
-    void win32_require(LPCTSTR fn, BOOL ok);
-#endif
-
     rust_task_id generate_task_id();
 
     void set_exit_status(int code);

trunk/src/rt/rust_rng.cpp

@@ -12,6 +12,26 @@
 #include "rust_rng.h"
 #include "rust_util.h"
 
+
+#ifdef __WIN32__
+void
+win32_require(LPCTSTR fn, BOOL ok) {
+    if (!ok) {
+        LPTSTR buf;
+        DWORD err = GetLastError();
+        FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
+                      FORMAT_MESSAGE_FROM_SYSTEM |
+                      FORMAT_MESSAGE_IGNORE_INSERTS,
+                      NULL, err,
+                      MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+                      (LPTSTR) &buf, 0, NULL );
+        fprintf(stderr, "%s failed with error %ld: %s", fn, err, buf);
+        LocalFree((HLOCAL)buf);
+        abort();
+    }
+}
+#endif
+
 size_t
 rng_seed_size() {
     randctx rctx;
@@ -24,13 +44,13 @@ void
 rng_gen_seed(rust_kernel* kernel, uint8_t* dest, size_t size) {
 #ifdef __WIN32__
     HCRYPTPROV hProv;
-    kernel->win32_require
+    win32_require
         (_T("CryptAcquireContext"),
          CryptAcquireContext(&hProv, NULL, NULL, PROV_RSA_FULL,
                              CRYPT_VERIFYCONTEXT|CRYPT_SILENT));
-    kernel->win32_require
+    win32_require
         (_T("CryptGenRandom"), CryptGenRandom(hProv, size, (BYTE*) dest));
-    kernel->win32_require
+    win32_require
         (_T("CryptReleaseContext"), CryptReleaseContext(hProv, 0));
 #else
     int fd = open("/dev/urandom", O_RDONLY);

trunk/src/test/compile-fail/issue-3707.rs

@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// xfail-test
 struct Obj {
     member: uint
 }
@@ -16,8 +17,8 @@ pub impl Obj {
     fn boom() -> bool {
         return 1+1 == 2
     }
-    fn chirp(&self) {
-        self.boom(); //~ ERROR `&Obj` does not implement any method in scope named `boom`
+    fn chirp() {
+        self.boom(); //~ ERROR wat
     }
 }