From 552c164a46051cdd78f86d8587c57f9a0c4668b9 Mon Sep 17 00:00:00 2001 From: Ryan Scheel Date: Sun, 8 Jul 2012 13:58:37 -0700 Subject: [PATCH 1/3] Parameter/Variable names for for_rev and map extended. --- doc/tutorial.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/tutorial.md b/doc/tutorial.md index ccb22c5b5cd3..dec2ab29caa7 100644 --- a/doc/tutorial.md +++ b/doc/tutorial.md @@ -1971,18 +1971,18 @@ they apply to. Thus, Rust allows functions and datatypes to have type parameters. ~~~~ -fn for_rev(v: ~[T], act: fn(T)) { - let mut i = vec::len(v); +fn for_rev(vector: ~[T], action fn(T)) { + let mut i = vec::len(vector); while i > 0u { i -= 1u; - act(v[i]); + action(vector[i]); } } -fn map(v: ~[T], f: fn(T) -> U) -> ~[U] { - let mut acc = ~[]; - for v.each |elt| { vec::push(acc, f(elt)); } - ret acc; +fn map(vector: ~[T], function :fn(T) -> U) -> ~[U] { + let mut accumulator = ~[]; + for vector.each |elt| { vec::push(accumulator, function(elt)); } + ret accumulator; } ~~~~ From 7e5b64bafe3c0bf03d6b0bb339798dc380540bfc Mon Sep 17 00:00:00 2001 From: Ryan Scheel Date: Sun, 8 Jul 2012 14:11:14 -0700 Subject: [PATCH 2/3] elt -> element --- doc/tutorial.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tutorial.md b/doc/tutorial.md index dec2ab29caa7..f179ed2dbe57 100644 --- a/doc/tutorial.md +++ b/doc/tutorial.md @@ -1981,7 +1981,7 @@ fn for_rev(vector: ~[T], action fn(T)) { fn map(vector: ~[T], function :fn(T) -> U) -> ~[U] { let mut accumulator = ~[]; - for vector.each |elt| { vec::push(accumulator, function(elt)); } + for vector.each |element| { vec::push(accumulator, function(eltement)); } ret accumulator; } ~~~~ From fb7f0a4ae1d038132f6f7f18f545f45501d63605 Mon Sep 17 00:00:00 2001 From: Ryan Scheel Date: Sun, 8 Jul 2012 14:19:30 -0700 Subject: [PATCH 3/3] It's hard to type when the cursor is not where you are actually typing. --- doc/tutorial.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tutorial.md b/doc/tutorial.md index f179ed2dbe57..3b2930347d31 100644 --- a/doc/tutorial.md +++ b/doc/tutorial.md @@ -1981,7 +1981,7 @@ fn for_rev(vector: ~[T], action fn(T)) { fn map(vector: ~[T], function :fn(T) -> U) -> ~[U] { let mut accumulator = ~[]; - for vector.each |element| { vec::push(accumulator, function(eltement)); } + for vector.each |element| { vec::push(accumulator, function(element)); } ret accumulator; } ~~~~