about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-12-02 13:45:22 +0000
committerbors <bors@rust-lang.org>2018-12-02 13:45:22 +0000
commit8660eba2b9bec5b0fe971b7281f79e79c2df2fae (patch)
tree86a0f14bde134d8357458c80472b51204d489b5d /src/liballoc
parent9abc2312124de7c4275d76e9cbc81d50086c4768 (diff)
parentebe69c06b38e0d1d20c79ee4342715514e917107 (diff)
downloadrust-8660eba2b9bec5b0fe971b7281f79e79c2df2fae.tar.gz
rust-8660eba2b9bec5b0fe971b7281f79e79c2df2fae.zip
Auto merge of #56275 - RalfJung:win-mutex, r=SimonSapin
use MaybeUninit instead of mem::uninitialized for Windows Mutex

I hope this builds, I do not have a Windows machine to test...
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/collections/btree/node.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/liballoc/collections/btree/node.rs b/src/liballoc/collections/btree/node.rs
index f9b455fe796..215689dfc48 100644
--- a/src/liballoc/collections/btree/node.rs
+++ b/src/liballoc/collections/btree/node.rs
@@ -602,7 +602,7 @@ impl<'a, K: 'a, V: 'a, Type> NodeRef<marker::Mut<'a>, K, V, Type> {
         } else {
             unsafe {
                 slice::from_raw_parts_mut(
-                    self.as_leaf_mut().keys.get_mut() as *mut [K] as *mut K,
+                    self.as_leaf_mut().keys.as_mut_ptr() as *mut K,
                     self.len()
                 )
             }
@@ -613,7 +613,7 @@ impl<'a, K: 'a, V: 'a, Type> NodeRef<marker::Mut<'a>, K, V, Type> {
         debug_assert!(!self.is_shared_root());
         unsafe {
             slice::from_raw_parts_mut(
-                self.as_leaf_mut().vals.get_mut() as *mut [V] as *mut V,
+                self.as_leaf_mut().vals.as_mut_ptr() as *mut V,
                 self.len()
             )
         }