---

yaml
---
r: 30323
b: refs/heads/incoming
c: ef880f2
h: refs/heads/master
i:
  30321: fe93d87
  30319: 45a65de
v: v3

Author: brson

[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: 02b1c32e4d3c607da8b3a48640e597f089375765
+refs/heads/incoming: ef880f22450c4f7e455f431ff4603f90d443b545
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/doc/rust.md

@@ -1027,9 +1027,9 @@ pure fn lt_42(x: int) -> bool {
 Pure functions may call other pure functions:
 
 ~~~~{.xfail-test}
-pure fn pure_length<T>(ls: list<T>) -> uint { /* ... */ }
+pure fn pure_length<T>(ls: List<T>) -> uint { /* ... */ }
 
-pure fn nonempty_list<T>(ls: list<T>) -> bool { pure_length(ls) > 0u }
+pure fn nonempty_list<T>(ls: List<T>) -> bool { pure_length(ls) > 0u }
 ~~~~
 
 *TODO:* should actually define referential transparency.
@@ -1055,14 +1055,14 @@ An example of a pure function that uses an unchecked block:
 ~~~~
 # import std::list::*;
 
-fn pure_foldl<T, U: copy>(ls: list<T>, u: U, f: fn(&&T, &&U) -> U) -> U {
+fn pure_foldl<T, U: copy>(ls: List<T>, u: U, f: fn(&&T, &&U) -> U) -> U {
     match ls {
-      nil => u,
-      cons(hd, tl) => f(hd, pure_foldl(*tl, f(hd, u), f))
+      Nil => u,
+      Cons(hd, tl) => f(hd, pure_foldl(*tl, f(hd, u), f))
     }
 }
 
-pure fn pure_length<T>(ls: list<T>) -> uint {
+pure fn pure_length<T>(ls: List<T>) -> uint {
     fn count<T>(_t: T, &&u: uint) -> uint { u + 1u }
     unchecked {
         pure_foldl(ls, 0u, count)