Skip to content

Drop byteorder dependency #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Shnatsel wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Drop byteorder dependency #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ name = "fxhash"
path = "bench.rs"

[dependencies]
byteorder = "1.0.0"

[dev-dependencies]
seahash = "3.0.5"
fnv = "1.0.5"
fnv = "1.0.5"
14 changes: 6 additions & 8 deletions lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ use std::collections::{HashMap, HashSet};
use std::default::Default;
use std::hash::{BuildHasherDefault, Hash, Hasher};
use std::ops::BitXor;

extern crate byteorder;
use byteorder::{ByteOrder, NativeEndian};
use std::convert::TryInto;

/// A builder for default Fx hashers.
pub type FxBuildHasher = BuildHasherDefault<FxHasher>;
Expand Down Expand Up @@ -79,12 +77,12 @@ impl_hash_word!(usize = SEED, u32 = SEED32, u64 = SEED64);
#[inline]
fn write32(mut hash: u32, mut bytes: &[u8]) -> u32 {
while bytes.len() >= 4 {
hash.hash_word(NativeEndian::read_u32(bytes));
hash.hash_word(u32::from_ne_bytes(bytes[..4].try_into().unwrap()));
bytes = &bytes[4..];
}

if bytes.len() >= 2 {
hash.hash_word(u32::from(NativeEndian::read_u16(bytes)));
hash.hash_word(u32::from(u16::from_ne_bytes(bytes[..2].try_into().unwrap())));
bytes = &bytes[2..];
}

Expand All @@ -98,17 +96,17 @@ fn write32(mut hash: u32, mut bytes: &[u8]) -> u32 {
#[inline]
fn write64(mut hash: u64, mut bytes: &[u8]) -> u64 {
while bytes.len() >= 8 {
hash.hash_word(NativeEndian::read_u64(bytes));
hash.hash_word(u64::from_ne_bytes(bytes[..8].try_into().unwrap()));
bytes = &bytes[8..];
}

if bytes.len() >= 4 {
hash.hash_word(u64::from(NativeEndian::read_u32(bytes)));
hash.hash_word(u64::from(u32::from_ne_bytes(bytes[..4].try_into().unwrap())));
bytes = &bytes[4..];
}

if bytes.len() >= 2 {
hash.hash_word(u64::from(NativeEndian::read_u16(bytes)));
hash.hash_word(u64::from(u16::from_ne_bytes(bytes[..2].try_into().unwrap())));
bytes = &bytes[2..];
}

Expand Down