Skip to content

Commit

Permalink
Fix new clippy warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
@as-com
as-com committed Sep 3, 2024
1 parent c0ac282 commit 87ae508
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
30 changes: 15 additions & 15 deletions src/decode/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ pub unsafe fn decode_unsafe<T: VarIntTarget>(bytes: *const u8) -> (T, usize) {
// let varint_part0 = b0 & !(0xffffffffffffffff << len0.min(63));
// let varint_part1 = b1 & !(0xffffffffffffffff << (((msbs0 == 0) as u32) * len1.min(63)));

let num = T::vector_to_num(core::mem::transmute([varint_part0, varint_part1]));
let num = T::vector_to_num(core::mem::transmute::<[u64; 2], [u8; 16]>([varint_part0, varint_part1]));
let len = if msbs0 == 0 { len1 + 64 } else { len0 } / 8;

(num, len as usize)
Expand Down Expand Up @@ -281,8 +281,8 @@ pub unsafe fn decode_two_unsafe<T: VarIntTarget, U: VarIntTarget>(
first_num = T::cast_u32(x[0]);
second_num = U::cast_u32(x[2]);
} else {
first_num = T::vector_to_num(core::mem::transmute(first));
second_num = U::vector_to_num(core::mem::transmute(second));
first_num = T::vector_to_num(core::mem::transmute::<__m128i, [u8; 16]>(first));
second_num = U::vector_to_num(core::mem::transmute::<__m128i, [u8; 16]>(second));
}

(first_num, second_num, first_len as u8, second_len as u8)
Expand Down Expand Up @@ -326,8 +326,8 @@ unsafe fn decode_two_u32_unsafe<T: VarIntTarget, U: VarIntTarget>(
first_num = T::cast_u32(x[0]);
second_num = U::cast_u32(x[2]);
} else {
first_num = T::vector_to_num(core::mem::transmute(comb));
second_num = U::vector_to_num(core::mem::transmute(_mm_bsrli_si128(comb, 8)));
first_num = T::vector_to_num(core::mem::transmute::<__m128i, [u8; 16]>(comb));
second_num = U::vector_to_num(core::mem::transmute::<__m128i, [u8; 16]>(_mm_bsrli_si128(comb, 8)));
}

(first_num, second_num, first_len, second_len)
Expand Down Expand Up @@ -518,8 +518,8 @@ pub unsafe fn decode_two_wide_unsafe<T: VarIntTarget, U: VarIntTarget>(
first_num = T::cast_u64(_mm_extract_epi64(x, 0) as u64);
second_num = U::cast_u64(_mm_extract_epi64(x, 1) as u64);
} else {
first_num = T::vector_to_num(core::mem::transmute(first));
second_num = U::vector_to_num(core::mem::transmute(second));
first_num = T::vector_to_num(core::mem::transmute::<__m128i, [u8; 16]>(first));
second_num = U::vector_to_num(core::mem::transmute::<__m128i, [u8; 16]>(second));
}

(first_num, second_num, first_len as u8, second_len as u8)
Expand Down Expand Up @@ -656,10 +656,10 @@ pub unsafe fn decode_four_unsafe<
third_num = V::cast_u32(x[2]);
fourth_num = W::cast_u32(x[3]);
} else {
first_num = T::vector_to_num(core::mem::transmute(first));
second_num = U::vector_to_num(core::mem::transmute(second));
third_num = V::vector_to_num(core::mem::transmute(third));
fourth_num = W::vector_to_num(core::mem::transmute(fourth));
first_num = T::vector_to_num(core::mem::transmute::<__m128i, [u8; 16]>(first));
second_num = U::vector_to_num(core::mem::transmute::<__m128i, [u8; 16]>(second));
third_num = V::vector_to_num(core::mem::transmute::<__m128i, [u8; 16]>(third));
fourth_num = W::vector_to_num(core::mem::transmute::<__m128i, [u8; 16]>(fourth));
}

(
Expand Down Expand Up @@ -743,10 +743,10 @@ unsafe fn decode_four_u16_unsafe<
third_num = V::cast_u32(x[2]);
fourth_num = W::cast_u32(x[3]);
} else {
first_num = T::vector_to_num(core::mem::transmute(comb));
second_num = U::vector_to_num(core::mem::transmute(_mm_bsrli_si128(comb, 4)));
third_num = V::vector_to_num(core::mem::transmute(_mm_bsrli_si128(comb, 8)));
fourth_num = W::vector_to_num(core::mem::transmute(_mm_bsrli_si128(comb, 12)));
first_num = T::vector_to_num(core::mem::transmute::<__m128i, [u8; 16]>(comb));
second_num = U::vector_to_num(core::mem::transmute::<__m128i, [u8; 16]>(_mm_bsrli_si128(comb, 4)));
third_num = V::vector_to_num(core::mem::transmute::<__m128i, [u8; 16]>(_mm_bsrli_si128(comb, 8)));
fourth_num = W::vector_to_num(core::mem::transmute::<__m128i, [u8; 16]>(_mm_bsrli_si128(comb, 12)));
}

(
Expand Down
4 changes: 2 additions & 2 deletions src/encode/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ pub unsafe fn encode_unsafe<T: VarIntTarget>(num: T) -> ([u8; 16], u8) {

let merged = stage1 | (msbs & msbmask);

(core::mem::transmute([merged, 0]), bytes_needed as u8)
(core::mem::transmute::<[u64; 2], [u8; 16]>([merged, 0]), bytes_needed as u8)
} else {
// Break the number into 7-bit parts and spread them out into a vector
let stage1: __m128i = core::mem::transmute(num.num_to_vector_stage1());
Expand All @@ -113,6 +113,6 @@ pub unsafe fn encode_unsafe<T: VarIntTarget>(num: T) -> ([u8; 16], u8) {
// Merge the MSB bits into the vector
let merged = _mm_or_si128(stage1, msbmask);

(core::mem::transmute(merged), bytes)
(core::mem::transmute::<__m128i, [u8; 16]>(merged), bytes)
}
}
2 changes: 1 addition & 1 deletion src/num.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ impl VarIntTarget for u64 {
#[cfg(all(target_feature = "avx2", not(all(target_feature = "bmi2", fast_pdep))))]
fn vector_to_num(res: [u8; 16]) -> Self {
let pt1 = unsafe {
let b = core::mem::transmute(res);
let b = core::mem::transmute::<[u8; 16], __m128i>(res);

let c = _mm_broadcastq_epi64(b);
let d = _mm_or_si128(
Expand Down

0 comments on commit 87ae508

Please sign in to comment.