about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-02-13 19:16:59 -0800
committerbors <bors@rust-lang.org>2014-02-13 19:16:59 -0800
commit68129d299b54806b6aa4ec9f3a0755854db7b491 (patch)
treee68b861deca38e786ea5a22a32999de0630c27c7 /src/test
parent89b1686bd7db25b5dd948b1a4d9dfd0c68084c29 (diff)
parentbf1464c413bb2564c7be0eaceef9515bc0f94f1f (diff)
auto merge of #12061 : pongad/rust/delorderable, r=cmr
#12057
Diffstat (limited to 'src/test')
-rw-r--r--src/test/bench/shootout-fasta.rs2
-rw-r--r--src/test/bench/shootout-spectralnorm.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/bench/shootout-fasta.rs b/src/test/bench/shootout-fasta.rs
index 74d8af52f7d..12e78629386 100644
--- a/src/test/bench/shootout-fasta.rs
+++ b/src/test/bench/shootout-fasta.rs
@@ -16,7 +16,7 @@
 
 use std::io;
 use std::io::{BufferedWriter, File};
-use std::num::min;
+use std::cmp::min;
 use std::os;
 
 static LINE_LENGTH: uint = 60;
diff --git a/src/test/bench/shootout-spectralnorm.rs b/src/test/bench/shootout-spectralnorm.rs
index 96883dd4e21..a6e6713e137 100644
--- a/src/test/bench/shootout-spectralnorm.rs
+++ b/src/test/bench/shootout-spectralnorm.rs
@@ -14,7 +14,7 @@ extern mod sync;
 
 use std::from_str::FromStr;
 use std::iter::count;
-use std::num::min;
+use std::cmp::min;
 use std::os;
 use std::vec::from_elem;
 use sync::Arc;