@@ -26,7 +26,7 @@ impl<T: Copy> Expand for Buffer<T> {
2626 ( & mut buf_mut) . expand ( mask) ;
2727 buf_mut. freeze ( )
2828 }
29- // Otherwise, expand into a new buffer at the target size .
29+ // Otherwise, expand into a new buffer.
3030 Err ( buffer) => expand_into_new_buffer ( buffer. as_slice ( ) , mask) ,
3131 }
3232 }
@@ -83,7 +83,7 @@ impl<T: Copy> Expand for &mut BufferMut<T> {
8383 }
8484
8585 let buf_slice = self . as_mut_slice ( ) ;
86- scatter_into_slice ( buf_slice, buf_len, mask_values) ;
86+ expand_into_slice_inplace ( buf_slice, buf_len, mask_values) ;
8787 }
8888 }
8989 }
@@ -97,7 +97,7 @@ impl<T: Copy> Expand for &mut BufferMut<T> {
9797/// * `buf_slice` - The buffer slice to scatter into (already expanded to mask length)
9898/// * `src_len` - The original length of the buffer before expansion
9999/// * `mask_values` - The mask indicating where elements should be placed
100- fn scatter_into_slice < T : Copy > (
100+ fn expand_into_slice_inplace < T : Copy > (
101101 buf_slice : & mut [ T ] ,
102102 src_len : usize ,
103103 mask_values : & vortex_mask:: MaskValues ,
@@ -136,13 +136,13 @@ fn scatter_into_slice<T: Copy>(
136136///
137137/// # Arguments
138138///
139- /// * `dest` - The destination buffer slice (already expanded to mask length)
140139/// * `src` - The source elements to scatter
140+ /// * `dest` - The destination buffer slice (already expanded to mask length)
141141/// * `src_len` - The length of the source buffer
142142/// * `mask_values` - The mask indicating where elements should be placed
143143fn scatter_into_slice_from < T : Copy > (
144- dest : & mut [ T ] ,
145144 src : & [ T ] ,
145+ dest : & mut [ T ] ,
146146 src_len : usize ,
147147 mask_values : & vortex_mask:: MaskValues ,
148148) {
@@ -204,7 +204,7 @@ fn expand_into_new_buffer<T: Copy>(src: &[T], mask: &Mask) -> Buffer<T> {
204204 }
205205
206206 let buf_slice = buf_mut. as_mut_slice ( ) ;
207- scatter_into_slice_from ( buf_slice , src , src_len, mask_values) ;
207+ scatter_into_slice_from ( src , buf_slice , src_len, mask_values) ;
208208 buf_mut. freeze ( )
209209 }
210210 }
0 commit comments