Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 0c04344

Browse files
committedJun 23, 2020
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
2 parents ff5b446 + 6ed6a84 commit 0c04344

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1217
-536
lines changed
 

‎Cargo.lock

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4200,6 +4200,7 @@ dependencies = [
42004200
"rustc_expand",
42014201
"rustc_feature",
42024202
"rustc_hir",
4203+
"rustc_index",
42034204
"rustc_metadata",
42044205
"rustc_middle",
42054206
"rustc_session",

‎src/liballoc/collections/btree/map.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -490,6 +490,8 @@ struct MergeIter<K, V, I: Iterator<Item = (K, V)>> {
490490
impl<K: Ord, V> BTreeMap<K, V> {
491491
/// Makes a new empty BTreeMap with a reasonable choice for B.
492492
///
493+
/// Does not allocate anything on its own.
494+
///
493495
/// # Examples
494496
///
495497
/// Basic usage:

0 commit comments

Comments
 (0)
Please sign in to comment.