diff options
| author | bors <bors@rust-lang.org> | 2020-06-23 21:33:22 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-06-23 21:33:22 +0000 |
| commit | 0c04344d86f9598f20d9ec86fe87ea2a5d6ff8e6 (patch) | |
| tree | e6464d73da3f86b256a929ff1d520431f12956b0 /src/liballoc | |
| parent | ff5b446d2fdbd898bc97a751f2f72858de185cf1 (diff) | |
| parent | 6ed6a844e19138fe78a6ed07a71e105792539f4f (diff) | |
| download | rust-0c04344d86f9598f20d9ec86fe87ea2a5d6ff8e6.tar.gz rust-0c04344d86f9598f20d9ec86fe87ea2a5d6ff8e6.zip | |
Auto merge of #73669 - Manishearth:rollup-0n4u7vq, r=Manishearth
Rollup of 11 pull requests Successful merges: - #72780 (Enforce doc alias check) - #72876 (Mention that BTreeMap::new() doesn't allocate) - #73244 (Check for assignments between non-conflicting generator saved locals) - #73488 (code coverage foundation for hash and num_counters) - #73523 (Fix -Z unpretty=everybody_loops) - #73587 (Move remaining `NodeId` APIs from `Definitions` to `Resolver`) - #73601 (Point at the call span when overflow occurs during monomorphization) - #73613 (The const propagator cannot trace references.) - #73614 (fix `intrinsics::needs_drop` docs) - #73630 (Provide context on E0308 involving fn items) - #73665 (rustc: Modernize wasm checks for atomics) Failed merges: r? @ghost
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/collections/btree/map.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/liballoc/collections/btree/map.rs b/src/liballoc/collections/btree/map.rs index 2fcc8cc9873..350249f5db5 100644 --- a/src/liballoc/collections/btree/map.rs +++ b/src/liballoc/collections/btree/map.rs @@ -490,6 +490,8 @@ 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. /// + /// Does not allocate anything on its own. + /// /// # Examples /// /// Basic usage: |