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 2187f3c

Browse files
authoredNov 9, 2020
Rollup merge of #78480 - ssomers:btree-alias, r=Mark-Simulacrum
BTreeMap: fix pointer provenance rules Fixes #78477 and includes #78476 r? `@Mark-Simulacrum`
2 parents 391136e + 7ca6e8f commit 2187f3c

File tree

3 files changed

+328
-247
lines changed

3 files changed

+328
-247
lines changed
 

‎library/alloc/src/collections/btree/node.rs

Lines changed: 326 additions & 246 deletions
Large diffs are not rendered by default.

‎library/alloc/src/collections/btree/search.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ where
7272
// is an index -- not a reference.
7373
let len = node.len();
7474
for i in 0..len {
75-
let k = unsafe { node.key_at(i) };
75+
let k = unsafe { node.reborrow().key_at(i) };
7676
match key.cmp(k.borrow()) {
7777
Ordering::Greater => {}
7878
Ordering::Equal => return (i, true),

‎library/alloc/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
#![cfg_attr(test, feature(new_uninit))]
7979
#![feature(allocator_api)]
8080
#![feature(array_chunks)]
81+
#![feature(array_methods)]
8182
#![feature(array_value_iter)]
8283
#![feature(array_windows)]
8384
#![feature(allow_internal_unstable)]

0 commit comments

Comments
 (0)
Please sign in to comment.