Merge pull request #4 from flier/develop

flier · web-flow · commit afbc8b62420a · 2017-05-10T18:45:43.000+08:00
update `bindgen`
diff --git a/fasthash-sys/Cargo.toml b/fasthash-sys/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fasthash-sys"
-version = "0.2.5"
+version = "0.2.6"
 authors = ["Flier Lu <flier.lu@gmail.com>"]
 description = "A suite of non-cryptographic hash functions for Rust."
 homepage = "https://github.com/flier/rust-fasthash"
@@ -13,10 +13,10 @@ links = "fasthash"
 [features]
 default = ["sse42"]
 sse42 = []
-bindgen = ["libbindgen"]
+gen = ["bindgen"]
 
 [dependencies]
 
 [build-dependencies]
 gcc = "0.3"
-libbindgen = { version="0.1", optional=true }
+bindgen = { version="0.25", optional=true }
diff --git a/fasthash-sys/build.rs b/fasthash-sys/build.rs
@@ -1,6 +1,6 @@
 extern crate gcc;
 #[cfg(feature = "bindgen")]
-extern crate libbindgen;
+extern crate bindgen;
 
 #[cfg(not(feature = "bindgen"))]
 use std::fs;
@@ -9,16 +9,16 @@ use std::path::Path;
 
 #[cfg(feature = "bindgen")]
 fn generate_binding(out_file: &Path) {
-    let _ = libbindgen::builder()
-        .clang_arg("-xc++")
+    let _ = bindgen::builder()
         .clang_arg("--std=c++11")
         .clang_arg(if cfg!(feature = "sse42") {
-            "-msse4.2"
-        } else {
-            "-march=native"
-        })
+                       "-msse4.2"
+                   } else {
+                       "-march=native"
+                   })
         .header("src/fasthash.hpp")
         .no_unstable_rust()
+        .generate_inline_functions(true)
         .disable_name_namespacing()
         .hide_type(".*PCCP.*")
         .whitelisted_function("^CityHash.*")
@@ -51,7 +51,8 @@ fn generate_binding(out_file: &Path) {
 fn main() {
     let mut gcc_config = gcc::Config::new();
 
-    gcc_config.file("src/fasthash.cpp")
+    gcc_config
+        .file("src/fasthash.cpp")
         .file("src/smhasher/City.cpp")
         .file("src/smhasher/farmhash-c.c")
         .file("src/smhasher/lookup3.cpp")
@@ -66,7 +67,8 @@ fn main() {
         .file("src/smhasher/xxhash.c");
 
     if cfg!(feature = "sse42") {
-        gcc_config.flag("-msse4.2")
+        gcc_config
+            .flag("-msse4.2")
             .file("src/smhasher/metrohash64crc.cpp")
             .file("src/smhasher/metrohash128crc.cpp");
     }
diff --git a/fasthash-sys/src/fasthash.hpp b/fasthash-sys/src/fasthash.hpp
@@ -13,31 +13,31 @@ uint64_t farmhash_fingerprint_uint128(uint128_c_t x);
 
 uint64_t farmhash_fingerprint_uint64(uint64_t x);
 
-uint32_t lookup3(const void * key, int length, uint32_t initval);
+uint32_t lookup3(const void *key, int length, uint32_t initval);
 
 uint64_t mum_hash_(const void *key, size_t len, uint64_t seed);
 
 void SpookyHasherHash(
-    const void *message,  // message to hash
-    size_t length,        // length of message in bytes
-    uint64 *hash1,        // in/out: in seed 1, out hash value 1
-    uint64 *hash2);       // in/out: in seed 2, out hash value 2
+    const void *message, // message to hash
+    size_t length,       // length of message in bytes
+    uint64 *hash1,       // in/out: in seed 1, out hash value 1
+    uint64 *hash2);      // in/out: in seed 2, out hash value 2
 
 void *SpookyHasherNew();
 
 void SpookyHasherFree(void *h);
 
 void SpookyHasherInit(
     void *h,
-    uint64 seed1,       // any 64-bit value will do, including 0
-    uint64 seed2);      // different seeds produce independent hashes
+    uint64 seed1,  // any 64-bit value will do, including 0
+    uint64 seed2); // different seeds produce independent hashes
 
 void SpookyHasherUpdate(
     void *h,
-    const void *message,  // message fragment
-    size_t length);       // length of message fragment in bytes
+    const void *message, // message fragment
+    size_t length);      // length of message fragment in bytes
 
 void SpookyHasherFinal(
     void *h,
-    uint64 *hash1,    // out only: first 64 bits of hash value.
-    uint64 *hash2);   // out only: second 64 bits of hash value.
+    uint64 *hash1,  // out only: first 64 bits of hash value.
+    uint64 *hash2); // out only: second 64 bits of hash value.
diff --git a/fasthash-sys/src/fasthash_linux.rs b/fasthash-sys/src/fasthash_linux.rs
@@ -1,10 +1,12 @@
-// automatically generated by rust-bindgen
+/* automatically generated by rust-bindgen */
 
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct pair<_T1, _T2> {
     pub first: _T1,
     pub second: _T2,
+    pub _phantom_0: ::std::marker::PhantomData<::std::cell::UnsafeCell<_T1>>,
+    pub _phantom_1: ::std::marker::PhantomData<::std::cell::UnsafeCell<_T2>>,
 }
 pub type pair_first_type<_T1> = _T1;
 pub type pair_second_type<_T2> = _T2;
@@ -71,8 +73,12 @@ pub struct uint128_c_t {
 }
 #[test]
 fn bindgen_test_layout_uint128_c_t() {
-    assert_eq!(::std::mem::size_of::<uint128_c_t>(), 16usize);
-    assert_eq!(::std::mem::align_of::<uint128_c_t>(), 8usize);
+    assert_eq!(::std::mem::size_of::<uint128_c_t>(),
+               16usize,
+               concat!("Size of: ", stringify!(uint128_c_t)));
+    assert_eq!(::std::mem::align_of::<uint128_c_t>(),
+               8usize,
+               concat!("Alignment of ", stringify!(uint128_c_t)));
 }
 impl Clone for uint128_c_t {
     fn clone(&self) -> Self {
@@ -110,10 +116,6 @@ extern "C" {
                                  seed: uint128_c_t)
                                  -> uint128_c_t;
 }
-extern "C" {
-    #[link_name = "_Z17farmhash128_to_6411uint128_c_t"]
-    pub fn farmhash128_to_64(x: uint128_c_t) -> u64;
-}
 extern "C" {
     pub fn farmhash_fingerprint32(s: *const ::std::os::raw::c_char, len: usize) -> u32;
 }
@@ -123,14 +125,6 @@ extern "C" {
 extern "C" {
     pub fn farmhash_fingerprint128(s: *const ::std::os::raw::c_char, len: usize) -> uint128_c_t;
 }
-extern "C" {
-    #[link_name = "_Z32farmhash_fingerprint_uint128_c_t11uint128_c_t"]
-    pub fn farmhash_fingerprint_uint128_c_t(x: uint128_c_t) -> u64;
-}
-extern "C" {
-    #[link_name = "_Z29farmhash_fingerprint_uint64_tm"]
-    pub fn farmhash_fingerprint_uint64_t(x: u64) -> u64;
-}
 extern "C" {
     #[link_name = "_Z13metrohash64_1PKhmjPh"]
     pub fn metrohash64_1(key: *const u8, len: u64, seed: u32, out: *mut u8);
@@ -163,30 +157,6 @@ extern "C" {
     #[link_name = "_Z17metrohash128crc_2PKhmjPh"]
     pub fn metrohash128crc_2(key: *const u8, len: u64, seed: u32, out: *mut u8);
 }
-extern "C" {
-    #[link_name = "_ZL18mum_hash_randomizem"]
-    pub fn mum_hash_randomize(seed: u64);
-}
-extern "C" {
-    #[link_name = "_ZL13mum_hash_initm"]
-    pub fn mum_hash_init(seed: u64) -> u64;
-}
-extern "C" {
-    #[link_name = "_ZL13mum_hash_stepmm"]
-    pub fn mum_hash_step(h: u64, key: u64) -> u64;
-}
-extern "C" {
-    #[link_name = "_ZL15mum_hash_finishm"]
-    pub fn mum_hash_finish(h: u64) -> u64;
-}
-extern "C" {
-    #[link_name = "_ZL10mum_hash64mm"]
-    pub fn mum_hash64(key: u64, seed: u64) -> usize;
-}
-extern "C" {
-    #[link_name = "_ZL8mum_hashPKvmm"]
-    pub fn mum_hash(key: *const ::std::os::raw::c_void, len: usize, seed: u64) -> u64;
-}
 extern "C" {
     #[link_name = "_Z11MurmurHash1PKvij"]
     pub fn MurmurHash1(key: *const ::std::os::raw::c_void,
@@ -270,10 +240,6 @@ extern "C" {
 extern "C" {
     pub fn t1ha_64be(data: *const ::std::os::raw::c_void, len: usize, seed: u64) -> u64;
 }
-extern "C" {
-    #[link_name = "_Z9t1ha_64lePKvmm"]
-    pub fn t1ha_64le(data: *const ::std::os::raw::c_void, len: usize, seed: u64) -> u64;
-}
 extern "C" {
     pub fn t1ha_32le(data: *const ::std::os::raw::c_void, len: usize, seed: u64) -> u64;
 }
@@ -283,22 +249,19 @@ extern "C" {
 extern "C" {
     pub fn t1ha_ia32crc(data: *const ::std::os::raw::c_void, len: usize, seed: u64) -> u64;
 }
-pub const XXH_OK: _bindgen_ty_64 = _bindgen_ty_64::XXH_OK;
-pub const XXH_ERROR: _bindgen_ty_64 = _bindgen_ty_64::XXH_ERROR;
 #[repr(u32)]
-/// ***************************
-/// Type
-/// **************************
+/*****************************
+   Type
+*****************************/
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub enum _bindgen_ty_64 {
+pub enum XXH_errorcode {
     XXH_OK = 0,
     XXH_ERROR = 1,
 }
-pub type XXH_errorcode = _bindgen_ty_64;
 extern "C" {
-    /// ***************************
-    /// Simple Hash Functions
-    /// **************************
+    /*****************************
+   Simple Hash Functions
+*****************************/
     pub fn XXH32(input: *const ::std::os::raw::c_void,
                  length: usize,
                  seed: ::std::os::raw::c_uint)
@@ -310,41 +273,47 @@ extern "C" {
                  seed: ::std::os::raw::c_ulonglong)
                  -> ::std::os::raw::c_ulonglong;
 }
-/// ***************************
-/// Advanced Hash Functions
-/// **************************
+/*****************************
+   Advanced Hash Functions
+*****************************/
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct _bindgen_ty_65 {
+pub struct XXH32_state_t {
     pub ll: [::std::os::raw::c_longlong; 6usize],
 }
 #[test]
-fn bindgen_test_layout__bindgen_ty_65() {
-    assert_eq!(::std::mem::size_of::<_bindgen_ty_65>(), 48usize);
-    assert_eq!(::std::mem::align_of::<_bindgen_ty_65>(), 8usize);
-}
-impl Clone for _bindgen_ty_65 {
+fn bindgen_test_layout_XXH32_state_t() {
+    assert_eq!(::std::mem::size_of::<XXH32_state_t>(),
+               48usize,
+               concat!("Size of: ", stringify!(XXH32_state_t)));
+    assert_eq!(::std::mem::align_of::<XXH32_state_t>(),
+               8usize,
+               concat!("Alignment of ", stringify!(XXH32_state_t)));
+}
+impl Clone for XXH32_state_t {
     fn clone(&self) -> Self {
         *self
     }
 }
-pub type XXH32_state_t = _bindgen_ty_65;
 #[repr(C)]
 #[derive(Debug, Copy)]
-pub struct _bindgen_ty_66 {
+pub struct XXH64_state_t {
     pub ll: [::std::os::raw::c_longlong; 11usize],
 }
 #[test]
-fn bindgen_test_layout__bindgen_ty_66() {
-    assert_eq!(::std::mem::size_of::<_bindgen_ty_66>(), 88usize);
-    assert_eq!(::std::mem::align_of::<_bindgen_ty_66>(), 8usize);
-}
-impl Clone for _bindgen_ty_66 {
+fn bindgen_test_layout_XXH64_state_t() {
+    assert_eq!(::std::mem::size_of::<XXH64_state_t>(),
+               88usize,
+               concat!("Size of: ", stringify!(XXH64_state_t)));
+    assert_eq!(::std::mem::align_of::<XXH64_state_t>(),
+               8usize,
+               concat!("Alignment of ", stringify!(XXH64_state_t)));
+}
+impl Clone for XXH64_state_t {
     fn clone(&self) -> Self {
         *self
     }
 }
-pub type XXH64_state_t = _bindgen_ty_66;
 extern "C" {
     pub fn XXH32_createState() -> *mut XXH32_state_t;
 }
@@ -436,9 +405,15 @@ extern "C" {
                              hash2: *mut uint64);
 }
 #[test]
-fn __bindgen_test_layout_template_1() {
+fn __bindgen_test_layout_pair_instantiation_7216() {
     assert_eq!(::std::mem::size_of::<pair<::std::os::raw::c_ulong, ::std::os::raw::c_ulong>>(),
-               16usize);
+               16usize,
+               concat!("Size of template specialization: ",
+                       stringify ! (
+               pair<::std::os::raw::c_ulong, ::std::os::raw::c_ulong> )));
     assert_eq!(::std::mem::align_of::<pair<::std::os::raw::c_ulong, ::std::os::raw::c_ulong>>(),
-               8usize);
+               8usize,
+               concat!("Alignment of template specialization: ",
+                       stringify ! (
+               pair<::std::os::raw::c_ulong, ::std::os::raw::c_ulong> )));
 }
diff --git a/fasthash-sys/src/fasthash_macos.rs b/fasthash-sys/src/fasthash_macos.rs
diff --git a/fasthash/Cargo.toml b/fasthash/Cargo.toml
