---

yaml
---
r: 5671
b: refs/heads/master
c: 9698ef8
h: refs/heads/master
i:
  5669: 549c074
  5667: 35598c0
  5663: 48deb49
v: v3

Author: pcwalton

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 990233eb3d0b8b609a861f137c91cc5d6163265b
+refs/heads/master: 9698ef89a0c5513b9670f6ec56ea06de5728eb5a

trunk/src/lib/fs.rs

@@ -1,9 +1,10 @@
 
 import os::getcwd;
+import util::void;
 import os_fs;
 
-native "rust" mod rustrt {
-    fn rust_file_is_dir(path: str::sbuf) -> int;
+native "c-stack-cdecl" mod rustrt {
+    fn rust_file_is_dir(unused: *void, path: *u8) -> int;
 }
 
 fn path_sep() -> str { ret str::from_char(os_fs::path_sep); }
@@ -52,7 +53,9 @@ fn connect_many(paths: [path]) : vec::is_not_empty(paths) -> path {
 }
 
 fn file_is_dir(p: path) -> bool {
-    ret str::as_buf(p, {|buf| rustrt::rust_file_is_dir(buf) != 0 });
+    ret str::as_buf(p, {
+        |buf| rustrt::rust_file_is_dir(ptr::null(), buf) != 0
+    });
 }
 
 fn list_dir(p: path) -> [str] {

trunk/src/lib/util.rs

@@ -17,6 +17,13 @@ pure fn rational_leq(x: rational, y: rational) -> bool {
 }
 
 pure fn orb(a: bool, b: bool) -> bool { a || b }
+
+// An unconstructible type. Currently we're using this for unused parameters
+// in native functions, but it may be useful for other purposes as well.
+tag void {
+    void(@void);
+}
+
 // Local Variables:
 // mode: rust;
 // fill-column: 78;