Skip to content

Commit 6a52ca3

Browse files
committed
rename first_mut_ptr -> first_ptr_mut
1 parent 33a969d commit 6a52ca3

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

src/liballoc/collections/btree/node.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -650,7 +650,7 @@ impl<'a, K: 'a, V: 'a, Type> NodeRef<marker::Mut<'a>, K, V, Type> {
650650
} else {
651651
unsafe {
652652
slice::from_raw_parts_mut(
653-
MaybeUninit::first_mut_ptr(&mut (*self.as_leaf_mut()).keys),
653+
MaybeUninit::first_ptr_mut(&mut (*self.as_leaf_mut()).keys),
654654
self.len()
655655
)
656656
}
@@ -661,7 +661,7 @@ impl<'a, K: 'a, V: 'a, Type> NodeRef<marker::Mut<'a>, K, V, Type> {
661661
debug_assert!(!self.is_shared_root());
662662
unsafe {
663663
slice::from_raw_parts_mut(
664-
MaybeUninit::first_mut_ptr(&mut (*self.as_leaf_mut()).vals),
664+
MaybeUninit::first_ptr_mut(&mut (*self.as_leaf_mut()).vals),
665665
self.len()
666666
)
667667
}
@@ -749,7 +749,7 @@ impl<'a, K, V> NodeRef<marker::Mut<'a>, K, V, marker::Internal> {
749749
slice_insert(self.vals_mut(), 0, val);
750750
slice_insert(
751751
slice::from_raw_parts_mut(
752-
MaybeUninit::first_mut_ptr(&mut self.as_internal_mut().edges),
752+
MaybeUninit::first_ptr_mut(&mut self.as_internal_mut().edges),
753753
self.len()+1
754754
),
755755
0,
@@ -808,7 +808,7 @@ impl<'a, K, V> NodeRef<marker::Mut<'a>, K, V, marker::LeafOrInternal> {
808808
ForceResult::Internal(mut internal) => {
809809
let edge = slice_remove(
810810
slice::from_raw_parts_mut(
811-
MaybeUninit::first_mut_ptr(&mut internal.as_internal_mut().edges),
811+
MaybeUninit::first_ptr_mut(&mut internal.as_internal_mut().edges),
812812
old_len+1
813813
),
814814
0
@@ -1087,7 +1087,7 @@ impl<'a, K, V> Handle<NodeRef<marker::Mut<'a>, K, V, marker::Internal>, marker::
10871087

10881088
slice_insert(
10891089
slice::from_raw_parts_mut(
1090-
MaybeUninit::first_mut_ptr(&mut self.node.as_internal_mut().edges),
1090+
MaybeUninit::first_ptr_mut(&mut self.node.as_internal_mut().edges),
10911091
self.node.len()
10921092
),
10931093
self.idx + 1,

src/libcore/fmt/num.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ macro_rules! impl_Display {
200200
};
201201
let mut buf = uninitialized_array![u8; 39];
202202
let mut curr = buf.len() as isize;
203-
let buf_ptr = MaybeUninit::first_mut_ptr(&mut buf);
203+
let buf_ptr = MaybeUninit::first_ptr_mut(&mut buf);
204204
let lut_ptr = DEC_DIGITS_LUT.as_ptr();
205205

206206
unsafe {

src/libcore/mem.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1159,7 +1159,7 @@ impl<T> MaybeUninit<T> {
11591159
/// Get a mutable pointer to the first element of the array.
11601160
#[unstable(feature = "maybe_uninit", issue = "53491")]
11611161
#[inline(always)]
1162-
pub fn first_mut_ptr(this: &mut [MaybeUninit<T>]) -> *mut T {
1162+
pub fn first_ptr_mut(this: &mut [MaybeUninit<T>]) -> *mut T {
11631163
this as *mut [MaybeUninit<T>] as *mut T
11641164
}
11651165
}

src/libcore/slice/sort.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,8 @@ fn partition_in_blocks<T, F>(v: &mut [T], pivot: &T, is_less: &mut F) -> usize
262262

263263
if start_l == end_l {
264264
// Trace `block_l` elements from the left side.
265-
start_l = MaybeUninit::first_mut_ptr(&mut offsets_l);
266-
end_l = MaybeUninit::first_mut_ptr(&mut offsets_l);
265+
start_l = MaybeUninit::first_ptr_mut(&mut offsets_l);
266+
end_l = MaybeUninit::first_ptr_mut(&mut offsets_l);
267267
let mut elem = l;
268268

269269
for i in 0..block_l {
@@ -278,8 +278,8 @@ fn partition_in_blocks<T, F>(v: &mut [T], pivot: &T, is_less: &mut F) -> usize
278278

279279
if start_r == end_r {
280280
// Trace `block_r` elements from the right side.
281-
start_r = MaybeUninit::first_mut_ptr(&mut offsets_r);
282-
end_r = MaybeUninit::first_mut_ptr(&mut offsets_r);
281+
start_r = MaybeUninit::first_ptr_mut(&mut offsets_r);
282+
end_r = MaybeUninit::first_ptr_mut(&mut offsets_r);
283283
let mut elem = r;
284284

285285
for i in 0..block_r {

0 commit comments

Comments
 (0)