---

yaml
---
r: 30897
b: refs/heads/incoming
c: 4f323d0
h: refs/heads/master
i:
  30895: 4bfddb9
v: v3

Author: catamorphism

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 3639d38d5c982193eab8304f2adfe0fcd2dd84bd
+refs/heads/incoming: 4f323d05da658da7debfcb0c878815889f9571e8
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/os.rs

@@ -328,7 +328,7 @@ pub fn pipe() -> {in: c_int, out: c_int} {
     // in rust_run_program.
     let fds = { mut in: 0 as c_int,
                 mut out: 0 as c_int };
-    let res = libc::pipe(ptr::mut_addr_of(fds.in),
+    let res = libc::pipe(ptr::mut_addr_of(&(fds.in)),
                          1024 as c_uint,
                          (libc::O_BINARY | libc::O_NOINHERIT) as c_int);
     assert (res == 0 as c_int);
@@ -365,7 +365,7 @@ pub fn self_exe_path() -> Option<Path> {
                            KERN_PROC as c_int,
                            KERN_PROC_PATHNAME as c_int, -1 as c_int];
                 sysctl(vec::raw::to_ptr(mib), vec::len(mib) as c_uint,
-                       buf as *mut c_void, ptr::mut_addr_of(sz),
+                       buf as *mut c_void, ptr::mut_addr_of(&sz),
                        ptr::null(), 0u as size_t) == (0 as c_int)
             }
         }