diff --git a/src/test/bench/shootout-k-nucleotide-pipes.rs b/src/test/bench/shootout-k-nucleotide-pipes.rs index b777b25243b..d65a22ba2a4 100644 --- a/src/test/bench/shootout-k-nucleotide-pipes.rs +++ b/src/test/bench/shootout-k-nucleotide-pipes.rs @@ -13,8 +13,6 @@ // multi tasking k-nucleotide -#![allow(bad_style)] - use std::ascii::AsciiExt; use std::cmp::Ordering::{self, Less, Greater, Equal}; use std::collections::HashMap; @@ -47,7 +45,7 @@ fn sort_and_fmt(mm: &HashMap , usize>, total: usize) -> String { } // sort by key, then by value - fn sortKV(mut orig: Vec<(Vec ,f64)> ) -> Vec<(Vec ,f64)> { + fn sort_kv(mut orig: Vec<(Vec ,f64)> ) -> Vec<(Vec ,f64)> { orig.sort_by(|&(ref a, _), &(ref b, _)| a.cmp(b)); orig.sort_by(|&(_, a), &(_, b)| f64_cmp(b, a)); orig @@ -60,7 +58,7 @@ fn sort_and_fmt(mm: &HashMap , usize>, total: usize) -> String { pairs.push(((*key).clone(), pct(val, total))); } - let pairs_sorted = sortKV(pairs); + let pairs_sorted = sort_kv(pairs); let mut buffer = String::new(); for &(ref k, v) in &pairs_sorted { diff --git a/src/test/bench/shootout-reverse-complement.rs b/src/test/bench/shootout-reverse-complement.rs index 55b2b1e2e32..64b0f91f4dc 100644 --- a/src/test/bench/shootout-reverse-complement.rs +++ b/src/test/bench/shootout-reverse-complement.rs @@ -205,7 +205,7 @@ fn parallel(iter: I, ref f: F) fn main() { let mut data = Vec::with_capacity(1024 * 1024); - io::stdin().read_to_end(&mut data); + io::stdin().read_to_end(&mut data).unwrap(); let tables = &Tables::new(); parallel(mut_dna_seqs(&mut data), |seq| reverse_complement(seq, tables)); io::stdout().write_all(&data).unwrap();