auto merge of #13236 : liigo/rust/rename-benchharness, r=huonw

Closes #12640

based on PR #13030, rebased, and passed all tests.

2 files changed, 10 insertions, 10 deletions

diff --git a/src/libstd/rt/global_heap.rs b/src/libstd/rt/global_heap.rs
index 5c1b6cd4791..01949a7057b 100644
--- a/src/libstd/rt/global_heap.rs
+++ b/src/libstd/rt/global_heap.rs
@@ -117,18 +117,18 @@ pub unsafe fn exchange_free(ptr: *u8) {
 #[cfg(test)]
 mod bench {
     extern crate test;
-    use self::test::BenchHarness;
+    use self::test::Bencher;
 
     #[bench]
-    fn alloc_owned_small(bh: &mut BenchHarness) {
-        bh.iter(|| {
+    fn alloc_owned_small(b: &mut Bencher) {
+        b.iter(|| {
             ~10
         })
     }
 
     #[bench]
-    fn alloc_owned_big(bh: &mut BenchHarness) {
-        bh.iter(|| {
+    fn alloc_owned_big(b: &mut Bencher) {
+        b.iter(|| {
             ~[10, ..1000]
         })
     }
diff --git a/src/libstd/rt/local_heap.rs b/src/libstd/rt/local_heap.rs
index 163e69f9686..b9d0d829374 100644
--- a/src/libstd/rt/local_heap.rs
+++ b/src/libstd/rt/local_heap.rs
@@ -326,15 +326,15 @@ pub fn live_allocs() -> *mut Box {
 #[cfg(test)]
 mod bench {
     extern crate test;
-    use self::test::BenchHarness;
+    use self::test::Bencher;
 
     #[bench]
-    fn alloc_managed_small(bh: &mut BenchHarness) {
-        bh.iter(|| { @10; });
+    fn alloc_managed_small(b: &mut Bencher) {
+        b.iter(|| { @10; });
     }
 
     #[bench]
-    fn alloc_managed_big(bh: &mut BenchHarness) {
-        bh.iter(|| { @([10, ..1000]); });
+    fn alloc_managed_big(b: &mut Bencher) {
+        b.iter(|| { @([10, ..1000]); });
     }
 }