Skip to content

Commit

Permalink
Prepare for merge
Browse files Browse the repository at this point in the history
  • Loading branch information
ogxd committed May 17, 2024
1 parent 1864e6f commit 71d0104
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 8 deletions.
3 changes: 0 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@ seahash = "4.1.0"
metrohash = "1.0.6"
fnv = "1.0.3"

[build-dependencies]
rustc_version = "0.4.0"

[dev-dependencies.plotters]
version = "0.3.5"
default-features = false
Expand Down
3 changes: 0 additions & 3 deletions build.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
extern crate rustc_version;
use rustc_version::{version_meta, Channel};

fn main() {

}
4 changes: 2 additions & 2 deletions src/gxhash/platform/x86.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ pub unsafe fn ld(array: *const u32) -> State {
_mm_loadu_si128(array as *const State)
}

#[cfg(not(hybrid))]
#[cfg(not(feature = "hybrid"))]
#[inline(always)]
pub unsafe fn compress_8(mut ptr: *const State, end_address: usize, hash_vector: State, len: usize) -> State {

Expand Down Expand Up @@ -100,7 +100,7 @@ pub unsafe fn compress_8(mut ptr: *const State, end_address: usize, hash_vector:
aes_encrypt(lane1, lane2)
}

#[cfg(hybrid)]
#[cfg(feature = "hybrid")]
#[inline(always)]
pub unsafe fn compress_8(ptr: *const State, end_address: usize, hash_vector: State, len: usize) -> State {
macro_rules! load_unaligned_x2 {
Expand Down

0 comments on commit 71d0104

Please sign in to comment.