Skip to content

Commit 04d0ebe

Browse files
authored
unsafe improvements (#6551)
* Remove unnecessary use of `unsafe` by reusing existing code * Remove unnecessary use of MaybeUninit
1 parent 18ef662 commit 04d0ebe

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

arrow-buffer/src/builder/offset.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,11 @@ impl<O: ArrowNativeType> OffsetBufferBuilder<O> {
7070
///
7171
/// Panics if offsets overflow `O`
7272
pub fn finish_cloned(&self) -> OffsetBuffer<O> {
73-
O::from_usize(self.last_offset).expect("overflow");
74-
unsafe { OffsetBuffer::new_unchecked(self.offsets.clone().into()) }
73+
let cloned = Self {
74+
offsets: self.offsets.clone(),
75+
last_offset: self.last_offset,
76+
};
77+
cloned.finish()
7578
}
7679
}
7780

arrow-buffer/src/util/bit_mask.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,16 +127,16 @@ unsafe fn set_upto_64bits(
127127
}
128128

129129
/// # Safety
130-
/// The caller must ensure all arguments are within the valid range.
130+
/// The caller must ensure `data` has `offset..(offset + 8)` range, and `count <= 8`.
131131
#[inline]
132132
unsafe fn read_bytes_to_u64(data: &[u8], offset: usize, count: usize) -> u64 {
133133
debug_assert!(count <= 8);
134-
let mut tmp = std::mem::MaybeUninit::<u64>::new(0);
134+
let mut tmp: u64 = 0;
135135
let src = data.as_ptr().add(offset);
136136
unsafe {
137-
std::ptr::copy_nonoverlapping(src, tmp.as_mut_ptr() as *mut u8, count);
138-
tmp.assume_init()
137+
std::ptr::copy_nonoverlapping(src, &mut tmp as *mut _ as *mut u8, count);
139138
}
139+
tmp
140140
}
141141

142142
/// # Safety

0 commit comments

Comments
 (0)