Skip to content

Commit

Permalink
Auto merge of #1425 - emilio:cexpr-up, r=emilio
Browse files Browse the repository at this point in the history
Update cexpr.

Fixes #1424.
  • Loading branch information
bors-servo authored Oct 19, 2018
2 parents badb492 + 120dd78 commit d7a74ba
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 8 deletions.
8 changes: 4 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
10 changes: 7 additions & 3 deletions tests/expectations/tests/macro_const.rs
Original file line number Diff line number Diff line change
@@ -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];
1 change: 1 addition & 0 deletions tests/headers/macro_const.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"

0 comments on commit d7a74ba

Please sign in to comment.