Skip to content

Commit 7f00ab3

Browse files
committed
fix benchmark and the tutorials
1 parent 845465e commit 7f00ab3

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

doc/tutorial-tasks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ fn pnorm(nums: &~[float], p: uint) -> float {
359359
360360
fn main() {
361361
let numbers = vec::from_fn(1000000, |_| rand::random::<float>());
362-
println(fmt!("Inf-norm = %?", numbers.max()));
362+
println(fmt!("Inf-norm = %?", *numbers.iter().max().unwrap()));
363363
364364
let numbers_arc = ARC(numbers);
365365

doc/tutorial.md

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2039,17 +2039,12 @@ themselves contain type parameters. A trait for generalized sequence
20392039
types might look like the following:
20402040

20412041
~~~~
2042-
# use std::vec;
20432042
trait Seq<T> {
2044-
fn len(&self) -> uint;
2045-
fn iter(&self, b: &fn(v: &T));
2043+
fn length(&self) -> uint;
20462044
}
20472045
20482046
impl<T> Seq<T> for ~[T] {
2049-
fn len(&self) -> uint { self.len() }
2050-
fn iter(&self, b: &fn(v: &T)) {
2051-
for vec::each(*self) |elt| { b(elt); }
2052-
}
2047+
fn length(&self) -> uint { self.len() }
20532048
}
20542049
~~~~
20552050

src/test/bench/shootout-fasta-redux.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@ impl RepeatFasta {
9595
let alu: &[u8] = self.alu.as_bytes();
9696

9797
copy_memory(buf, alu, alu_len);
98-
copy_memory(vec::mut_slice(buf, alu_len, buf.len()),
98+
let buf_len = buf.len();
99+
copy_memory(vec::mut_slice(buf, alu_len, buf_len),
99100
alu,
100101
LINE_LEN);
101102

0 commit comments

Comments
 (0)