switch to servo's bindgen and include bindgen as part of the build process

0.9-pre

Author: tupshin

Cargo.toml

@@ -3,7 +3,7 @@
 description = "A bindgen-genderated rust wrapper around the Cassandra c++ driver plus working examples\n with no additional dependencies.\nYou probably want to use the \"cassandra\" crate that provides a safe wrapper"
 license = "Apache-2.0"
 name = "cassandra-sys"
-version = "0.8.8-pre"
+version = "0.9.0-pre"
 authors = ["Tupshin Harper <[email protected]>"]
 build = "build.rs"
 homepage = "https://github.com/tupshin/cassandra-sys-rs"
@@ -91,6 +91,10 @@ log = "0.3"
 env_logger = "0.3"
 error-chain = "0.7"
 
+[build-dependencies.libbindgen]
+git = "https://github.com/servo/rust-bindgen"
+features = ["llvm_stable"]
+
 # clippy = {version = "*", optional = true}
 
 [features]

build.rs

@@ -14,7 +14,20 @@
 //use std::path::Path;
 //use std::process::Command;
 
+extern crate libbindgen;
+
+use std::env;
+use std::path::Path;
+
+
 fn main() {
+  let _ = libbindgen::builder()
+    .header("cassandra.h")
+    .use_core()
+    .generate().unwrap()
+    .write_to_file(Path::new("./src/").join("cassandra.rs"));
+
+
     if let Some(datastax_dir) = option_env!("CASSANDRA_SYS_LIB_PATH") {
         for p in datastax_dir.split(";") {
             println!("cargo:rustc-link-search={}", p);

src/cassandra.rs renamed to src/cassandra.rs.bk

@@ -11,8 +11,6 @@ use std::mem;
 
 use cassandra_sys::*;
 
-const CASS_UUID_STRING_LENGTH: usize = 37;
-
 fn print_indent(indent: u32) {
     for _ in 0..indent {
         print!("\t");
@@ -25,7 +23,7 @@ unsafe fn print_schema_value(value: &CassValue) {
     let mut d: f64 = mem::zeroed();
     // let mut s:CassString=mem::zeroed();
     let mut u: CassUuid = mem::zeroed();
-    let mut us: [i8; CASS_UUID_STRING_LENGTH] = mem::zeroed();
+    let mut us: [i8; CASS_UUID_STRING_LENGTH as usize] = mem::zeroed();
 
     match cass_value_type(value) {
         CASS_VALUE_TYPE_INT => {

src/examples/schema_meta.rs

@@ -9,12 +9,10 @@ use std::ffi::CString;
 use std::mem;
 use cassandra_sys::*;
 
-const CASS_UUID_STRING_LENGTH: usize = 37;
-
 fn insert_into_udt(session: &mut CassSession, schema_meta: &CassSchemaMeta, uuid_gen: &mut CassUuidGen)
                    -> Result<(), CassError> {
     unsafe {
-        let mut id_str: [i8; CASS_UUID_STRING_LENGTH] = [0; CASS_UUID_STRING_LENGTH];
+        let mut id_str: [i8; CASS_UUID_STRING_LENGTH as usize] = [0; CASS_UUID_STRING_LENGTH as usize];
 
         let query = "INSERT INTO examples.udt (id, address) VALUES (?, ?)";
 
@@ -100,7 +98,7 @@ fn select_from_udt(session: &mut CassSession) -> Result<(), CassError> {
                 let rows = cass_iterator_from_result(result);
 
                 while cass_iterator_next(rows) == cass_true {
-                    let mut id_str: [i8; CASS_UUID_STRING_LENGTH] = [0; CASS_UUID_STRING_LENGTH];
+                    let mut id_str: [i8; CASS_UUID_STRING_LENGTH as usize] = [0; CASS_UUID_STRING_LENGTH as usize];
                     let row = cass_iterator_get_row(rows);
                     let id_value = cass_row_get_column_by_name(row, CString::new("id").unwrap().as_ptr());
                     let address_value = cass_row_get_column_by_name(row, CString::new("address").unwrap().as_ptr());

src/examples/udt.rs

@@ -14,8 +14,6 @@ use std::str;
 
 use cassandra_sys::*;
 
-const CASS_UUID_STRING_LENGTH: usize = 37;
-
 fn insert_into_log(session: &mut CassSession, key: &str, time: CassUuid, entry: &str) -> Result<(), CassError> {
     unsafe {
         let query = "INSERT INTO examples.log (key, time, entry) VALUES (?, ?, ?);";
@@ -69,7 +67,7 @@ fn select_from_log(session: &mut CassSession, key: &str) -> Result<(), CassError
                     let mut time: CassUuid = mem::zeroed();
                     let mut entry = mem::zeroed();
                     let mut entry_length = mem::zeroed();
-                    let mut time_str: [i8; CASS_UUID_STRING_LENGTH] = [0; CASS_UUID_STRING_LENGTH];
+                    let mut time_str: [i8; CASS_UUID_STRING_LENGTH as usize] = [0; CASS_UUID_STRING_LENGTH as usize];
 
                     cass_value_get_string(cass_row_get_column(row, 0),
                                           &mut CString::new(key).unwrap().as_ptr(),

src/examples/uuid.rs

@@ -12,34 +12,21 @@ pub unsafe fn raw2utf8(data: *const i8, length: usize) -> Result<String, Utf8Err
     Ok(try!(str::from_utf8(slice)).to_owned())
 }
 
-impl PartialEq for cass_bool_t {
-    fn eq(&self, other: &cass_bool_t) -> bool {
-        let s: bool = self.clone().into();
-        s == other.clone().into()
-    }
-}
-
-impl PartialEq for CassValueType_ {
-    fn eq(&self, other: &CassValueType_) -> bool {
-        self == other
-    }
-}
-
-impl Into<bool> for cass_bool_t {
-    fn into(self) -> bool {
-        match self {
-            cass_bool_t::cass_true => true,
-            cass_bool_t::cass_false => false,
-        }
-    }
-}
-
-impl From<bool> for cass_bool_t {
-    fn from(b: bool) -> Self {
-        if b {
-            cass_bool_t::cass_true
-        } else {
-            cass_bool_t::cass_false
-        }
-    }
-}
+//impl Into<bool> for cass_bool_t {
+//    fn into(self) -> bool {
+//        match self {
+//            cass_bool_t::cass_true => true,
+//            cass_bool_t::cass_false => false,
+//        }
+//    }
+//}
+//
+//impl From<bool> for cass_bool_t {
+//    fn from(b: bool) -> Self {
+//        if b {
+//            cass_bool_t::cass_true
+//        } else {
+//            cass_bool_t::cass_false
+//        }
+//    }
+//}

src/ffi_util.rs

@@ -1,3 +1,4 @@
+
 #![allow(non_camel_case_types)]
 #![allow(non_upper_case_globals)]
 #![cfg_attr(feature="clippy", feature(plugin))]
@@ -6,6 +7,7 @@
 #[macro_use]
 extern crate log;
 extern crate libc;
+extern crate core;
 #[macro_use]
 extern crate error_chain;
 mod errors {
@@ -17,7 +19,7 @@ mod error;
 
 pub use ffi_util::*;
 
-pub use cassandra::cass_bool_t::{cass_true, cass_false};
+//pub use cassandra::cass_bool_t::{cass_true, cass_false};
 
 pub use cassandra::CassError_::*;
 pub use cassandra::CassSslVerifyFlags::*;