From 6644e18e30b69bbbc98526fcaad9acd4c278e216 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Thu, 23 Aug 2018 16:52:05 +0200 Subject: [PATCH] address RalfJung's comment --- src/liballoc/collections/btree/node.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/liballoc/collections/btree/node.rs b/src/liballoc/collections/btree/node.rs index 08bcfea980b..c86278fc5dd 100644 --- a/src/liballoc/collections/btree/node.rs +++ b/src/liballoc/collections/btree/node.rs @@ -567,7 +567,7 @@ fn into_key_slice(self) -> &'a [K] { // the node, which is allowed by LLVM. unsafe { slice::from_raw_parts( - self.as_leaf().keys.get_ref().as_ptr(), + self.as_leaf().keys.as_ptr() as *const K, self.len() ) } @@ -578,7 +578,7 @@ fn into_val_slice(self) -> &'a [V] { debug_assert!(!self.is_shared_root()); unsafe { slice::from_raw_parts( - self.as_leaf().vals.get_ref().as_ptr(), + self.as_leaf().vals.as_ptr() as *const V, self.len() ) } @@ -1152,12 +1152,12 @@ pub fn split(mut self) ptr::copy_nonoverlapping( self.node.keys().as_ptr().add(self.idx + 1), - new_node.keys.get_mut().as_mut_ptr(), + new_node.keys.as_mut_ptr() as *mut K, new_len ); ptr::copy_nonoverlapping( self.node.vals().as_ptr().add(self.idx + 1), - new_node.vals.get_mut().as_mut_ptr(), + new_node.vals.as_mut_ptr() as *mut V, new_len ); @@ -1210,12 +1210,12 @@ pub fn split(mut self) ptr::copy_nonoverlapping( self.node.keys().as_ptr().add(self.idx + 1), - new_node.data.keys.get_mut().as_mut_ptr(), + new_node.data.keys.as_mut_ptr() as *mut K, new_len ); ptr::copy_nonoverlapping( self.node.vals().as_ptr().add(self.idx + 1), - new_node.data.vals.get_mut().as_mut_ptr(), + new_node.data.vals.as_mut_ptr() as *mut V, new_len ); ptr::copy_nonoverlapping( -- 2.44.0