Add patch.

Author: reitermarkus

Cargo.lock

@@ -32,6 +32,13 @@ include = [
 [badges]
 travis-ci = { repository = "rust-lang/rust-bindgen" }
 
+[workspace]
+members = [
+  "bindgen-integration",
+  "tests/expectations",
+  "tests/quickchecking",
+]
+
 [lib]
 path = "src/lib.rs"
 
@@ -86,3 +93,7 @@ testing_only_docs = []
 testing_only_extra_assertions = []
 testing_only_libclang_9 = []
 testing_only_libclang_5 = []
+
+[patch.crates-io]
+cexpr = { git = "https://github.com/reitermarkus/rust-cexpr", branch = "cast-expr" }
+# cexpr = { path = "./rust-cexpr" }

Cargo.toml

@@ -123,13 +123,9 @@ impl ParseCallbacks for MacroCallback {
     // Test the "custom derives" capability by adding `PartialEq` to the `Test` struct.
     fn add_derives(&self, name: &str) -> Vec<String> {
         if name == "Test" {
-            vec![
-                "PartialEq".into(),
-            ]
+            vec!["PartialEq".into()]
         } else if name == "MyOrderedEnum" {
-            vec![
-                "std::cmp::PartialOrd".into(),
-            ]
+            vec!["std::cmp::PartialOrd".into()]
         } else {
             vec![]
         }
@@ -162,7 +158,9 @@ fn main() {
 
     let out_path = PathBuf::from(env::var("OUT_DIR").unwrap());
     let out_rust_file = out_path.join("test.rs");
-    let out_rust_file_relative = out_rust_file.strip_prefix(std::env::current_dir().unwrap()).unwrap();
+    let out_rust_file_relative = out_rust_file
+        .strip_prefix(env::var("CARGO_MANIFEST_DIR").unwrap())
+        .unwrap();
     let out_dep_file = out_path.join("test.d");
 
     let bindings = Builder::default()
@@ -189,13 +187,18 @@ fn main() {
         .expect("Unable to generate bindings");
 
     assert!(macros.read().unwrap().contains("TESTMACRO"));
-    bindings.write_to_file(&out_rust_file).expect("Couldn't write bindings!");
-
-    let observed_deps = std::fs::read_to_string(out_dep_file).expect("Couldn't read depfile!");
-    let expected_deps = format!("{}: cpp/Test.h include/stub.h", out_rust_file_relative.display());
+    bindings
+        .write_to_file(&out_rust_file)
+        .expect("Couldn't write bindings!");
+
+    let observed_deps =
+        std::fs::read_to_string(out_dep_file).expect("Couldn't read depfile!");
+    let expected_deps = format!(
+        "{}: cpp/Test.h include/stub.h",
+        out_rust_file_relative.display()
+    );
     assert_eq!(
-        observed_deps,
-        expected_deps,
+        observed_deps, expected_deps,
         "including stub via include dir must produce correct dep path",
     );
 }

bindgen-integration/build.rs

@@ -8,10 +8,8 @@ use std::fs;
 use std::io::Write;
 use std::path::Path;
 
-const LIBCLANG_VERSION_DIRS: &'static [&'static str] = &[
-    "libclang-5",
-    "libclang-9",
-];
+const LIBCLANG_VERSION_DIRS: &'static [&'static str] =
+    &["libclang-5", "libclang-9"];
 
 fn main() {
     println!("cargo:rerun-if-changed=build.rs");

tests/expectations/build.rs

@@ -103,8 +103,10 @@ fn main() {
         .get_matches();
 
     let output_path: Option<&str> = matches.value_of("path");
-    let generate_range: usize = matches.value_of("range").unwrap().parse::<usize>().unwrap();
-    let tests: usize = matches.value_of("count").unwrap().parse::<usize>().unwrap();
+    let generate_range: usize =
+        matches.value_of("range").unwrap().parse::<usize>().unwrap();
+    let tests: usize =
+        matches.value_of("count").unwrap().parse::<usize>().unwrap();
 
     quickchecking::test_bindgen(generate_range, tests, output_path)
 }

tests/expectations/tests/dynamic_loading_attributes.rs

@@ -1,6 +1,6 @@
 use quickcheck::{Arbitrary, Gen, StdGen};
-use std::fmt;
 use rand::thread_rng;
+use std::fmt;
 
 /// BaseTypeC is used in generation of C headers to represent the C language's
 /// primitive types as well as `void*`.
@@ -185,10 +185,14 @@ impl Arbitrary for DeclarationC {
     fn arbitrary<G: Gen>(g: &mut G) -> DeclarationC {
         match g.gen_range(0, 5) {
             0 => DeclarationC::FunctionDecl(FunctionPrototypeC::arbitrary(g)),
-            1 => DeclarationC::FunctionPtrDecl(FunctionPointerDeclarationC::arbitrary(g)),
+            1 => DeclarationC::FunctionPtrDecl(
+                FunctionPointerDeclarationC::arbitrary(g),
+            ),
             2 => DeclarationC::StructDecl(StructDeclarationC::arbitrary(g)),
             3 => DeclarationC::UnionDecl(UnionDeclarationC::arbitrary(g)),
-            4 => DeclarationC::VariableDecl(BasicTypeDeclarationC::arbitrary(g)),
+            4 => {
+                DeclarationC::VariableDecl(BasicTypeDeclarationC::arbitrary(g))
+            }
             _ => unreachable!(),
         }
     }
@@ -425,9 +429,7 @@ impl fmt::Display for StructDeclarationC {
         write!(
             f,
             "struct {{ {} }} struct_{}{};",
-            self.fields,
-            self.ident_id,
-            self.array_dimension
+            self.fields, self.ident_id, self.array_dimension
         )
     }
 }
@@ -475,9 +477,7 @@ impl fmt::Display for UnionDeclarationC {
         write!(
             f,
             "union {{ {} }} union_{}{};",
-            self.fields,
-            self.ident_id,
-            self.array_dimension
+            self.fields, self.ident_id, self.array_dimension
         )
     }
 }
@@ -574,9 +574,7 @@ impl fmt::Display for ParameterC {
         write!(
             f,
             "{} {} {}",
-            self.type_qualifier,
-            self.type_name,
-            self.pointer_level
+            self.type_qualifier, self.type_name, self.pointer_level
         )
     }
 }

tests/quickchecking/src/bin.rs

@@ -26,15 +26,15 @@ extern crate quickcheck;
 extern crate rand;
 extern crate tempdir;
 
-use std::sync::Mutex;
 use quickcheck::{QuickCheck, StdGen, TestResult};
+use rand::thread_rng;
+use std::error::Error;
 use std::fs::File;
 use std::io::Write;
-use tempdir::TempDir;
-use std::process::{Command, Output};
 use std::path::PathBuf;
-use std::error::Error;
-use rand::thread_rng;
+use std::process::{Command, Output};
+use std::sync::Mutex;
+use tempdir::TempDir;
 
 /// Contains definitions of and impls for types used to fuzz C declarations.
 pub mod fuzzers;
@@ -47,12 +47,15 @@ struct Context {
 
 // Initialize global context.
 lazy_static! {
-    static ref CONTEXT: Mutex<Context> = Mutex::new(Context { output_path: None });
+    static ref CONTEXT: Mutex<Context> =
+        Mutex::new(Context { output_path: None });
 }
 
 // Passes fuzzed header to the `csmith-fuzzing/predicate.py` script, returns
 // output of the associated command.
-fn run_predicate_script(header: fuzzers::HeaderC) -> Result<Output, Box<Error>> {
+fn run_predicate_script(
+    header: fuzzers::HeaderC,
+) -> Result<Output, Box<Error>> {
     let dir = TempDir::new("bindgen_prop")?;
     let header_path = dir.path().join("prop_test.h");
 
@@ -110,7 +113,11 @@ fn bindgen_prop(header: fuzzers::HeaderC) -> TestResult {
 /// fuzzed C headers generated with types defined in the `fuzzers` module.
 /// Success/Failure is dictated by the result of passing the fuzzed headers
 /// to the `csmith-fuzzing/predicate.py` script.
-pub fn test_bindgen(generate_range: usize, tests: usize, output_path: Option<&str>) {
+pub fn test_bindgen(
+    generate_range: usize,
+    tests: usize,
+    output_path: Option<&str>,
+) {
     match output_path {
         Some(path) => {
             CONTEXT.lock().unwrap().output_path =

tests/quickchecking/src/fuzzers.rs

@@ -1,13 +1,14 @@
-
 extern crate quickcheck;
 extern crate quickchecking;
 extern crate rand;
 
-use quickchecking::fuzzers::{ArrayDimensionC, BaseTypeC, BasicTypeDeclarationC, DeclarationC,
-                             DeclarationListC, FunctionPointerDeclarationC, FunctionPrototypeC,
-                             HeaderC, ParameterC, ParameterListC, PointerLevelC,
-                             StructDeclarationC, TypeQualifierC, UnionDeclarationC};
 use quickcheck::{Arbitrary, StdGen};
+use quickchecking::fuzzers::{
+    ArrayDimensionC, BaseTypeC, BasicTypeDeclarationC, DeclarationC,
+    DeclarationListC, FunctionPointerDeclarationC, FunctionPrototypeC, HeaderC,
+    ParameterC, ParameterListC, PointerLevelC, StructDeclarationC,
+    TypeQualifierC, UnionDeclarationC,
+};
 use rand::thread_rng;
 
 #[test]