diff options
| author | bors <bors@rust-lang.org> | 2020-06-24 15:47:22 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-06-24 15:47:22 +0000 |
| commit | d8ed1b03c202d77248eb0d335062f46026fc29c4 (patch) | |
| tree | d5a33e2cd87696a4b55cf789a903d1af3554bf69 /src/liballoc | |
| parent | 0b66a89735305ebac93894461559576495ab920e (diff) | |
| parent | be8f381c8a76c5c7e6d2c41a092edf173b23344a (diff) | |
| download | rust-d8ed1b03c202d77248eb0d335062f46026fc29c4.tar.gz rust-d8ed1b03c202d77248eb0d335062f46026fc29c4.zip | |
Auto merge of #73692 - Dylan-DPC:rollup-ehzsbfw, r=Dylan-DPC
Rollup of 6 pull requests Successful merges: - #73638 (Remove unused crate imports in 2018 edition crates) - #73639 (Change heuristic for determining range literal) - #73646 (Add some regression tests) - #73652 (Add re-exports to use suggestions) - #73667 (Update BTreeMap::new() doc) - #73675 (Update books) Failed merges: r? @ghost
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/collections/btree/map.rs | 2 | ||||
| -rw-r--r-- | src/liballoc/collections/vec_deque/tests.rs | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/liballoc/collections/btree/map.rs b/src/liballoc/collections/btree/map.rs index 350249f5db5..34cacebe796 100644 --- a/src/liballoc/collections/btree/map.rs +++ b/src/liballoc/collections/btree/map.rs @@ -488,7 +488,7 @@ struct MergeIter<K, V, I: Iterator<Item = (K, V)>> { } impl<K: Ord, V> BTreeMap<K, V> { - /// Makes a new empty BTreeMap with a reasonable choice for B. + /// Makes a new empty BTreeMap. /// /// Does not allocate anything on its own. /// diff --git a/src/liballoc/collections/vec_deque/tests.rs b/src/liballoc/collections/vec_deque/tests.rs index fc2ec7908e8..960af4bfda0 100644 --- a/src/liballoc/collections/vec_deque/tests.rs +++ b/src/liballoc/collections/vec_deque/tests.rs @@ -1,7 +1,5 @@ use super::*; -use test; - #[bench] #[cfg_attr(miri, ignore)] // isolated Miri does not support benchmarks fn bench_push_back_100(b: &mut test::Bencher) { |