OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rollup merge of #70979 - ssomers:btreemap_the_alice_merton_variations, r=Amanieu 

Follow up on BTreeMap comments

r? @Amanieu (for the first commit)
This commit is contained in:
Mazdak Farrokhzad 2020-04-10 18:15:22 +02:00 committed by GitHub
parent a5e06f28c7 de39a4f621
commit 277ce9e249
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/liballoc/collections/btree/map.rs
View File

@ -2771,8 +2771,6 @@ impl<'a, K: 'a, V: 'a> Handle<NodeRef<marker::Mut<'a>, K, V, marker::LeafOrInter
pos.next_unchecked(); pos.next_unchecked();
} }
} }
// This internal node might be underfull, but only if it's the root.
break; break;
} }
} }

4
src/liballoc/collections/btree/node.rs
View File

@ -161,7 +161,7 @@ impl<K, V> Root<K, V> {
NodeRef { NodeRef {
height: self.height, height: self.height,
node: self.node.as_ptr(), node: self.node.as_ptr(),
root: self as *const _ as *mut _, root: ptr::null(),
_marker: PhantomData, _marker: PhantomData,
} }
} }
@ -179,7 +179,7 @@ impl<K, V> Root<K, V> {
NodeRef { NodeRef {
height: self.height, height: self.height,
node: self.node.as_ptr(), node: self.node.as_ptr(),
root: ptr::null_mut(), // FIXME: Is there anything better to do here? root: ptr::null(),
_marker: PhantomData, _marker: PhantomData,
} }
} }