Auto merge of #1425 - emilio:cexpr-up, r=emiliov0.42.3

Update cexpr.

Fixes #1424.

4 files changed, 13 insertions, 8 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 6cf5fdc0..8f1a2b51 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -26,10 +26,10 @@ dependencies = [
 
 [[package]]
 name = "bindgen"
-version = "0.42.2"
+version = "0.42.3"
 dependencies = [
  "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "cexpr 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cexpr 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "clang-sys 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -57,7 +57,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "cexpr"
-version = "0.3.0"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "nom 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -353,7 +353,7 @@ dependencies = [
 "checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652"
 "checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
 "checksum cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "f159dfd43363c4d08055a07703eb7a3406b0dac4d0584d96965a3262db3c9d16"
-"checksum cexpr 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "11e4ce3f8d123356f09418d68d49ef901fae19cf16edaba7bf0c6e0f09540577"
+"checksum cexpr 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8fc0086be9ca82f7fc89fc873435531cb898b86e850005850de1f820e2db6e9b"
 "checksum cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4e7bb64a8ebb0d856483e1e682ea3422f883c5f5615a90d51a2c82fe87fdd3"
 "checksum clang-sys 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)" = "778ca7c912184f2012124f2dfe40592c4a9edf608b9bf68a9927c8f52e8082bc"
 "checksum clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e"
diff --git a/Cargo.toml b/Cargo.toml
index 2ea63fb6..0b5ad56f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,7 +14,7 @@ readme = "README.md"
 repository = "https://github.com/rust-lang-nursery/rust-bindgen"
 documentation = "https://docs.rs/bindgen"
 homepage = "https://rust-lang-nursery.github.io/rust-bindgen/"
-version = "0.42.2"
+version = "0.42.3"
 build = "build.rs"
 
 include = [
diff --git a/tests/expectations/tests/macro_const.rs b/tests/expectations/tests/macro_const.rs
index 382af9a5..851dd54e 100644
--- a/tests/expectations/tests/macro_const.rs
+++ b/tests/expectations/tests/macro_const.rs
@@ -1,12 +1,16 @@
 /* automatically generated by rust-bindgen */
 
-
-#![allow(dead_code, non_snake_case, non_camel_case_types, non_upper_case_globals)]
-
+#![allow(
+    dead_code,
+    non_snake_case,
+    non_camel_case_types,
+    non_upper_case_globals
+)]
 
 pub const foo: &'static [u8; 4usize] = b"bar\0";
 pub const CHAR: u8 = 98u8;
 pub const CHARR: u8 = 0u8;
 pub const FLOAT: f64 = 5.09;
 pub const FLOAT_EXPR: f64 = 0.005;
+pub const LONG: u32 = 3;
 pub const INVALID_UTF8: [u8; 5usize] = [240u8, 40u8, 140u8, 40u8, 0u8];
diff --git a/tests/headers/macro_const.h b/tests/headers/macro_const.h
index c28a3f6b..7c5aa438 100644
--- a/tests/headers/macro_const.h
+++ b/tests/headers/macro_const.h
@@ -3,5 +3,6 @@
 #define CHARR '\0'
 #define FLOAT 5.09f
 #define FLOAT_EXPR (5 / 1000.0f)
+#define LONG 3L
 
 #define INVALID_UTF8 "\xf0\x28\x8c\x28"