Merge branch 'func_proto' of https://github.com/chris-chambers/rust-bindgen

Conflicts:
	src/parser.rs
	tests/forward_declared_struct.rs
	tests/test_struct.rs

1 files changed, 0 insertions, 17 deletions

diff --git a/tests/func_ptr.rs b/tests/func_ptr.rs
deleted file mode 100644
index 7851c4ff..00000000
--- a/tests/func_ptr.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-extern crate bindgen;
-extern crate regex;
-extern crate syntax;
-
-mod util;
-
-#[test]
-fn test_func_ptr() {
-    let output = util::generate_unpretty_output("tests/headers/func_ptr.h");
-    assert_eq!(output, r##"extern "C" { pub static mut foo: ::std::option::Option<extern "C" fn(x: ::libc::c_int, y: ::libc::c_int) -> ::libc::c_int>; }"##);
-}
-
-#[test]
-fn test_func_ptr_in_struct() {
-    let output = util::generate_unpretty_output("tests/headers/func_ptr_in_struct.h");
-    assert_eq!(output, r##"#[repr(C)] #[deriving(Copy)] pub struct Struct_Foo { pub bar: ::std::option::Option<extern "C" fn(x: ::libc::c_int, y: ::libc::c_int) -> Enum_baz>, } extern "C" { }"##);
-}