fix benchmark and the tutorials

diff --git a/doc/tutorial-tasks.md b/doc/tutorial-tasks.md
index b00cd665271f63cd959c8ae40c8a2bafad5631ea..2e3ce40c9f7dcb2e5da22fd6c4621bb65eda89aa 100644 (file)
--- a/doc/tutorial-tasks.md
+++ b/doc/tutorial-tasks.md
@@ -359,7 +359,7 @@ fn pnorm(nums: &~[float], p: uint) -> float {
 
 fn main() {
     let numbers = vec::from_fn(1000000, |_| rand::random::<float>());
-    println(fmt!("Inf-norm = %?",  numbers.max()));
+    println(fmt!("Inf-norm = %?",  *numbers.iter().max().unwrap()));
 
     let numbers_arc = ARC(numbers);
 

diff --git a/doc/tutorial.md b/doc/tutorial.md
index a458036116665354c214f48f46ae181dff3fdc50..c0b939ddac50fa5f6115baa7b36f0e8f5accac5b 100644 (file)
--- a/doc/tutorial.md
+++ b/doc/tutorial.md
@@ -2039,17 +2039,12 @@ themselves contain type parameters. A trait for generalized sequence
 types might look like the following:
 
 ~~~~
-# use std::vec;
 trait Seq<T> {
-    fn len(&self) -> uint;
-    fn iter(&self, b: &fn(v: &T));
+    fn length(&self) -> uint;
 }
 
 impl<T> Seq<T> for ~[T] {
-    fn len(&self) -> uint { self.len() }
-    fn iter(&self, b: &fn(v: &T)) {
-        for vec::each(*self) |elt| { b(elt); }
-    }
+    fn length(&self) -> uint { self.len() }
 }
 ~~~~
 

diff --git a/src/test/bench/shootout-fasta-redux.rs b/src/test/bench/shootout-fasta-redux.rs
index 8b587f02ad6d99499b17925e940446a608f367df..8c8b26afa08b117cf080487a43b4fca4a376837d 100644 (file)
--- a/src/test/bench/shootout-fasta-redux.rs
+++ b/src/test/bench/shootout-fasta-redux.rs
@@ -95,7 +95,8 @@ fn make(&mut self, n: uint) {
             let alu: &[u8] = self.alu.as_bytes();
 
             copy_memory(buf, alu, alu_len);
-            copy_memory(vec::mut_slice(buf, alu_len, buf.len()),
+            let buf_len = buf.len();
+            copy_memory(vec::mut_slice(buf, alu_len, buf_len),
                         alu,
                         LINE_LEN);