diff options
| author | bors <bors@rust-lang.org> | 2020-01-17 15:58:24 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-01-17 15:58:24 +0000 |
| commit | 689fca01c5a1eac2d240bf08aa728171a28f2285 (patch) | |
| tree | 20c3e430ee7eac5254a495608ff233e9f4c7d74e /src/liballoc | |
| parent | 71c6346aa1afa5a0d246649d4919e11311e635f2 (diff) | |
| parent | 87a2896b0aa32343af271d430c1e9ce548e1ff1f (diff) | |
| download | rust-689fca01c5a1eac2d240bf08aa728171a28f2285.tar.gz rust-689fca01c5a1eac2d240bf08aa728171a28f2285.zip | |
Auto merge of #68311 - Dylan-DPC:rollup-wzgqw9t, r=Dylan-DPC
Rollup of 4 pull requests
Successful merges:
- #66564 (Document unsafe blocks in core::{cell, str, sync})
- #67791 (Implement Lift using interners instead of in_arena)
- #68278 ([self-profiler] Add example to `-Z help` to turn on query key recording)
- #68300 (Allow added string.insert benchmarks to compile)
Failed merges:
r? @ghost
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/benches/string.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liballoc/benches/string.rs b/src/liballoc/benches/string.rs index 599c8b16828..5c95160ba2d 100644 --- a/src/liballoc/benches/string.rs +++ b/src/liballoc/benches/string.rs @@ -1,5 +1,5 @@ use std::iter::repeat; -use test::Bencher; +use test::{black_box, Bencher}; #[bench] fn bench_with_capacity(b: &mut Bencher) { |