Merge pull request #147 from servo/align

Update bindgen and bump the minimum Rust version to 1.25

Author: SimonSapin

.travis.yml

@@ -3,6 +3,7 @@ rust:
   - nightly
   - beta
   - stable
+  - 1.25.0
 sudo: 9000
 dist: trusty
 os:

Cargo.toml

@@ -2,7 +2,7 @@
 name = "mozjs_sys"
 description = "System crate for the Mozilla SpiderMonkey JavaScript engine."
 repository = "https://github.com/servo/mozjs/"
-version = "0.60.1"
+version = "0.61.0"
 authors = ["Mozilla"]
 links = "mozjs"
 build = "build.rs"
@@ -26,5 +26,5 @@ libc = "0.2"
 libz-sys = "1.0"
 
 [build-dependencies]
-bindgen = "0.37"
+bindgen = "0.39"
 cc = "1.0"

build.rs

@@ -171,12 +171,12 @@ fn build_jsapi_bindings() {
     // so their symbols aren't available. Adding the -fkeep-inlined-functions option
     // causes the jsapi library to bloat from 500M to 6G, so that's not an option.
     let mut config = bindgen::CodegenConfig::all();
-    config.constructors = false;
-    config.destructors = false;
-    config.methods = false;
-    
+    config &= !bindgen::CodegenConfig::CONSTRUCTORS;
+    config &= !bindgen::CodegenConfig::DESTRUCTORS;
+    config &= !bindgen::CodegenConfig::METHODS;
+
     let mut builder = bindgen::builder()
-        .rust_target(bindgen::RustTarget::Stable_1_19)
+        .rust_target(bindgen::RustTarget::Stable_1_25)
         .header("./src/jsglue.hpp")
         // Translate every enum with the "rustified enum" strategy. We should
         // investigate switching to the "constified module" strategy, which has

src/jsval.rs

@@ -79,8 +79,6 @@ const JSVAL_PAYLOAD_MASK: u64 = 0x00007FFFFFFFFFFF;
 #[inline(always)]
 fn AsJSVal(val: u64) -> JSVal {
     JSVal {
-	#[cfg(all(target_os = "android", target_arch = "x86"))]
-	__bindgen_align: [],
         data: Value_layout {
             asBits: val,
         }