about summary refs log tree commit diff
path: root/src/libtest
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-02-18 14:35:01 -0800
committerAlex Crichton <alex@alexcrichton.com>2015-02-18 14:35:01 -0800
commit5250a82f7917d6f9ec590e7e762bfd036e21ef74 (patch)
tree38ce94117b42eb159b630d0a97748b5f3056fbe5 /src/libtest
parent5a32b4a34fc6fbd78e293b16f7ba7d06caca7a48 (diff)
parent811c48fe22ffbe4ca45c32807c846d9a7c02a8f3 (diff)
downloadrust-5250a82f7917d6f9ec590e7e762bfd036e21ef74.tar.gz
rust-5250a82f7917d6f9ec590e7e762bfd036e21ef74.zip
rollup merge of #22497: nikomatsakis/suffixes
Conflicts:
	src/librustc_trans/trans/tvec.rs
Diffstat (limited to 'src/libtest')
-rw-r--r--src/libtest/stats.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libtest/stats.rs b/src/libtest/stats.rs
index e7b5820006b..4e94be59ade 100644
--- a/src/libtest/stats.rs
+++ b/src/libtest/stats.rs
@@ -939,7 +939,7 @@ mod bench {
     #[bench]
     pub fn sum_many_f64(b: &mut Bencher) {
         let nums = [-1e30f64, 1e60, 1e30, 1.0, -1e60];
-        let v = (0us..500).map(|i| nums[i%5]).collect::<Vec<_>>();
+        let v = (0..500).map(|i| nums[i%5]).collect::<Vec<_>>();
 
         b.iter(|| {
             v.sum();