nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-27 01:04:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

btreemap-alloc: fix clear impl

Browse Source
This commit is contained in:
Jacob Hughes 2022-03-14 06:55:36 -04:00
parent dc5951a6e5
commit 417b20835d
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
library/alloc/src/collections/btree/map.rs
View File

@ -571,11 +571,12 @@ impl<K, V, A: Allocator> BTreeMap<K, V, A> {
/// ``` /// ```
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
pub fn clear(&mut self) { pub fn clear(&mut self) {
let alloc = unsafe { // avoid moving the allocator
// drop all elements and retrieve allocator mem::drop(BTreeMap {
ptr::read(self).into_iter().into_alloc() root: mem::replace(&mut self.root, None),
}; length: mem::replace(&mut self.length, 0),
*self = BTreeMap::new_in(alloc); alloc: ManuallyDrop::new(&*self.alloc),
});
} }
/// Makes a new empty BTreeMap with a reasonable choice for B. /// Makes a new empty BTreeMap with a reasonable choice for B.
@ -1594,11 +1595,6 @@ impl<K, V, A: Allocator> IntoIterator for BTreeMap<K, V, A> {
#[stable(feature = "btree_drop", since = "1.7.0")] #[stable(feature = "btree_drop", since = "1.7.0")]
impl<K, V, A: Allocator> Drop for IntoIter<K, V, A> { impl<K, V, A: Allocator> Drop for IntoIter<K, V, A> {
fn drop(&mut self) { fn drop(&mut self) {
self.dealloc()
}
}
impl<K, V, A: Allocator> IntoIter<K, V, A> {
fn dealloc(&mut self) {
struct DropGuard<'a, K, V, A: Allocator>(&'a mut IntoIter<K, V, A>); struct DropGuard<'a, K, V, A: Allocator>(&'a mut IntoIter<K, V, A>);
impl<'a, K, V, A: Allocator> Drop for DropGuard<'a, K, V, A> { impl<'a, K, V, A: Allocator> Drop for DropGuard<'a, K, V, A> {
@ -1649,11 +1645,6 @@ impl<K, V, A: Allocator> IntoIter<K, V, A> {
Some(unsafe { self.range.deallocating_next_back_unchecked(&self.alloc) }) Some(unsafe { self.range.deallocating_next_back_unchecked(&self.alloc) })
} }
} }
fn into_alloc(mut self) -> A {
self.dealloc(); // Deallocate, then don't drop as drop will also call dealloc
let iter = ManuallyDrop::new(self);
unsafe { ptr::read(&iter.alloc) }
}
} }
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]