Skip to content

Commit b411b88

Browse files
authored
Rollup merge of #103163 - SUPERCILEX:uninit-array-assume2, r=scottmcm
Remove all uses of array_assume_init See #103134 (comment) r? `@scottmcm`
2 parents e04bbcb + 55d71c6 commit b411b88

File tree

6 files changed

+10
-11
lines changed

6 files changed

+10
-11
lines changed

library/alloc/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@
125125
#![feature(iter_advance_by)]
126126
#![feature(iter_next_chunk)]
127127
#![feature(layout_for_ptr)]
128-
#![feature(maybe_uninit_array_assume_init)]
129128
#![feature(maybe_uninit_slice)]
130129
#![feature(maybe_uninit_uninit_array)]
130+
#![feature(maybe_uninit_uninit_array_transpose)]
131131
#![cfg_attr(test, feature(new_uninit))]
132132
#![feature(nonnull_slice_from_raw_parts)]
133133
#![feature(pattern)]

library/alloc/src/vec/into_iter.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ impl<T, A: Allocator> Iterator for IntoIter<T, A> {
223223

224224
self.ptr = self.ptr.wrapping_byte_add(N);
225225
// Safety: ditto
226-
return Ok(unsafe { MaybeUninit::array_assume_init(raw_ary) });
226+
return Ok(unsafe { raw_ary.transpose().assume_init() });
227227
}
228228

229229
if len < N {
@@ -241,7 +241,7 @@ impl<T, A: Allocator> Iterator for IntoIter<T, A> {
241241
return unsafe {
242242
ptr::copy_nonoverlapping(self.ptr, raw_ary.as_mut_ptr() as *mut T, N);
243243
self.ptr = self.ptr.add(N);
244-
Ok(MaybeUninit::array_assume_init(raw_ary))
244+
Ok(raw_ary.transpose().assume_init())
245245
};
246246
}
247247

library/core/src/array/iter.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,7 @@ impl<T, const N: usize> IntoIter<T, N> {
104104
///
105105
/// ```
106106
/// #![feature(array_into_iter_constructors)]
107-
///
108-
/// #![feature(maybe_uninit_array_assume_init)]
107+
/// #![feature(maybe_uninit_uninit_array_transpose)]
109108
/// #![feature(maybe_uninit_uninit_array)]
110109
/// use std::array::IntoIter;
111110
/// use std::mem::MaybeUninit;
@@ -134,7 +133,7 @@ impl<T, const N: usize> IntoIter<T, N> {
134133
/// }
135134
///
136135
/// // SAFETY: We've initialized all N items
137-
/// unsafe { Ok(MaybeUninit::array_assume_init(buffer)) }
136+
/// unsafe { Ok(buffer.transpose().assume_init()) }
138137
/// }
139138
///
140139
/// let r: [_; 4] = next_chunk(&mut (10..16)).unwrap();

library/core/src/array/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -912,7 +912,7 @@ where
912912

913913
mem::forget(guard);
914914
// SAFETY: All elements of the array were populated in the loop above.
915-
let output = unsafe { MaybeUninit::array_assume_init(array) };
915+
let output = unsafe { array.transpose().assume_init() };
916916
Ok(Try::from_output(output))
917917
}
918918

library/core/tests/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
#![feature(slice_from_ptr_range)]
5050
#![feature(split_as_slice)]
5151
#![feature(maybe_uninit_uninit_array)]
52-
#![feature(maybe_uninit_array_assume_init)]
5352
#![feature(maybe_uninit_write_slice)]
53+
#![feature(maybe_uninit_uninit_array_transpose)]
5454
#![feature(min_specialization)]
5555
#![feature(numfmt)]
5656
#![feature(step_trait)]

library/core/tests/mem.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -163,18 +163,18 @@ fn assume_init_good() {
163163

164164
#[test]
165165
fn uninit_array_assume_init() {
166-
let mut array: [MaybeUninit<i16>; 5] = MaybeUninit::uninit_array();
166+
let mut array = [MaybeUninit::<i16>::uninit(); 5];
167167
array[0].write(3);
168168
array[1].write(1);
169169
array[2].write(4);
170170
array[3].write(1);
171171
array[4].write(5);
172172

173-
let array = unsafe { MaybeUninit::array_assume_init(array) };
173+
let array = unsafe { array.transpose().assume_init() };
174174

175175
assert_eq!(array, [3, 1, 4, 1, 5]);
176176

177-
let [] = unsafe { MaybeUninit::<!>::array_assume_init([]) };
177+
let [] = unsafe { [MaybeUninit::<!>::uninit(); 0].transpose().assume_init() };
178178
}
179179

180180
#[test]

0 commit comments

Comments
 (0)