Skip to content

Easy way to respect BTreeMap's minimum node length #75104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ssomers wants to merge 1 commit into from
Closed

Easy way to respect BTreeMap's minimum node length #75104

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions library/alloc/src/collections/btree/node.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -861,17 +861,14 @@ impl<'a, K, V> Handle<NodeRef<marker::Mut<'a>, K, V, marker::Leaf>, marker::Edge
let kv = unsafe { Handle::new_kv(self.node, self.idx) };
(InsertResult::Fit(kv), ptr)
} else {
let middle = unsafe { Handle::new_kv(self.node, B) };
let middle = unsafe { Handle::new_kv(self.node, B - 1) };
let (mut left, k, v, mut right) = middle.split();
let ptr = if self.idx <= B {
let ptr = if self.idx < B {
unsafe { Handle::new_edge(left.reborrow_mut(), self.idx).insert_fit(key, val) }
} else {
unsafe {
Handle::new_edge(
right.as_mut().cast_unchecked::<marker::Leaf>(),
self.idx - (B + 1),
)
.insert_fit(key, val)
Handle::new_edge(right.as_mut().cast_unchecked::<marker::Leaf>(), self.idx - B)
.insert_fit(key, val)
}
};
(InsertResult::Split(SplitResult { left: left.forget_type(), k, v, right }), ptr)
Expand Down Expand Up @@ -934,17 +931,17 @@ impl<'a, K, V> Handle<NodeRef<marker::Mut<'a>, K, V, marker::Internal>, marker::
let kv = unsafe { Handle::new_kv(self.node, self.idx) };
InsertResult::Fit(kv)
} else {
let middle = unsafe { Handle::new_kv(self.node, B) };
let middle = unsafe { Handle::new_kv(self.node, B - 1) };
let (mut left, k, v, mut right) = middle.split();
if self.idx <= B {
if self.idx < B {
unsafe {
Handle::new_edge(left.reborrow_mut(), self.idx).insert_fit(key, val, edge);
}
} else {
unsafe {
Handle::new_edge(
right.as_mut().cast_unchecked::<marker::Internal>(),
self.idx - (B + 1),
self.idx - B,
)
.insert_fit(key, val, edge);
}
Expand Down