---

graydon · graydon · commit 32524a4380a5 · 2012-10-11T10:36:37.000-07:00
yaml --- r: 38495 b: refs/heads/incoming c: a2cace4 h: refs/heads/master i: 38493: 1c79abf 38491: 31e6cc8 38487: 235b987 38479: 5d80e25 38463: 6becd7c v: v3
diff --git a/[refs] b/[refs]
@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: c9cee7c2af5f3d2de06203d697b3890320a3dfc6
+refs/heads/incoming: a2cace473b8f375c36e7f977867c11852c949527
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/incoming/doc/rust.md b/branches/incoming/doc/rust.md
@@ -1000,15 +1000,15 @@ An example of a pure function that uses an unsafe block:
 ~~~~ {.xfail-test}
 # use 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))
     }
 }
 
 pure fn pure_length<T>(ls: List<T>) -> uint {
-    fn count<T>(_t: T, &&u: uint) -> uint { u + 1u }
+    fn count<T>(_t: &T, u: &uint) -> uint { *u + 1u }
     unsafe {
         pure_foldl(ls, 0u, count)
     }

Original file line number	Diff line number	Diff line change
`@@ -1000,15 +1000,15 @@ An example of a pure function that uses an unsafe block:`
`1000`	`1000`	`~~~~ {.xfail-test}`
`1001`	`1001`	`# use std::list::*;`
`1002`	`1002`
`1003`		`-fn pure_foldl<T, U: Copy>(ls: List<T>, u: U, f: fn(&&T, &&U) -> U) -> U {`
	`1003`	`+fn pure_foldl<T, U: Copy>(ls: List<T>, u: U, f: fn(&T, &U) -> U) -> U {`
`1004`	`1004`	`match ls {`
`1005`	`1005`	`Nil => u,`
`1006`	`1006`	`Cons(hd, tl) => f(hd, pure_foldl(*tl, f(hd, u), f))`
`1007`	`1007`	`}`
`1008`	`1008`	`}`
`1009`	`1009`
`1010`	`1010`	`pure fn pure_length<T>(ls: List<T>) -> uint {`
`1011`		`- fn count<T>(_t: T, &&u: uint) -> uint { u + 1u }`
	`1011`	`+ fn count<T>(_t: &T, u: &uint) -> uint { *u + 1u }`
`1012`	`1012`	`unsafe {`
`1013`	`1013`	`pure_foldl(ls, 0u, count)`
`1014`	`1014`	`}`