Simplify build script; format with rustfmt (capstone-engine#13)

Author: tmfink

build.rs

@@ -12,13 +12,11 @@ extern crate pkg_config;
 #[cfg(feature = "build_capstone_cmake")]
 extern crate cmake;
 
-#[cfg(feature = "use_bindgen")]
 use std::fs::copy;
 use std::path::PathBuf;
 use std::process::Command;
 use std::env;
 
-#[cfg(feature = "use_bindgen")]
 include!("common.rs");
 
 const CAPSTONE_DIR: &'static str = "capstone";
@@ -52,13 +50,17 @@ fn find_capstone_header(header_search_paths: &Vec<PathBuf>, name: &str) -> Optio
 
 /// Gets environment variable value. Panics if variable is not set.
 fn env_var(var: &str) -> String {
-    env::var(var)
-        .expect(&format!("Environment variable {} is not set", var))
+    env::var(var).expect(&format!("Environment variable {} is not set", var))
 }
 
 /// Create bindings using bindgen
 #[cfg(feature = "use_bindgen")]
-fn write_bindgen_bindings(header_search_paths: &Vec<PathBuf>, update_pregenerated_bindings: bool) {
+fn write_bindgen_bindings(
+    header_search_paths: &Vec<PathBuf>,
+    update_pregenerated_bindings: bool,
+    pregenerated_bindgen_header: PathBuf,
+    out_path: PathBuf,
+) {
     let mut builder = bindgen::Builder::default()
         .rust_target(bindgen::RustTarget::Stable_1_19)
         .header(
@@ -88,19 +90,12 @@ fn write_bindgen_bindings(header_search_paths: &Vec<PathBuf>, update_pregenerate
     let bindings = builder.generate().expect("Unable to generate bindings");
 
     // Write bindings to $OUT_DIR/bindings.rs
-    let out_path = PathBuf::from(env_var("OUT_DIR")).join(BINDINGS_FILE);
-    bindings
-        .write_to_file(out_path.clone())
-        .expect("Unable to write bindings");
+    bindings.write_to_file(out_path.clone()).expect(
+        "Unable to write bindings",
+    );
 
     if update_pregenerated_bindings {
-        let stored_bindgen_header: PathBuf = [
-            env_var("CARGO_MANIFEST_DIR"),
-            "pre_generated".into(),
-            BINDINGS_FILE.into(),
-        ].iter()
-            .collect();
-        copy(out_path, stored_bindgen_header).expect("Unable to update capstone bindings");
+        copy(out_path, pregenerated_bindgen_header).expect("Unable to update capstone bindings");
     }
 }
 
@@ -133,8 +128,7 @@ fn main() {
         }
     } else {
         if cfg!(feature = "build_capstone_cmake") {
-            #[cfg(feature = "build_capstone_cmake")]
-            cmake();
+            #[cfg(feature = "build_capstone_cmake")] cmake();
         } else {
             // TODO: need to add this argument for windows 64-bit, msvc, dunno, read
             // COMPILE_MSVC.txt file cygwin-mingw64
@@ -186,7 +180,24 @@ fn main() {
         );
     }
 
+    let pregenerated_bindgen_header: PathBuf = [
+        env_var("CARGO_MANIFEST_DIR"),
+        "pre_generated".into(),
+        BINDINGS_FILE.into(),
+    ].iter()
+        .collect();
+    let out_path = PathBuf::from(env_var("OUT_DIR")).join(BINDINGS_FILE);
+
     // Only run bindgen if we are *not* using the bundled capstone bindings
     #[cfg(feature = "use_bindgen")]
-    write_bindgen_bindings(&header_search_paths, update_pregenerated_bindings);
+    write_bindgen_bindings(
+        &header_search_paths,
+        update_pregenerated_bindings,
+        pregenerated_bindgen_header,
+        out_path,
+    );
+
+    // Otherwise, copy the pregenerated bindings
+    #[cfg(not(feature = "use_bindgen"))]
+    copy(&pregenerated_bindgen_header, &out_path).expect("Unable to update capstone bindings");
 }

common.rs

@@ -4,15 +4,15 @@
 
 #[derive(Clone, Copy, PartialEq, Eq, Debug, Hash)]
 /// Information specific to architecture
-struct CapstoneArchInfo<'a> {
+pub struct CapstoneArchInfo<'a> {
     /// name of C header
     header_name: &'a str,
 
     /// name used within capstone C library
     cs_name: &'a str,
 }
 
-static ARCH_INCLUDES: &'static [CapstoneArchInfo<'static>] = &[
+pub static ARCH_INCLUDES: &'static [CapstoneArchInfo<'static>] = &[
     CapstoneArchInfo {
         header_name: "arm.h",
         cs_name: "arm",
@@ -47,4 +47,4 @@ static ARCH_INCLUDES: &'static [CapstoneArchInfo<'static>] = &[
     },
 ];
 
-static BINDINGS_FILE: &'static str = "capstone.rs";
+pub static BINDINGS_FILE: &'static str = "capstone.rs";

src/lib.rs

@@ -31,7 +31,8 @@
 //! * `struct cs_ARCH_op`: instruction operand
 //! * `struct cs_ARCH`: instruction
 //!
-//! **Note**: documentation for functions/types was taken directly from [Capstone C headers][capstone headers].
+//! **Note**: documentation for functions/types was taken directly from
+//! [Capstone C headers][capstone headers].
 //!
 //! [capstone headers]: https://github.com/capstone-rust/capstone-sys/blob/master/capstone/include/capstone.h
 //! <sup>1</sup>: Defined as a ["constified" enum modules](https://docs.rs/bindgen/0.30.0/bindgen/struct.Builder.html#method.constified_enum_module)
@@ -45,15 +46,7 @@
 
 use std::os::raw::c_int;
 
-// Include pre-generated bindgen bindings
-#[cfg(not(feature = "use_bindgen"))]
-include!(concat!(
-    env!("CARGO_MANIFEST_DIR"),
-    "/pre_generated/capstone.rs"
-));
-
-// Include dynamically generated bindings
-#[cfg(feature = "use_bindgen")]
+// Bindings should be copied here
 include!(concat!(env!("OUT_DIR"), "/capstone.rs"));
 
 pub const CS_SUPPORT_DIET: c_int = (cs_arch::CS_ARCH_ALL as c_int) + 1;
@@ -222,9 +215,7 @@ mod test {
         // Union structs
         let op = cs_ppc_op {
             type_: ppc_op_type::PPC_OP_REG,
-            __bindgen_anon_1: cs_ppc_op__bindgen_ty_1 {
-                reg: ppc_reg::PPC_REG_CARRY,
-            },
+            __bindgen_anon_1: cs_ppc_op__bindgen_ty_1 { reg: ppc_reg::PPC_REG_CARRY },
         };
         cs_ppc {
             bc: ppc_bc::PPC_BC_LT,
@@ -327,9 +318,7 @@ mod test {
         // Union types
         let op = cs_x86_op {
             type_: x86_op_type::X86_OP_REG,
-            __bindgen_anon_1: cs_x86_op__bindgen_ty_1 {
-                reg: x86_reg::X86_REG_AH,
-            },
+            __bindgen_anon_1: cs_x86_op__bindgen_ty_1 { reg: x86_reg::X86_REG_AH },
             size: 0,
             avx_bcast: x86_avx_bcast::X86_AVX_BCAST_2,
             avx_zero_opmask: false,