mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #97869 - ssomers:btree_comments, r=Dylan-DPC

Browse Source 
BTree: tweak internal comments
This commit is contained in:
Dylan DPC 2022-06-14 10:35:29 +02:00 committed by GitHub
commit 4b1d510e0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/alloc/src/collections/btree/fix.rs
View File

@ -91,8 +91,8 @@ impl<K, V> Root<K, V> {
} }
} }
/// Stock up any underfull nodes on the right border of the tree. /// Stocks up any underfull nodes on the right border of the tree.
/// The other nodes, those that are not the root nor a rightmost edge, /// The other nodes, those that are neither the root nor a rightmost edge,
/// must be prepared to have up to MIN_LEN elements stolen. /// must be prepared to have up to MIN_LEN elements stolen.
pub fn fix_right_border_of_plentiful(&mut self) { pub fn fix_right_border_of_plentiful(&mut self) {
let mut cur_node = self.borrow_mut(); let mut cur_node = self.borrow_mut();

9
library/alloc/src/collections/btree/map/entry.rs
View File

@ -315,7 +315,7 @@ impl<'a, K: Ord, V> VacantEntry<'a, K, V> {
pub fn insert(self, value: V) -> &'a mut V { pub fn insert(self, value: V) -> &'a mut V {
let out_ptr = match self.handle { let out_ptr = match self.handle {
None => { None => {
// SAFETY: We have consumed self.handle and the reference returned. // SAFETY: There is no tree yet so no reference to it exists.
let map = unsafe { self.dormant_map.awaken() }; let map = unsafe { self.dormant_map.awaken() };
let mut root = NodeRef::new_leaf(); let mut root = NodeRef::new_leaf();
let val_ptr = root.borrow_mut().push(self.key, value) as *mut V; let val_ptr = root.borrow_mut().push(self.key, value) as *mut V;
@ -325,16 +325,17 @@ impl<'a, K: Ord, V> VacantEntry<'a, K, V> {
} }
Some(handle) => match handle.insert_recursing(self.key, value) { Some(handle) => match handle.insert_recursing(self.key, value) {
(None, val_ptr) => { (None, val_ptr) => {
// SAFETY: We have consumed self.handle and the handle returned. // SAFETY: We have consumed self.handle.
let map = unsafe { self.dormant_map.awaken() }; let map = unsafe { self.dormant_map.awaken() };
map.length += 1; map.length += 1;
val_ptr val_ptr
} }
(Some(ins), val_ptr) => { (Some(ins), val_ptr) => {
drop(ins.left); drop(ins.left);
// SAFETY: We have consumed self.handle and the reference returned. // SAFETY: We have consumed self.handle and dropped the
// remaining reference to the tree, ins.left.
let map = unsafe { self.dormant_map.awaken() }; let map = unsafe { self.dormant_map.awaken() };
let root = map.root.as_mut().unwrap(); let root = map.root.as_mut().unwrap(); // same as ins.left
root.push_internal_level().push(ins.kv.0, ins.kv.1, ins.right); root.push_internal_level().push(ins.kv.0, ins.kv.1, ins.right);
map.length += 1; map.length += 1;
val_ptr val_ptr