---

yaml
---
r: 57779
b: refs/heads/incoming
c: 08109aa
h: refs/heads/master
i:
  57777: 8e99e82
  57775: 6583100
v: v3

Author: catamorphism

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: bf67eb2362b7d0f37012f2d6dac604c3bbacd2c6
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: 0c6f9a889b7807ce5d793c3005d2ef8d150dd838
+refs/heads/incoming: 08109aa0ad3d53ff11202d2846652785ddefb02a
 refs/heads/dist-snap: 00dbbd01c2aee72982b3e0f9511ae1d4428c3ba9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/os.rs

@@ -43,8 +43,6 @@ use vec;
 pub use libc::fclose;
 pub use os::consts::*;
 
-// FIXME: move these to str perhaps? #2620
-
 pub fn close(fd: c_int) -> c_int {
     unsafe {
         libc::close(fd)
@@ -79,6 +77,8 @@ pub fn getcwd() -> Path {
     }
 }
 
+// FIXME: move these to str perhaps? #2620
+
 pub fn as_c_charp<T>(s: &str, f: &fn(*c_char) -> T) -> T {
     str::as_c_str(s, |b| f(b as *c_char))
 }

branches/incoming/src/libsyntax/ext/tt/transcribe.rs

@@ -22,6 +22,8 @@ use core::hashmap::HashMap;
 use core::option;
 use core::vec;
 
+/* FIXME #2811: figure out how to have a uniquely linked stack, and change to
+   `~` */
 ///an unzipping of `token_tree`s
 struct TtFrame {
     forest: @mut ~[ast::token_tree],