libtest: rename `BenchHarness` to `Bencher`

Closes #12640

2 files changed, 15 insertions, 15 deletions

diff --git a/src/libstd/io/buffered.rs b/src/libstd/io/buffered.rs
index c9d412973ec..8fe7f0ca595 100644
--- a/src/libstd/io/buffered.rs
+++ b/src/libstd/io/buffered.rs
@@ -371,7 +371,7 @@ mod test {
     use prelude::*;
     use super::*;
     use super::super::mem::{MemReader, MemWriter, BufReader};
-    use Harness = self::test::BenchHarness;
+    use self::test::Bencher;
 
     /// A type, free to create, primarily intended for benchmarking creation of
     /// wrappers that, just for construction, don't need a Reader/Writer that
@@ -584,22 +584,22 @@ mod test {
     }
 
     #[bench]
-    fn bench_buffered_reader(bh: &mut Harness) {
-        bh.iter(|| {
+    fn bench_buffered_reader(b: &mut Bencher) {
+        b.iter(|| {
             BufferedReader::new(NullStream)
         });
     }
 
     #[bench]
-    fn bench_buffered_writer(bh: &mut Harness) {
-        bh.iter(|| {
+    fn bench_buffered_writer(b: &mut Bencher) {
+        b.iter(|| {
             BufferedWriter::new(NullStream)
         });
     }
 
     #[bench]
-    fn bench_buffered_stream(bh: &mut Harness) {
-        bh.iter(|| {
+    fn bench_buffered_stream(b: &mut Bencher) {
+        b.iter(|| {
             BufferedStream::new(NullStream);
         });
     }
diff --git a/src/libstd/io/extensions.rs b/src/libstd/io/extensions.rs
index e1eaa2792bf..b2202a13057 100644
--- a/src/libstd/io/extensions.rs
+++ b/src/libstd/io/extensions.rs
@@ -503,7 +503,7 @@ mod test {
 #[cfg(test)]
 mod bench {
     extern crate test;
-    use self::test::BenchHarness;
+    use self::test::Bencher;
     use container::Container;
 
     macro_rules! u64_from_be_bytes_bench_impl(
@@ -514,7 +514,7 @@ mod bench {
 
             let data = slice::from_fn($stride*100+$start_index, |i| i as u8);
             let mut sum = 0u64;
-            bh.iter(|| {
+            b.iter(|| {
                 let mut i = $start_index;
                 while i < data.len() {
                     sum += u64_from_be_bytes(data, i, $size);
@@ -525,32 +525,32 @@ mod bench {
     )
 
     #[bench]
-    fn u64_from_be_bytes_4_aligned(bh: &mut BenchHarness) {
+    fn u64_from_be_bytes_4_aligned(b: &mut Bencher) {
         u64_from_be_bytes_bench_impl!(4, 4, 0);
     }
 
     #[bench]
-    fn u64_from_be_bytes_4_unaligned(bh: &mut BenchHarness) {
+    fn u64_from_be_bytes_4_unaligned(b: &mut Bencher) {
         u64_from_be_bytes_bench_impl!(4, 4, 1);
     }
 
     #[bench]
-    fn u64_from_be_bytes_7_aligned(bh: &mut BenchHarness) {
+    fn u64_from_be_bytes_7_aligned(b: &mut Bencher) {
         u64_from_be_bytes_bench_impl!(7, 8, 0);
     }
 
     #[bench]
-    fn u64_from_be_bytes_7_unaligned(bh: &mut BenchHarness) {
+    fn u64_from_be_bytes_7_unaligned(b: &mut Bencher) {
         u64_from_be_bytes_bench_impl!(7, 8, 1);
     }
 
     #[bench]
-    fn u64_from_be_bytes_8_aligned(bh: &mut BenchHarness) {
+    fn u64_from_be_bytes_8_aligned(b: &mut Bencher) {
         u64_from_be_bytes_bench_impl!(8, 8, 0);
     }
 
     #[bench]
-    fn u64_from_be_bytes_8_unaligned(bh: &mut BenchHarness) {
+    fn u64_from_be_bytes_8_unaligned(b: &mut Bencher) {
         u64_from_be_bytes_bench_impl!(8, 8, 1);
     }
 }