From e4e662207427b1231acc3f938e56ff5597b640e2 Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Wed, 17 Jun 2020 00:13:56 +0200 Subject: [PATCH] Switch to iter_with_large_drop --- implementations/rust/benches/codec.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/implementations/rust/benches/codec.rs b/implementations/rust/benches/codec.rs index 795ffe2..5509b5e 100644 --- a/implementations/rust/benches/codec.rs +++ b/implementations/rust/benches/codec.rs @@ -13,13 +13,13 @@ pub fn bench_decoder_bytes(c: &mut Criterion) { let mut fh = std::fs::File::open("../../tests/samples.bin").unwrap(); let mut bs = vec![]; fh.read_to_end(&mut bs).ok(); - c.bench_function("decode samples.bin via bytes", |b| b.iter( + c.bench_function("decode samples.bin via bytes", |b| b.iter_with_large_drop( || decoder::from_bytes(&bs[..]).demand_next().unwrap())); } pub fn bench_decoder_file(c: &mut Criterion) { let mut fh = std::fs::File::open("../../tests/samples.bin").unwrap(); - c.bench_function("decode samples.bin via file", |b| b.iter(|| { + c.bench_function("decode samples.bin via file", |b| b.iter_with_large_drop(|| { fh.seek(SeekFrom::Start(0)).ok(); decoder::from_read(&mut fh).demand_next().unwrap() })); @@ -27,7 +27,7 @@ pub fn bench_decoder_file(c: &mut Criterion) { pub fn bench_decoder_buffered_file(c: &mut Criterion) { let mut fh = BufReader::new(std::fs::File::open("../../tests/samples.bin").unwrap()); - c.bench_function("decode samples.bin via buffered file", |b| b.iter(|| { + c.bench_function("decode samples.bin via buffered file", |b| b.iter_with_large_drop(|| { fh.seek(SeekFrom::Start(0)).ok(); decoder::from_read(&mut fh).demand_next().unwrap() })); @@ -36,7 +36,7 @@ pub fn bench_decoder_buffered_file(c: &mut Criterion) { pub fn bench_encoder(c: &mut Criterion) { let mut fh = std::fs::File::open("../../tests/samples.bin").unwrap(); let v = decoder::from_read(&mut fh).demand_next().unwrap(); - c.bench_function("encode samples.bin", |b| b.iter(|| { + c.bench_function("encode samples.bin", |b| b.iter_with_large_drop(|| { let mut bs = vec![]; encoder::Encoder::new(&mut bs).write(&v).unwrap(); bs @@ -47,14 +47,14 @@ pub fn bench_de(c: &mut Criterion) { let mut fh = std::fs::File::open("../../tests/samples.bin").unwrap(); let mut bs = vec![]; fh.read_to_end(&mut bs).ok(); - c.bench_function("deserialize samples.bin", |b| b.iter( + c.bench_function("deserialize samples.bin", |b| b.iter_with_large_drop( || de::from_bytes::(&bs[..]).unwrap())); } pub fn bench_ser(c: &mut Criterion) { let mut fh = std::fs::File::open("../../tests/samples.bin").unwrap(); let v: TestCases = de::from_read(&mut fh).unwrap(); - c.bench_function("serialize samples.bin", |b| b.iter(|| { + c.bench_function("serialize samples.bin", |b| b.iter_with_large_drop(|| { let mut bs = vec![]; ser::to_writer(&mut bs, &v).unwrap(); bs @@ -65,14 +65,14 @@ pub fn bench_decoder_de(c: &mut Criterion) { let mut fh = std::fs::File::open("../../tests/samples.bin").unwrap(); let mut bs = vec![]; fh.read_to_end(&mut bs).ok(); - c.bench_function("decode-then-deserialize samples.bin", |b| b.iter( + c.bench_function("decode-then-deserialize samples.bin", |b| b.iter_with_large_drop( || value::de::from_value::(&decoder::from_bytes(&bs[..]).demand_next().unwrap()).unwrap())); } pub fn bench_ser_encoder(c: &mut Criterion) { let mut fh = std::fs::File::open("../../tests/samples.bin").unwrap(); let v: TestCases = de::from_read(&mut fh).unwrap(); - c.bench_function("serialize-then-encode samples.bin", |b| b.iter(|| { + c.bench_function("serialize-then-encode samples.bin", |b| b.iter_with_large_drop(|| { let mut bs = vec![]; encoder::Encoder::new(&mut bs).write(&value::ser::to_value(&v)).unwrap(); bs