rust-lang · bors-servo · Jan 23, 2017 · Jan 22, 2017 · Jan 22, 2017
diff --git a/.travis.yml b/.travis.yml
@@ -23,8 +23,6 @@ cache:
 
 before_install: . ./ci/before_install.sh
 
-before_script: cd libbindgen
-
 script:
   - cargo test --features "$BINDGEN_FEATURES assert_no_dangling_items"
   - cargo test --release --features "$BINDGEN_FEATURES assert_no_dangling_items"
@@ -34,10 +32,7 @@ script:
   - cargo build --features "$BINDGEN_FEATURES docs_"
   - cd tests/expectations
   - cargo test
-  - cd ../../../bindgen
-  - cargo test --features "$BINDGEN_FEATURES"
-  - cargo test --release --features "$BINDGEN_FEATURES"
-  - cd ../bindgen-integration
+  - cd ../../bindgen-integration
   - cargo test --features "$BINDGEN_FEATURES"
   - cargo test --release --features "$BINDGEN_FEATURES"
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -42,10 +42,9 @@ issue, provide us with:
 
 ## Building
 
-To build `libbindgen`:
+To build `bindgen`:
 
 ```
-$ cd bindgen/libbindgen
 $ cargo build
 ```
 
@@ -77,21 +76,21 @@ that you aren't forgetting to document types and functions. CI will catch it if
 you forget, but the turn around will be a lot slower ;)
 
 ```
-$ cd libbindgen && cargo build --features "llvm_stable _docs"
+$ cargo build --features "llvm_stable _docs"
 ```
 
 ## Testing
 
-Code for binding generation and testing thereof is in the `libbindgen` crate.
+Code for binding generation and testing thereof is in the `bindgen` crate.
 The following sections assume you are working in that subdirectory.
 
 ### Overview
 
-Input C/C++ test headers reside in the `libbindgen/tests/headers`
-directory. Expected output Rust bindings live in
-`libbindgen/tests/expectations/tests`. For example,
-`libbindgen/tests/headers/my_header.h`'s expected generated Rust bindings would
-be `libbindgen/tests/expectations/tests/my_header.rs`.
+Input C/C++ test headers reside in the `tests/headers` directory. Expected
+output Rust bindings live in `tests/expectations/tests`.
+
+For example, `tests/headers/my_header.h`'s expected generated Rust bindings
+would be `tests/expectations/tests/my_header.rs`.
 
 Run `cargo test` to compare generated Rust bindings to the expectations.
 
@@ -144,17 +143,16 @@ And ensure `~/.cargo/bin` is on your path.
 ## Debug Logging
 
 To help debug what `bindgen` is doing, you can define the environment variable
-`RUST_LOG=libbindgen` to get a bunch of debugging log spew.
+`RUST_LOG=bindgen` to get a bunch of debugging log spew.
 
 ```
-$ RUST_LOG=libbindgen ./target/debug/bindgen [flags...] ~/path/to/some/header.h
+$ RUST_LOG=bindgen ./target/debug/bindgen [flags...] ~/path/to/some/header.h
 ```
 
 This logging can also be used when debugging failing tests:
 
 ```
-$ cd libbindgen
-$ RUST_LOG=libbindgen cargo test
+$ RUST_LOG=bindgen cargo test
 ```
 
 ## Using `creduce` to Minimize Test Cases

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,66 @@
-[workspace]
-members = [
-  "bindgen",
-  "bindgen-integration",
-  "libbindgen",
-  "libbindgen/tests/expectations",
+[package]
+authors = [
+  "Jyun-Yan You <[email protected]>",
+  "Emilio Cobos Álvarez <[email protected]>",
+  "The Servo project developers",
 ]
+description = "A binding generator for Rust"
+homepage = "https://github.com/servo/rust-bindgen"
+keywords = ["bindings", "ffi", "code-generation"]
+license = "BSD-3-Clause"
+name = "bindgen"
+readme = "README.md"
+repository = "https://github.com/servo/rust-bindgen"
+version = "0.20.0"
+build = "build.rs"
+
+[lib]
+path = "src/lib.rs"
+
+[[bin]]
+name = "bindgen"
+path = "src/main.rs"
+
+[dev-dependencies]
+diff = "0.1"
+clap = "2"
+shlex = "0.1"
+
+[build-dependencies]
+quasi_codegen = "0.26"
+
+[dependencies]
+cexpr = "0.2"
+cfg-if = "0.1.0"
+clang-sys = { version = "0.12", features = ["runtime", "clang_3_9"] }
+lazy_static = "0.2.1"
+rustc-serialize = "0.3.19"
+syntex_syntax = "0.54"
+regex = "0.2"
+# This kinda sucks: https://github.com/rust-lang/cargo/issues/1982
+clap = "2"
+
+[dependencies.aster]
+features = ["with-syntex"]
+version = "0.38"
+
+[dependencies.env_logger]
+optional = true
+version = "0.4"
+
+[dependencies.log]
+optional = true
+version = "0.3"
+
+[dependencies.quasi]
+features = ["with-syntex"]
+version = "0.29"
+
+[features]
+assert_no_dangling_items = []
+default = ["logging"]
+llvm_stable = []
+logging = ["env_logger", "log"]
+static = []
+# This feature only exists for CI -- don't use it!
+docs_ = []
diff --git a/README.md b/README.md
@@ -117,20 +117,20 @@ In `Cargo.toml`:
 build = "build.rs"
 
 [build-dependencies]
-libbindgen = "0.1"
+bindgen = "0.20"
 ```
 
 In `build.rs`:
 
 ```rust
-extern crate libbindgen;
+extern crate bindgen;
 
 use std::env;
 use std::path::Path;
 
 fn main() {
   let out_dir = env::var("OUT_DIR").unwrap();
-  let _ = libbindgen::builder()
+  let _ = bindgen::builder()
     .header("example.h")
     .use_core()
     .generate().unwrap()

diff --git a/bindgen-integration/Cargo.toml b/bindgen-integration/Cargo.toml
@@ -3,13 +3,12 @@ name = "bindgen-integration"
 description = "A package to test various bindgen features"
 version = "0.1.0"
 authors = ["Emilio Cobos Álvarez <[email protected]>"]
-workspace = ".."
 publish = false
 build = "build.rs"
 
 [build-dependencies]
-libbindgen = { path = "../libbindgen" }
+bindgen = { path = ".." }
 gcc = "0.3"
 
 [features]
-llvm_stable = ["libbindgen/llvm_stable"]
+llvm_stable = ["bindgen/llvm_stable"]
diff --git a/bindgen-integration/build.rs b/bindgen-integration/build.rs
@@ -1,9 +1,9 @@
-extern crate libbindgen;
+extern crate bindgen;
 extern crate gcc;
 
 use std::env;
 use std::path::PathBuf;
-use libbindgen::Builder;
+use bindgen::Builder;
 
 fn main() {
     gcc::Config::new()

diff --git a/bindgen/Cargo.toml b/bindgen/Cargo.toml
diff --git a/libbindgen/build.rs → build.rs b/libbindgen/build.rs → build.rs
diff --git a/libbindgen/Cargo.toml b/libbindgen/Cargo.toml
diff --git a/libbindgen/README.md b/libbindgen/README.md
diff --git a/libbindgen/src/chooser.rs → src/chooser.rs b/libbindgen/src/chooser.rs → src/chooser.rs
diff --git a/libbindgen/src/clang.rs → src/clang.rs b/libbindgen/src/clang.rs → src/clang.rs
diff --git a/libbindgen/src/codegen/helpers.rs → src/codegen/helpers.rs b/libbindgen/src/codegen/helpers.rs → src/codegen/helpers.rs
diff --git a/libbindgen/src/codegen/mod.rs → src/codegen/mod.rs b/libbindgen/src/codegen/mod.rs → src/codegen/mod.rs
diff --git a/libbindgen/src/ir/annotations.rs → src/ir/annotations.rs b/libbindgen/src/ir/annotations.rs → src/ir/annotations.rs
diff --git a/libbindgen/src/ir/comp.rs → src/ir/comp.rs b/libbindgen/src/ir/comp.rs → src/ir/comp.rs
diff --git a/libbindgen/src/ir/context.rs → src/ir/context.rs b/libbindgen/src/ir/context.rs → src/ir/context.rs
diff --git a/libbindgen/src/ir/derive.rs → src/ir/derive.rs b/libbindgen/src/ir/derive.rs → src/ir/derive.rs
diff --git a/libbindgen/src/ir/enum_ty.rs → src/ir/enum_ty.rs b/libbindgen/src/ir/enum_ty.rs → src/ir/enum_ty.rs
diff --git a/libbindgen/src/ir/function.rs → src/ir/function.rs b/libbindgen/src/ir/function.rs → src/ir/function.rs
diff --git a/libbindgen/src/ir/int.rs → src/ir/int.rs b/libbindgen/src/ir/int.rs → src/ir/int.rs
diff --git a/libbindgen/src/ir/item.rs → src/ir/item.rs b/libbindgen/src/ir/item.rs → src/ir/item.rs
diff --git a/libbindgen/src/ir/item_kind.rs → src/ir/item_kind.rs b/libbindgen/src/ir/item_kind.rs → src/ir/item_kind.rs
diff --git a/libbindgen/src/ir/layout.rs → src/ir/layout.rs b/libbindgen/src/ir/layout.rs → src/ir/layout.rs
diff --git a/libbindgen/src/ir/mod.rs → src/ir/mod.rs b/libbindgen/src/ir/mod.rs → src/ir/mod.rs
diff --git a/libbindgen/src/ir/module.rs → src/ir/module.rs b/libbindgen/src/ir/module.rs → src/ir/module.rs
diff --git a/libbindgen/src/ir/ty.rs → src/ir/ty.rs b/libbindgen/src/ir/ty.rs → src/ir/ty.rs
diff --git a/libbindgen/src/ir/type_collector.rs → src/ir/type_collector.rs b/libbindgen/src/ir/type_collector.rs → src/ir/type_collector.rs
diff --git a/libbindgen/src/ir/var.rs → src/ir/var.rs b/libbindgen/src/ir/var.rs → src/ir/var.rs
diff --git a/libbindgen/src/lib.rs → src/lib.rs b/libbindgen/src/lib.rs → src/lib.rs
diff --git a/libbindgen/src/log_stubs.rs → src/log_stubs.rs b/libbindgen/src/log_stubs.rs → src/log_stubs.rs
diff --git a/bindgen/src/main.rs → src/main.rs b/bindgen/src/main.rs → src/main.rs
@@ -1,12 +1,12 @@
-extern crate libbindgen;
+extern crate bindgen;
 extern crate env_logger;
 #[macro_use]
 extern crate log;
 extern crate clang_sys;
 extern crate clap;
 extern crate rustc_serialize;
 
-use libbindgen::clang_version;
+use bindgen::clang_version;
 use std::env;
 
 mod options;

diff --git a/bindgen/src/options.rs → src/options.rs b/bindgen/src/options.rs → src/options.rs
@@ -1,5 +1,5 @@
 use clap::{App, Arg};
-use libbindgen::{Builder, CodegenConfig, builder};
+use bindgen::{Builder, CodegenConfig, builder};
 use std::fs::File;
 use std::io::{self, Error, ErrorKind};
 

diff --git a/libbindgen/src/parse.rs → src/parse.rs b/libbindgen/src/parse.rs → src/parse.rs
diff --git a/libbindgen/src/regex_set.rs → src/regex_set.rs b/libbindgen/src/regex_set.rs → src/regex_set.rs
diff --git a/libbindgen/src/uses.rs → src/uses.rs b/libbindgen/src/uses.rs → src/uses.rs
diff --git a/libbindgen/tests/expectations/Cargo.toml → tests/expectations/Cargo.toml b/libbindgen/tests/expectations/Cargo.toml → tests/expectations/Cargo.toml
@@ -4,9 +4,8 @@ description = "bindgen results when ran on ../headers/*"
 version = "0.1.0"
 authors = [
   "Jyun-Yan You <[email protected]>",
-  "Emilio Cobos Álvarez <[email protected]>",
+  "Emilio Cobos Álvarez <[email protected]>",
   "The Servo project developers",
 ]
-workspace = "../../.."
 
 [dependencies]
diff --git a/libbindgen/tests/expectations/src/lib.rs → tests/expectations/lib.rs b/libbindgen/tests/expectations/src/lib.rs → tests/expectations/lib.rs
diff --git a/tests/expectations/src/lib.rs b/tests/expectations/src/lib.rs
diff --git a/...gen/tests/expectations/tests/accessors.rs → tests/expectations/tests/accessors.rs b/...gen/tests/expectations/tests/accessors.rs → tests/expectations/tests/accessors.rs
diff --git a/...sts/expectations/tests/annotation_hide.rs → tests/expectations/tests/annotation_hide.rs b/...sts/expectations/tests/annotation_hide.rs → tests/expectations/tests/annotation_hide.rs
diff --git a/...gen/tests/expectations/tests/anon_enum.rs → tests/expectations/tests/anon_enum.rs b/...gen/tests/expectations/tests/anon_enum.rs → tests/expectations/tests/anon_enum.rs
diff --git a/...sts/expectations/tests/anon_enum_trait.rs → tests/expectations/tests/anon_enum_trait.rs b/...sts/expectations/tests/anon_enum_trait.rs → tests/expectations/tests/anon_enum_trait.rs
diff --git a/...expectations/tests/anon_enum_whitelist.rs → ...expectations/tests/anon_enum_whitelist.rs b/...expectations/tests/anon_enum_whitelist.rs → ...expectations/tests/anon_enum_whitelist.rs
diff --git a/...en/tests/expectations/tests/anon_union.rs → tests/expectations/tests/anon_union.rs b/...en/tests/expectations/tests/anon_union.rs → tests/expectations/tests/anon_union.rs
diff --git a/...n/tests/expectations/tests/arg_keyword.rs → tests/expectations/tests/arg_keyword.rs b/...n/tests/expectations/tests/arg_keyword.rs → tests/expectations/tests/arg_keyword.rs
diff --git a/libbindgen/tests/expectations/tests/auto.rs → tests/expectations/tests/auto.rs b/libbindgen/tests/expectations/tests/auto.rs → tests/expectations/tests/auto.rs
diff --git a/...s/bad-namespace-parenthood-inheritance.rs → ...s/bad-namespace-parenthood-inheritance.rs b/...s/bad-namespace-parenthood-inheritance.rs → ...s/bad-namespace-parenthood-inheritance.rs
diff --git a/...sts/expectations/tests/base-to-derived.rs → tests/expectations/tests/base-to-derived.rs b/...sts/expectations/tests/base-to-derived.rs → tests/expectations/tests/base-to-derived.rs
diff --git a/...expectations/tests/bitfield-enum-basic.rs → ...expectations/tests/bitfield-enum-basic.rs b/...expectations/tests/bitfield-enum-basic.rs → ...expectations/tests/bitfield-enum-basic.rs
diff --git a/...tations/tests/bitfield_method_mangling.rs → ...tations/tests/bitfield_method_mangling.rs b/...tations/tests/bitfield_method_mangling.rs → ...tations/tests/bitfield_method_mangling.rs
diff --git a/...indgen/tests/expectations/tests/blocks.rs → tests/expectations/tests/blocks.rs b/...indgen/tests/expectations/tests/blocks.rs → tests/expectations/tests/blocks.rs
diff --git a/...sts/canonical_path_without_namespacing.rs → ...sts/canonical_path_without_namespacing.rs b/...sts/canonical_path_without_namespacing.rs → ...sts/canonical_path_without_namespacing.rs
diff --git a/libbindgen/tests/expectations/tests/class.rs → tests/expectations/tests/class.rs b/libbindgen/tests/expectations/tests/class.rs → tests/expectations/tests/class.rs
diff --git a/.../tests/expectations/tests/class_nested.rs → tests/expectations/tests/class_nested.rs b/.../tests/expectations/tests/class_nested.rs → tests/expectations/tests/class_nested.rs
diff --git a/...ts/expectations/tests/class_no_members.rs → tests/expectations/tests/class_no_members.rs b/...ts/expectations/tests/class_no_members.rs → tests/expectations/tests/class_no_members.rs
diff --git a/.../tests/expectations/tests/class_static.rs → tests/expectations/tests/class_static.rs b/.../tests/expectations/tests/class_static.rs → tests/expectations/tests/class_static.rs
diff --git a/.../expectations/tests/class_static_const.rs → .../expectations/tests/class_static_const.rs b/.../expectations/tests/class_static_const.rs → .../expectations/tests/class_static_const.rs
diff --git a/.../tests/expectations/tests/class_use_as.rs → tests/expectations/tests/class_use_as.rs b/.../tests/expectations/tests/class_use_as.rs → tests/expectations/tests/class_use_as.rs
diff --git a/...sts/expectations/tests/class_with_dtor.rs → tests/expectations/tests/class_with_dtor.rs b/...sts/expectations/tests/class_with_dtor.rs → tests/expectations/tests/class_with_dtor.rs
diff --git a/...ctations/tests/class_with_inner_struct.rs → ...ctations/tests/class_with_inner_struct.rs b/...ctations/tests/class_with_inner_struct.rs → ...ctations/tests/class_with_inner_struct.rs
diff --git a/.../expectations/tests/class_with_typedef.rs → .../expectations/tests/class_with_typedef.rs b/.../expectations/tests/class_with_typedef.rs → .../expectations/tests/class_with_typedef.rs
diff --git a/...ndgen/tests/expectations/tests/complex.rs → tests/expectations/tests/complex.rs b/...ndgen/tests/expectations/tests/complex.rs → tests/expectations/tests/complex.rs
diff --git a/...ests/expectations/tests/complex_global.rs → tests/expectations/tests/complex_global.rs b/...ests/expectations/tests/complex_global.rs → tests/expectations/tests/complex_global.rs
diff --git a/...en/tests/expectations/tests/const_bool.rs → tests/expectations/tests/const_bool.rs b/...en/tests/expectations/tests/const_bool.rs → tests/expectations/tests/const_bool.rs
diff --git a/.../expectations/tests/const_enum_unnamed.rs → .../expectations/tests/const_enum_unnamed.rs b/.../expectations/tests/const_enum_unnamed.rs → .../expectations/tests/const_enum_unnamed.rs
diff --git a/...gen/tests/expectations/tests/const_ptr.rs → tests/expectations/tests/const_ptr.rs b/...gen/tests/expectations/tests/const_ptr.rs → tests/expectations/tests/const_ptr.rs
diff --git a/...s/expectations/tests/const_resolved_ty.rs → ...s/expectations/tests/const_resolved_ty.rs b/...s/expectations/tests/const_resolved_ty.rs → ...s/expectations/tests/const_resolved_ty.rs
diff --git a/.../tests/expectations/tests/const_tparam.rs → tests/expectations/tests/const_tparam.rs b/.../tests/expectations/tests/const_tparam.rs → tests/expectations/tests/const_tparam.rs
diff --git a/...s/expectations/tests/constant-evaluate.rs → ...s/expectations/tests/constant-evaluate.rs b/...s/expectations/tests/constant-evaluate.rs → ...s/expectations/tests/constant-evaluate.rs
diff --git a/...tests/expectations/tests/constify-enum.rs → tests/expectations/tests/constify-enum.rs b/...tests/expectations/tests/constify-enum.rs → tests/expectations/tests/constify-enum.rs
diff --git a/...ests/expectations/tests/constructor-tp.rs → tests/expectations/tests/constructor-tp.rs b/...ests/expectations/tests/constructor-tp.rs → tests/expectations/tests/constructor-tp.rs
diff --git a/.../tests/expectations/tests/constructors.rs → tests/expectations/tests/constructors.rs b/.../tests/expectations/tests/constructors.rs → tests/expectations/tests/constructors.rs
diff --git a/...ests/expectations/tests/convert-floats.rs → tests/expectations/tests/convert-floats.rs b/...ests/expectations/tests/convert-floats.rs → tests/expectations/tests/convert-floats.rs
diff --git a/libbindgen/tests/expectations/tests/crtp.rs → tests/expectations/tests/crtp.rs b/libbindgen/tests/expectations/tests/crtp.rs → tests/expectations/tests/crtp.rs
diff --git a/...tests/expectations/tests/dash_language.rs → tests/expectations/tests/dash_language.rs b/...tests/expectations/tests/dash_language.rs → tests/expectations/tests/dash_language.rs
diff --git a/...pectations/tests/decl_extern_int_twice.rs → ...pectations/tests/decl_extern_int_twice.rs b/...pectations/tests/decl_extern_int_twice.rs → ...pectations/tests/decl_extern_int_twice.rs
diff --git a/...s/expectations/tests/decl_ptr_to_array.rs → ...s/expectations/tests/decl_ptr_to_array.rs b/...s/expectations/tests/decl_ptr_to_array.rs → ...s/expectations/tests/decl_ptr_to_array.rs
diff --git a/...expectations/tests/disable-namespacing.rs → ...expectations/tests/disable-namespacing.rs b/...expectations/tests/disable-namespacing.rs → ...expectations/tests/disable-namespacing.rs
diff --git a/...ests/duplicated-namespaces-definitions.rs → ...ests/duplicated-namespaces-definitions.rs b/...ests/duplicated-namespaces-definitions.rs → ...ests/duplicated-namespaces-definitions.rs
diff --git a/...pectations/tests/duplicated-namespaces.rs → ...pectations/tests/duplicated-namespaces.rs b/...pectations/tests/duplicated-namespaces.rs → ...pectations/tests/duplicated-namespaces.rs
diff --git a/...tions/tests/duplicated_constants_in_ns.rs → ...tions/tests/duplicated_constants_in_ns.rs b/...tions/tests/duplicated_constants_in_ns.rs → ...tions/tests/duplicated_constants_in_ns.rs
diff --git a/...en/tests/expectations/tests/elaborated.rs → tests/expectations/tests/elaborated.rs b/...en/tests/expectations/tests/elaborated.rs → tests/expectations/tests/elaborated.rs
diff --git a/...ations/tests/empty_template_param_name.rs → ...ations/tests/empty_template_param_name.rs b/...ations/tests/empty_template_param_name.rs → ...ations/tests/empty_template_param_name.rs
diff --git a/libbindgen/tests/expectations/tests/enum.rs → tests/expectations/tests/enum.rs b/libbindgen/tests/expectations/tests/enum.rs → tests/expectations/tests/enum.rs
diff --git a/...en/tests/expectations/tests/enum_alias.rs → tests/expectations/tests/enum_alias.rs b/...en/tests/expectations/tests/enum_alias.rs → tests/expectations/tests/enum_alias.rs
diff --git a/...tations/tests/enum_and_vtable_mangling.rs → ...tations/tests/enum_and_vtable_mangling.rs b/...tations/tests/enum_and_vtable_mangling.rs → ...tations/tests/enum_and_vtable_mangling.rs
diff --git a/...gen/tests/expectations/tests/enum_dupe.rs → tests/expectations/tests/enum_dupe.rs b/...gen/tests/expectations/tests/enum_dupe.rs → tests/expectations/tests/enum_dupe.rs
diff --git a/.../expectations/tests/enum_explicit_type.rs → .../expectations/tests/enum_explicit_type.rs b/.../expectations/tests/enum_explicit_type.rs → .../expectations/tests/enum_explicit_type.rs
diff --git a/...ns/tests/enum_in_template_with_typedef.rs → ...ns/tests/enum_in_template_with_typedef.rs b/...ns/tests/enum_in_template_with_typedef.rs → ...ns/tests/enum_in_template_with_typedef.rs
diff --git a/...tests/expectations/tests/enum_negative.rs → tests/expectations/tests/enum_negative.rs b/...tests/expectations/tests/enum_negative.rs → tests/expectations/tests/enum_negative.rs
diff --git a/...n/tests/expectations/tests/enum_packed.rs → tests/expectations/tests/enum_packed.rs b/...n/tests/expectations/tests/enum_packed.rs → tests/expectations/tests/enum_packed.rs
diff --git a/...tests/eval-variadic-template-parameter.rs → ...tests/eval-variadic-template-parameter.rs b/...tests/eval-variadic-template-parameter.rs → ...tests/eval-variadic-template-parameter.rs
diff --git a/...indgen/tests/expectations/tests/extern.rs → tests/expectations/tests/extern.rs b/...indgen/tests/expectations/tests/extern.rs → tests/expectations/tests/extern.rs
diff --git a/...dgen/tests/expectations/tests/float128.rs → tests/expectations/tests/float128.rs b/...dgen/tests/expectations/tests/float128.rs → tests/expectations/tests/float128.rs
diff --git a/...sts/forward-inherit-struct-with-fields.rs → ...sts/forward-inherit-struct-with-fields.rs b/...sts/forward-inherit-struct-with-fields.rs → ...sts/forward-inherit-struct-with-fields.rs
diff --git a/...ectations/tests/forward-inherit-struct.rs → ...ectations/tests/forward-inherit-struct.rs b/...ectations/tests/forward-inherit-struct.rs → ...ectations/tests/forward-inherit-struct.rs
diff --git a/...ctations/tests/forward_declared_struct.rs → ...ctations/tests/forward_declared_struct.rs b/...ctations/tests/forward_declared_struct.rs → ...ctations/tests/forward_declared_struct.rs
diff --git a/...en/tests/expectations/tests/func_proto.rs → tests/expectations/tests/func_proto.rs b/...en/tests/expectations/tests/func_proto.rs → tests/expectations/tests/func_proto.rs
diff --git a/...dgen/tests/expectations/tests/func_ptr.rs → tests/expectations/tests/func_ptr.rs b/...dgen/tests/expectations/tests/func_ptr.rs → tests/expectations/tests/func_ptr.rs
diff --git a/.../expectations/tests/func_ptr_in_struct.rs → .../expectations/tests/func_ptr_in_struct.rs b/.../expectations/tests/func_ptr_in_struct.rs → .../expectations/tests/func_ptr_in_struct.rs
diff --git a/...expectations/tests/func_with_array_arg.rs → ...expectations/tests/func_with_array_arg.rs b/...expectations/tests/func_with_array_arg.rs → ...expectations/tests/func_with_array_arg.rs
diff --git a/...ectations/tests/func_with_func_ptr_arg.rs → ...ectations/tests/func_with_func_ptr_arg.rs b/...ectations/tests/func_with_func_ptr_arg.rs → ...ectations/tests/func_with_func_ptr_arg.rs
diff --git a/...ts/expectations/tests/in_class_typedef.rs → tests/expectations/tests/in_class_typedef.rs b/...ts/expectations/tests/in_class_typedef.rs → tests/expectations/tests/in_class_typedef.rs
diff --git a/.../expectations/tests/inherit-namespaced.rs → .../expectations/tests/inherit-namespaced.rs b/.../expectations/tests/inherit-namespaced.rs → .../expectations/tests/inherit-namespaced.rs
diff --git a/...tests/expectations/tests/inherit_named.rs → tests/expectations/tests/inherit_named.rs b/...tests/expectations/tests/inherit_named.rs → tests/expectations/tests/inherit_named.rs
diff --git a/...sts/expectations/tests/inherit_typedef.rs → tests/expectations/tests/inherit_typedef.rs b/...sts/expectations/tests/inherit_typedef.rs → tests/expectations/tests/inherit_typedef.rs
diff --git a/...sts/expectations/tests/inline-function.rs → tests/expectations/tests/inline-function.rs b/...sts/expectations/tests/inline-function.rs → tests/expectations/tests/inline-function.rs
diff --git a/...ts/expectations/tests/inline_namespace.rs → tests/expectations/tests/inline_namespace.rs b/...ts/expectations/tests/inline_namespace.rs → tests/expectations/tests/inline_namespace.rs
diff --git a/...ns/tests/inline_namespace_conservative.rs → ...ns/tests/inline_namespace_conservative.rs b/...ns/tests/inline_namespace_conservative.rs → ...ns/tests/inline_namespace_conservative.rs
diff --git a/...tions/tests/inline_namespace_whitelist.rs → ...tions/tests/inline_namespace_whitelist.rs b/...tions/tests/inline_namespace_whitelist.rs → ...tions/tests/inline_namespace_whitelist.rs
diff --git a/...n/tests/expectations/tests/inner_const.rs → tests/expectations/tests/inner_const.rs b/...n/tests/expectations/tests/inner_const.rs → tests/expectations/tests/inner_const.rs
diff --git a/...expectations/tests/inner_template_self.rs → ...expectations/tests/inner_template_self.rs b/...expectations/tests/inner_template_self.rs → ...expectations/tests/inner_template_self.rs
diff --git a/...dgen/tests/expectations/tests/int128_t.rs → tests/expectations/tests/int128_t.rs b/...dgen/tests/expectations/tests/int128_t.rs → tests/expectations/tests/int128_t.rs
diff --git a/...gen/tests/expectations/tests/issue-358.rs → tests/expectations/tests/issue-358.rs b/...gen/tests/expectations/tests/issue-358.rs → tests/expectations/tests/issue-358.rs
diff --git a/...gen/tests/expectations/tests/issue-372.rs → tests/expectations/tests/issue-372.rs b/...gen/tests/expectations/tests/issue-372.rs → tests/expectations/tests/issue-372.rs
diff --git a/...gen/tests/expectations/tests/issue_311.rs → tests/expectations/tests/issue_311.rs b/...gen/tests/expectations/tests/issue_311.rs → tests/expectations/tests/issue_311.rs
diff --git a/...gen/tests/expectations/tests/issue_315.rs → tests/expectations/tests/issue_315.rs b/...gen/tests/expectations/tests/issue_315.rs → tests/expectations/tests/issue_315.rs
diff --git a/...expectations/tests/jsval_layout_opaque.rs → ...expectations/tests/jsval_layout_opaque.rs b/...expectations/tests/jsval_layout_opaque.rs → ...expectations/tests/jsval_layout_opaque.rs
diff --git a/...dgen/tests/expectations/tests/keywords.rs → tests/expectations/tests/keywords.rs b/...dgen/tests/expectations/tests/keywords.rs → tests/expectations/tests/keywords.rs
diff --git a/...ts/expectations/tests/macro-expr-basic.rs → tests/expectations/tests/macro-expr-basic.rs b/...ts/expectations/tests/macro-expr-basic.rs → tests/expectations/tests/macro-expr-basic.rs
diff --git a/...n/tests/expectations/tests/macro-redef.rs → tests/expectations/tests/macro-redef.rs b/...n/tests/expectations/tests/macro-redef.rs → tests/expectations/tests/macro-redef.rs
diff --git a/...n/tests/expectations/tests/macro_const.rs → tests/expectations/tests/macro_const.rs b/...n/tests/expectations/tests/macro_const.rs → tests/expectations/tests/macro_const.rs
diff --git a/...pectations/tests/maddness-is-avoidable.rs → ...pectations/tests/maddness-is-avoidable.rs b/...pectations/tests/maddness-is-avoidable.rs → ...pectations/tests/maddness-is-avoidable.rs
diff --git a/...sts/expectations/tests/method-mangling.rs → tests/expectations/tests/method-mangling.rs b/...sts/expectations/tests/method-mangling.rs → tests/expectations/tests/method-mangling.rs
diff --git a/.../expectations/tests/module-whitelisted.rs → .../expectations/tests/module-whitelisted.rs b/.../expectations/tests/module-whitelisted.rs → .../expectations/tests/module-whitelisted.rs
diff --git a/...n/tests/expectations/tests/msvc-no-usr.rs → tests/expectations/tests/msvc-no-usr.rs b/...n/tests/expectations/tests/msvc-no-usr.rs → tests/expectations/tests/msvc-no-usr.rs
diff --git a/.../multiple-inherit-empty-correct-layout.rs → .../multiple-inherit-empty-correct-layout.rs b/.../multiple-inherit-empty-correct-layout.rs → .../multiple-inherit-empty-correct-layout.rs
diff --git a/...ndgen/tests/expectations/tests/mutable.rs → tests/expectations/tests/mutable.rs b/...ndgen/tests/expectations/tests/mutable.rs → tests/expectations/tests/mutable.rs
diff --git a/...gen/tests/expectations/tests/namespace.rs → tests/expectations/tests/namespace.rs b/...gen/tests/expectations/tests/namespace.rs → tests/expectations/tests/namespace.rs
diff --git a/...indgen/tests/expectations/tests/nested.rs → tests/expectations/tests/nested.rs b/...indgen/tests/expectations/tests/nested.rs → tests/expectations/tests/nested.rs
diff --git a/...tests/expectations/tests/nested_vtable.rs → tests/expectations/tests/nested_vtable.rs b/...tests/expectations/tests/nested_vtable.rs → tests/expectations/tests/nested_vtable.rs
diff --git a/...ctations/tests/nested_within_namespace.rs → ...ctations/tests/nested_within_namespace.rs b/...ctations/tests/nested_within_namespace.rs → ...ctations/tests/nested_within_namespace.rs
diff --git a/...indgen/tests/expectations/tests/no-std.rs → tests/expectations/tests/no-std.rs b/...indgen/tests/expectations/tests/no-std.rs → tests/expectations/tests/no-std.rs
diff --git a/...ndgen/tests/expectations/tests/no_copy.rs → tests/expectations/tests/no_copy.rs b/...ndgen/tests/expectations/tests/no_copy.rs → tests/expectations/tests/no_copy.rs
diff --git a/...ts/expectations/tests/nsStyleAutoArray.rs → tests/expectations/tests/nsStyleAutoArray.rs b/...ts/expectations/tests/nsStyleAutoArray.rs → tests/expectations/tests/nsStyleAutoArray.rs
diff --git a/...ests/expectations/tests/only_bitfields.rs → tests/expectations/tests/only_bitfields.rs b/...ests/expectations/tests/only_bitfields.rs → tests/expectations/tests/only_bitfields.rs
diff --git a/...ests/expectations/tests/opaque-tracing.rs → tests/expectations/tests/opaque-tracing.rs b/...ests/expectations/tests/opaque-tracing.rs → tests/expectations/tests/opaque-tracing.rs
diff --git a/...ts/expectations/tests/opaque_in_struct.rs → tests/expectations/tests/opaque_in_struct.rs b/...ts/expectations/tests/opaque_in_struct.rs → tests/expectations/tests/opaque_in_struct.rs
diff --git a/...ests/expectations/tests/opaque_pointer.rs → tests/expectations/tests/opaque_pointer.rs b/...ests/expectations/tests/opaque_pointer.rs → tests/expectations/tests/opaque_pointer.rs
diff --git a/...ests/expectations/tests/opaque_typedef.rs → tests/expectations/tests/opaque_typedef.rs b/...ests/expectations/tests/opaque_typedef.rs → tests/expectations/tests/opaque_typedef.rs
diff --git a/...sts/expectations/tests/overflowed_enum.rs → tests/expectations/tests/overflowed_enum.rs b/...sts/expectations/tests/overflowed_enum.rs → tests/expectations/tests/overflowed_enum.rs
diff --git a/...n/tests/expectations/tests/overloading.rs → tests/expectations/tests/overloading.rs b/...n/tests/expectations/tests/overloading.rs → tests/expectations/tests/overloading.rs
diff --git a/...ndgen/tests/expectations/tests/private.rs → tests/expectations/tests/private.rs b/...ndgen/tests/expectations/tests/private.rs → tests/expectations/tests/private.rs
diff --git a/...n/tests/expectations/tests/public-dtor.rs → tests/expectations/tests/public-dtor.rs b/...n/tests/expectations/tests/public-dtor.rs → tests/expectations/tests/public-dtor.rs
diff --git a/...tests/expectations/tests/redeclaration.rs → tests/expectations/tests/redeclaration.rs b/...tests/expectations/tests/redeclaration.rs → tests/expectations/tests/redeclaration.rs
diff --git a/.../expectations/tests/ref_argument_array.rs → .../expectations/tests/ref_argument_array.rs b/.../expectations/tests/ref_argument_array.rs → .../expectations/tests/ref_argument_array.rs
diff --git a/...ectations/tests/reparented_replacement.rs → ...ectations/tests/reparented_replacement.rs b/...ectations/tests/reparented_replacement.rs → ...ectations/tests/reparented_replacement.rs
diff --git a/...ectations/tests/replace_template_alias.rs → ...ectations/tests/replace_template_alias.rs b/...ectations/tests/replace_template_alias.rs → ...ectations/tests/replace_template_alias.rs
diff --git a/...n/tests/expectations/tests/replace_use.rs → tests/expectations/tests/replace_use.rs b/...n/tests/expectations/tests/replace_use.rs → tests/expectations/tests/replace_use.rs
diff --git a/...sts/expectations/tests/replaces_double.rs → tests/expectations/tests/replaces_double.rs b/...sts/expectations/tests/replaces_double.rs → tests/expectations/tests/replaces_double.rs
diff --git a/...tions/tests/resolved_type_def_function.rs → ...tions/tests/resolved_type_def_function.rs b/...tions/tests/resolved_type_def_function.rs → ...tions/tests/resolved_type_def_function.rs
diff --git a/...me_struct_name_in_different_namespaces.rs → ...me_struct_name_in_different_namespaces.rs b/...me_struct_name_in_different_namespaces.rs → ...me_struct_name_in_different_namespaces.rs
diff --git a/...sts/expectations/tests/size_t_template.rs → tests/expectations/tests/size_t_template.rs b/...sts/expectations/tests/size_t_template.rs → tests/expectations/tests/size_t_template.rs
diff --git a/...uct_containing_forward_declared_struct.rs → ...uct_containing_forward_declared_struct.rs b/...uct_containing_forward_declared_struct.rs → ...uct_containing_forward_declared_struct.rs
diff --git a/...ctations/tests/struct_with_anon_struct.rs → ...ctations/tests/struct_with_anon_struct.rs b/...ctations/tests/struct_with_anon_struct.rs → ...ctations/tests/struct_with_anon_struct.rs
diff --git a/...ns/tests/struct_with_anon_struct_array.rs → ...ns/tests/struct_with_anon_struct_array.rs b/...ns/tests/struct_with_anon_struct_array.rs → ...ns/tests/struct_with_anon_struct_array.rs
diff --git a/.../tests/struct_with_anon_struct_pointer.rs → .../tests/struct_with_anon_struct_pointer.rs b/.../tests/struct_with_anon_struct_pointer.rs → .../tests/struct_with_anon_struct_pointer.rs
diff --git a/...ectations/tests/struct_with_anon_union.rs → ...ectations/tests/struct_with_anon_union.rs b/...ectations/tests/struct_with_anon_union.rs → ...ectations/tests/struct_with_anon_union.rs
diff --git a/.../tests/struct_with_anon_unnamed_struct.rs → .../tests/struct_with_anon_unnamed_struct.rs b/.../tests/struct_with_anon_unnamed_struct.rs → .../tests/struct_with_anon_unnamed_struct.rs
diff --git a/...s/tests/struct_with_anon_unnamed_union.rs → ...s/tests/struct_with_anon_unnamed_union.rs b/...s/tests/struct_with_anon_unnamed_union.rs → ...s/tests/struct_with_anon_unnamed_union.rs
diff --git a/...pectations/tests/struct_with_bitfields.rs → ...pectations/tests/struct_with_bitfields.rs b/...pectations/tests/struct_with_bitfields.rs → ...pectations/tests/struct_with_bitfields.rs
diff --git a/...tations/tests/struct_with_derive_debug.rs → ...tations/tests/struct_with_derive_debug.rs b/...tations/tests/struct_with_derive_debug.rs → ...tations/tests/struct_with_derive_debug.rs
diff --git a/...expectations/tests/struct_with_nesting.rs → ...expectations/tests/struct_with_nesting.rs b/...expectations/tests/struct_with_nesting.rs → ...expectations/tests/struct_with_nesting.rs
diff --git a/...expectations/tests/struct_with_packing.rs → ...expectations/tests/struct_with_packing.rs b/...expectations/tests/struct_with_packing.rs → ...expectations/tests/struct_with_packing.rs
diff --git a/.../expectations/tests/struct_with_struct.rs → .../expectations/tests/struct_with_struct.rs b/.../expectations/tests/struct_with_struct.rs → .../expectations/tests/struct_with_struct.rs
diff --git a/...tests/struct_with_typedef_template_arg.rs → ...tests/struct_with_typedef_template_arg.rs b/...tests/struct_with_typedef_template_arg.rs → ...tests/struct_with_typedef_template_arg.rs
diff --git a/...dgen/tests/expectations/tests/template.rs → tests/expectations/tests/template.rs b/...dgen/tests/expectations/tests/template.rs → tests/expectations/tests/template.rs
diff --git a/...ests/expectations/tests/template_alias.rs → tests/expectations/tests/template_alias.rs b/...ests/expectations/tests/template_alias.rs → tests/expectations/tests/template_alias.rs
diff --git a/...xpectations/tests/template_alias_basic.rs → ...xpectations/tests/template_alias_basic.rs b/...xpectations/tests/template_alias_basic.rs → ...xpectations/tests/template_alias_basic.rs
diff --git a/...tations/tests/template_alias_namespace.rs → ...tations/tests/template_alias_namespace.rs b/...tations/tests/template_alias_namespace.rs → ...tations/tests/template_alias_namespace.rs
diff --git a/...ests/template_typedef_transitive_param.rs → ...ests/template_typedef_transitive_param.rs b/...ests/template_typedef_transitive_param.rs → ...ests/template_typedef_transitive_param.rs
diff --git a/...s/expectations/tests/template_typedefs.rs → ...s/expectations/tests/template_typedefs.rs b/...s/expectations/tests/template_typedefs.rs → ...s/expectations/tests/template_typedefs.rs
diff --git a/.../expectations/tests/templateref_opaque.rs → .../expectations/tests/templateref_opaque.rs b/.../expectations/tests/templateref_opaque.rs → .../expectations/tests/templateref_opaque.rs
diff --git a/...ype-referenced-by-whitelisted-function.rs → ...ype-referenced-by-whitelisted-function.rs b/...ype-referenced-by-whitelisted-function.rs → ...ype-referenced-by-whitelisted-function.rs
diff --git a/...ts/expectations/tests/type_alias_empty.rs → tests/expectations/tests/type_alias_empty.rs b/...ts/expectations/tests/type_alias_empty.rs → tests/expectations/tests/type_alias_empty.rs
diff --git a/...alias_partial_template_especialization.rs → ...alias_partial_template_especialization.rs b/...alias_partial_template_especialization.rs → ...alias_partial_template_especialization.rs
diff --git a/.../tests/type_alias_template_specialized.rs → .../tests/type_alias_template_specialized.rs b/.../tests/type_alias_template_specialized.rs → .../tests/type_alias_template_specialized.rs
diff --git a/...s/tests/typedefd-array-as-function-arg.rs → ...s/tests/typedefd-array-as-function-arg.rs b/...s/tests/typedefd-array-as-function-arg.rs → ...s/tests/typedefd-array-as-function-arg.rs
diff --git a/...ndgen/tests/expectations/tests/typeref.rs → tests/expectations/tests/typeref.rs b/...ndgen/tests/expectations/tests/typeref.rs → tests/expectations/tests/typeref.rs
diff --git a/...n/tests/expectations/tests/union-in-ns.rs → tests/expectations/tests/union-in-ns.rs b/...n/tests/expectations/tests/union-in-ns.rs → tests/expectations/tests/union-in-ns.rs
diff --git a/...en/tests/expectations/tests/union_dtor.rs → tests/expectations/tests/union_dtor.rs b/...en/tests/expectations/tests/union_dtor.rs → tests/expectations/tests/union_dtor.rs
diff --git a/.../tests/expectations/tests/union_fields.rs → tests/expectations/tests/union_fields.rs b/.../tests/expectations/tests/union_fields.rs → tests/expectations/tests/union_fields.rs
diff --git a/...ests/expectations/tests/union_template.rs → tests/expectations/tests/union_template.rs b/...ests/expectations/tests/union_template.rs → tests/expectations/tests/union_template.rs
diff --git a/...ectations/tests/union_with_anon_struct.rs → ...ectations/tests/union_with_anon_struct.rs b/...ectations/tests/union_with_anon_struct.rs → ...ectations/tests/union_with_anon_struct.rs
diff --git a/.../tests/union_with_anon_struct_bitfield.rs → .../tests/union_with_anon_struct_bitfield.rs b/.../tests/union_with_anon_struct_bitfield.rs → .../tests/union_with_anon_struct_bitfield.rs
diff --git a/...pectations/tests/union_with_anon_union.rs → ...pectations/tests/union_with_anon_union.rs b/...pectations/tests/union_with_anon_union.rs → ...pectations/tests/union_with_anon_union.rs
diff --git a/...s/tests/union_with_anon_unnamed_struct.rs → ...s/tests/union_with_anon_unnamed_struct.rs b/...s/tests/union_with_anon_unnamed_struct.rs → ...s/tests/union_with_anon_unnamed_struct.rs
diff --git a/...ns/tests/union_with_anon_unnamed_union.rs → ...ns/tests/union_with_anon_unnamed_union.rs b/...ns/tests/union_with_anon_unnamed_union.rs → ...ns/tests/union_with_anon_unnamed_union.rs
diff --git a/...pectations/tests/union_with_big_member.rs → ...pectations/tests/union_with_big_member.rs b/...pectations/tests/union_with_big_member.rs → ...pectations/tests/union_with_big_member.rs
diff --git a/.../expectations/tests/union_with_nesting.rs → .../expectations/tests/union_with_nesting.rs b/.../expectations/tests/union_with_nesting.rs → .../expectations/tests/union_with_nesting.rs
diff --git a/.../tests/expectations/tests/unknown_attr.rs → tests/expectations/tests/unknown_attr.rs b/.../tests/expectations/tests/unknown_attr.rs → tests/expectations/tests/unknown_attr.rs
diff --git a/...dgen/tests/expectations/tests/use-core.rs → tests/expectations/tests/use-core.rs b/...dgen/tests/expectations/tests/use-core.rs → tests/expectations/tests/use-core.rs
diff --git a/libbindgen/tests/expectations/tests/using.rs → tests/expectations/tests/using.rs b/libbindgen/tests/expectations/tests/using.rs → tests/expectations/tests/using.rs
diff --git a/...n/tests/expectations/tests/var-tracing.rs → tests/expectations/tests/var-tracing.rs b/...n/tests/expectations/tests/var-tracing.rs → tests/expectations/tests/var-tracing.rs
diff --git a/...sts/expectations/tests/variadic-method.rs → tests/expectations/tests/variadic-method.rs b/...sts/expectations/tests/variadic-method.rs → tests/expectations/tests/variadic-method.rs
diff --git a/...tions/tests/variadic_template_function.rs → ...tions/tests/variadic_template_function.rs b/...tions/tests/variadic_template_function.rs → ...tions/tests/variadic_template_function.rs
diff --git a/...indgen/tests/expectations/tests/vector.rs → tests/expectations/tests/vector.rs b/...indgen/tests/expectations/tests/vector.rs → tests/expectations/tests/vector.rs
diff --git a/.../tests/expectations/tests/virtual_dtor.rs → tests/expectations/tests/virtual_dtor.rs b/.../tests/expectations/tests/virtual_dtor.rs → tests/expectations/tests/virtual_dtor.rs
diff --git a/...expectations/tests/virtual_inheritance.rs → ...expectations/tests/virtual_inheritance.rs b/...expectations/tests/virtual_inheritance.rs → ...expectations/tests/virtual_inheritance.rs
diff --git a/.../expectations/tests/virtual_overloaded.rs → .../expectations/tests/virtual_overloaded.rs b/.../expectations/tests/virtual_overloaded.rs → .../expectations/tests/virtual_overloaded.rs
diff --git a/...xpectations/tests/vtable_recursive_sig.rs → ...xpectations/tests/vtable_recursive_sig.rs b/...xpectations/tests/vtable_recursive_sig.rs → ...xpectations/tests/vtable_recursive_sig.rs
diff --git a/...sts/expectations/tests/weird_bitfields.rs → tests/expectations/tests/weird_bitfields.rs b/...sts/expectations/tests/weird_bitfields.rs → tests/expectations/tests/weird_bitfields.rs
diff --git a/...ts/expectations/tests/what_is_going_on.rs → tests/expectations/tests/what_is_going_on.rs b/...ts/expectations/tests/what_is_going_on.rs → tests/expectations/tests/what_is_going_on.rs
diff --git a/...tions/tests/whitelist-namespaces-basic.rs → ...tions/tests/whitelist-namespaces-basic.rs b/...tions/tests/whitelist-namespaces-basic.rs → ...tions/tests/whitelist-namespaces-basic.rs
diff --git a/...xpectations/tests/whitelist-namespaces.rs → ...xpectations/tests/whitelist-namespaces.rs b/...xpectations/tests/whitelist-namespaces.rs → ...xpectations/tests/whitelist-namespaces.rs
diff --git a/...sts/expectations/tests/whitelist_basic.rs → tests/expectations/tests/whitelist_basic.rs b/...sts/expectations/tests/whitelist_basic.rs → tests/expectations/tests/whitelist_basic.rs
diff --git a/...tests/expectations/tests/whitelist_fix.rs → tests/expectations/tests/whitelist_fix.rs b/...tests/expectations/tests/whitelist_fix.rs → tests/expectations/tests/whitelist_fix.rs
diff --git a/...ests/expectations/tests/whitelist_vars.rs → tests/expectations/tests/whitelist_vars.rs b/...ests/expectations/tests/whitelist_vars.rs → tests/expectations/tests/whitelist_vars.rs
diff --git a/libbindgen/tests/headers/accessors.hpp → tests/headers/accessors.hpp b/libbindgen/tests/headers/accessors.hpp → tests/headers/accessors.hpp
diff --git a/libbindgen/tests/headers/annotation_hide.hpp → tests/headers/annotation_hide.hpp b/libbindgen/tests/headers/annotation_hide.hpp → tests/headers/annotation_hide.hpp
diff --git a/libbindgen/tests/headers/anon_enum.hpp → tests/headers/anon_enum.hpp b/libbindgen/tests/headers/anon_enum.hpp → tests/headers/anon_enum.hpp
diff --git a/libbindgen/tests/headers/anon_enum_trait.hpp → tests/headers/anon_enum_trait.hpp b/libbindgen/tests/headers/anon_enum_trait.hpp → tests/headers/anon_enum_trait.hpp
diff --git a/...ndgen/tests/headers/anon_enum_whitelist.h → tests/headers/anon_enum_whitelist.h b/...ndgen/tests/headers/anon_enum_whitelist.h → tests/headers/anon_enum_whitelist.h
diff --git a/libbindgen/tests/headers/anon_union.hpp → tests/headers/anon_union.hpp b/libbindgen/tests/headers/anon_union.hpp → tests/headers/anon_union.hpp
diff --git a/libbindgen/tests/headers/arg_keyword.hpp → tests/headers/arg_keyword.hpp b/libbindgen/tests/headers/arg_keyword.hpp → tests/headers/arg_keyword.hpp
diff --git a/libbindgen/tests/headers/auto.hpp → tests/headers/auto.hpp b/libbindgen/tests/headers/auto.hpp → tests/headers/auto.hpp
diff --git a/.../bad-namespace-parenthood-inheritance.hpp → .../bad-namespace-parenthood-inheritance.hpp b/.../bad-namespace-parenthood-inheritance.hpp → .../bad-namespace-parenthood-inheritance.hpp
diff --git a/libbindgen/tests/headers/base-to-derived.hpp → tests/headers/base-to-derived.hpp b/libbindgen/tests/headers/base-to-derived.hpp → tests/headers/base-to-derived.hpp
diff --git a/...gen/tests/headers/bitfield-enum-basic.hpp → tests/headers/bitfield-enum-basic.hpp b/...gen/tests/headers/bitfield-enum-basic.hpp → tests/headers/bitfield-enum-basic.hpp
diff --git a/.../tests/headers/bitfield_method_mangling.h → tests/headers/bitfield_method_mangling.h b/.../tests/headers/bitfield_method_mangling.h → tests/headers/bitfield_method_mangling.h
diff --git a/libbindgen/tests/headers/blocks.h → tests/headers/blocks.h b/libbindgen/tests/headers/blocks.h → tests/headers/blocks.h
diff --git a/...rs/canonical_path_without_namespacing.hpp → ...rs/canonical_path_without_namespacing.hpp b/...rs/canonical_path_without_namespacing.hpp → ...rs/canonical_path_without_namespacing.hpp
diff --git a/libbindgen/tests/headers/class.hpp → tests/headers/class.hpp b/libbindgen/tests/headers/class.hpp → tests/headers/class.hpp
diff --git a/libbindgen/tests/headers/class_nested.hpp → tests/headers/class_nested.hpp b/libbindgen/tests/headers/class_nested.hpp → tests/headers/class_nested.hpp
diff --git a/...indgen/tests/headers/class_no_members.hpp → tests/headers/class_no_members.hpp b/...indgen/tests/headers/class_no_members.hpp → tests/headers/class_no_members.hpp
diff --git a/libbindgen/tests/headers/class_static.hpp → tests/headers/class_static.hpp b/libbindgen/tests/headers/class_static.hpp → tests/headers/class_static.hpp
diff --git a/...dgen/tests/headers/class_static_const.hpp → tests/headers/class_static_const.hpp b/...dgen/tests/headers/class_static_const.hpp → tests/headers/class_static_const.hpp
diff --git a/libbindgen/tests/headers/class_use_as.hpp → tests/headers/class_use_as.hpp b/libbindgen/tests/headers/class_use_as.hpp → tests/headers/class_use_as.hpp
diff --git a/libbindgen/tests/headers/class_with_dtor.hpp → tests/headers/class_with_dtor.hpp b/libbindgen/tests/headers/class_with_dtor.hpp → tests/headers/class_with_dtor.hpp
diff --git a/...tests/headers/class_with_inner_struct.hpp → tests/headers/class_with_inner_struct.hpp b/...tests/headers/class_with_inner_struct.hpp → tests/headers/class_with_inner_struct.hpp
diff --git a/...dgen/tests/headers/class_with_typedef.hpp → tests/headers/class_with_typedef.hpp b/...dgen/tests/headers/class_with_typedef.hpp → tests/headers/class_with_typedef.hpp
diff --git a/libbindgen/tests/headers/complex.h → tests/headers/complex.h b/libbindgen/tests/headers/complex.h → tests/headers/complex.h
diff --git a/libbindgen/tests/headers/complex_global.h → tests/headers/complex_global.h b/libbindgen/tests/headers/complex_global.h → tests/headers/complex_global.h
diff --git a/libbindgen/tests/headers/const_bool.hpp → tests/headers/const_bool.hpp b/libbindgen/tests/headers/const_bool.hpp → tests/headers/const_bool.hpp
diff --git a/...dgen/tests/headers/const_enum_unnamed.hpp → tests/headers/const_enum_unnamed.hpp b/...dgen/tests/headers/const_enum_unnamed.hpp → tests/headers/const_enum_unnamed.hpp
diff --git a/libbindgen/tests/headers/const_ptr.hpp → tests/headers/const_ptr.hpp b/libbindgen/tests/headers/const_ptr.hpp → tests/headers/const_ptr.hpp
diff --git a/libbindgen/tests/headers/const_resolved_ty.h → tests/headers/const_resolved_ty.h b/libbindgen/tests/headers/const_resolved_ty.h → tests/headers/const_resolved_ty.h
diff --git a/libbindgen/tests/headers/const_tparam.hpp → tests/headers/const_tparam.hpp b/libbindgen/tests/headers/const_tparam.hpp → tests/headers/const_tparam.hpp
diff --git a/libbindgen/tests/headers/constant-evaluate.h → tests/headers/constant-evaluate.h b/libbindgen/tests/headers/constant-evaluate.h → tests/headers/constant-evaluate.h
diff --git a/libbindgen/tests/headers/constify-enum.h → tests/headers/constify-enum.h b/libbindgen/tests/headers/constify-enum.h → tests/headers/constify-enum.h
diff --git a/libbindgen/tests/headers/constructor-tp.hpp → tests/headers/constructor-tp.hpp b/libbindgen/tests/headers/constructor-tp.hpp → tests/headers/constructor-tp.hpp
diff --git a/libbindgen/tests/headers/constructors.hpp → tests/headers/constructors.hpp b/libbindgen/tests/headers/constructors.hpp → tests/headers/constructors.hpp
diff --git a/libbindgen/tests/headers/convert-floats.h → tests/headers/convert-floats.h b/libbindgen/tests/headers/convert-floats.h → tests/headers/convert-floats.h
diff --git a/libbindgen/tests/headers/crtp.hpp → tests/headers/crtp.hpp b/libbindgen/tests/headers/crtp.hpp → tests/headers/crtp.hpp
diff --git a/libbindgen/tests/headers/dash_language.h → tests/headers/dash_language.h b/libbindgen/tests/headers/dash_language.h → tests/headers/dash_language.h
diff --git a/...gen/tests/headers/decl_extern_int_twice.h → tests/headers/decl_extern_int_twice.h b/...gen/tests/headers/decl_extern_int_twice.h → tests/headers/decl_extern_int_twice.h
diff --git a/libbindgen/tests/headers/decl_ptr_to_array.h → tests/headers/decl_ptr_to_array.h b/libbindgen/tests/headers/decl_ptr_to_array.h → tests/headers/decl_ptr_to_array.h
diff --git a/...gen/tests/headers/disable-namespacing.hpp → tests/headers/disable-namespacing.hpp b/...gen/tests/headers/disable-namespacing.hpp → tests/headers/disable-namespacing.hpp
diff --git a/...ers/duplicated-namespaces-definitions.hpp → ...ers/duplicated-namespaces-definitions.hpp b/...ers/duplicated-namespaces-definitions.hpp → ...ers/duplicated-namespaces-definitions.hpp
diff --git a/...n/tests/headers/duplicated-namespaces.hpp → tests/headers/duplicated-namespaces.hpp b/...n/tests/headers/duplicated-namespaces.hpp → tests/headers/duplicated-namespaces.hpp
diff --git a/...ts/headers/duplicated_constants_in_ns.hpp → tests/headers/duplicated_constants_in_ns.hpp b/...ts/headers/duplicated_constants_in_ns.hpp → tests/headers/duplicated_constants_in_ns.hpp
diff --git a/libbindgen/tests/headers/elaborated.hpp → tests/headers/elaborated.hpp b/libbindgen/tests/headers/elaborated.hpp → tests/headers/elaborated.hpp
diff --git a/...sts/headers/empty_template_param_name.hpp → tests/headers/empty_template_param_name.hpp b/...sts/headers/empty_template_param_name.hpp → tests/headers/empty_template_param_name.hpp
diff --git a/libbindgen/tests/headers/enum.h → tests/headers/enum.h b/libbindgen/tests/headers/enum.h → tests/headers/enum.h
diff --git a/libbindgen/tests/headers/enum_alias.hpp → tests/headers/enum_alias.hpp b/libbindgen/tests/headers/enum_alias.hpp → tests/headers/enum_alias.hpp
diff --git a/...ests/headers/enum_and_vtable_mangling.hpp → tests/headers/enum_and_vtable_mangling.hpp b/...ests/headers/enum_and_vtable_mangling.hpp → tests/headers/enum_and_vtable_mangling.hpp
diff --git a/libbindgen/tests/headers/enum_dupe.h → tests/headers/enum_dupe.h b/libbindgen/tests/headers/enum_dupe.h → tests/headers/enum_dupe.h
diff --git a/...dgen/tests/headers/enum_explicit_type.hpp → tests/headers/enum_explicit_type.hpp b/...dgen/tests/headers/enum_explicit_type.hpp → tests/headers/enum_explicit_type.hpp
diff --git a/...headers/enum_in_template_with_typedef.hpp → ...headers/enum_in_template_with_typedef.hpp b/...headers/enum_in_template_with_typedef.hpp → ...headers/enum_in_template_with_typedef.hpp
diff --git a/libbindgen/tests/headers/enum_negative.h → tests/headers/enum_negative.h b/libbindgen/tests/headers/enum_negative.h → tests/headers/enum_negative.h
diff --git a/libbindgen/tests/headers/enum_packed.h → tests/headers/enum_packed.h b/libbindgen/tests/headers/enum_packed.h → tests/headers/enum_packed.h
diff --git a/...ders/eval-variadic-template-parameter.hpp → ...ders/eval-variadic-template-parameter.hpp b/...ders/eval-variadic-template-parameter.hpp → ...ders/eval-variadic-template-parameter.hpp
diff --git a/libbindgen/tests/headers/extern.hpp → tests/headers/extern.hpp b/libbindgen/tests/headers/extern.hpp → tests/headers/extern.hpp
diff --git a/libbindgen/tests/headers/float128.hpp → tests/headers/float128.hpp b/libbindgen/tests/headers/float128.hpp → tests/headers/float128.hpp
diff --git a/...rs/forward-inherit-struct-with-fields.hpp → ...rs/forward-inherit-struct-with-fields.hpp b/...rs/forward-inherit-struct-with-fields.hpp → ...rs/forward-inherit-struct-with-fields.hpp
diff --git a/.../tests/headers/forward-inherit-struct.hpp → tests/headers/forward-inherit-struct.hpp b/.../tests/headers/forward-inherit-struct.hpp → tests/headers/forward-inherit-struct.hpp
diff --git a/...n/tests/headers/forward_declared_struct.h → tests/headers/forward_declared_struct.h b/...n/tests/headers/forward_declared_struct.h → tests/headers/forward_declared_struct.h
diff --git a/libbindgen/tests/headers/func_proto.h → tests/headers/func_proto.h b/libbindgen/tests/headers/func_proto.h → tests/headers/func_proto.h
diff --git a/libbindgen/tests/headers/func_ptr.h → tests/headers/func_ptr.h b/libbindgen/tests/headers/func_ptr.h → tests/headers/func_ptr.h
diff --git a/...indgen/tests/headers/func_ptr_in_struct.h → tests/headers/func_ptr_in_struct.h b/...indgen/tests/headers/func_ptr_in_struct.h → tests/headers/func_ptr_in_struct.h
diff --git a/...ndgen/tests/headers/func_with_array_arg.h → tests/headers/func_with_array_arg.h b/...ndgen/tests/headers/func_with_array_arg.h → tests/headers/func_with_array_arg.h
diff --git a/...en/tests/headers/func_with_func_ptr_arg.h → tests/headers/func_with_func_ptr_arg.h b/...en/tests/headers/func_with_func_ptr_arg.h → tests/headers/func_with_func_ptr_arg.h
diff --git a/...indgen/tests/headers/in_class_typedef.hpp → tests/headers/in_class_typedef.hpp b/...indgen/tests/headers/in_class_typedef.hpp → tests/headers/in_class_typedef.hpp
diff --git a/...dgen/tests/headers/inherit-namespaced.hpp → tests/headers/inherit-namespaced.hpp b/...dgen/tests/headers/inherit-namespaced.hpp → tests/headers/inherit-namespaced.hpp
diff --git a/libbindgen/tests/headers/inherit_named.hpp → tests/headers/inherit_named.hpp b/libbindgen/tests/headers/inherit_named.hpp → tests/headers/inherit_named.hpp
diff --git a/libbindgen/tests/headers/inherit_typedef.hpp → tests/headers/inherit_typedef.hpp b/libbindgen/tests/headers/inherit_typedef.hpp → tests/headers/inherit_typedef.hpp
diff --git a/libbindgen/tests/headers/inline-function.h → tests/headers/inline-function.h b/libbindgen/tests/headers/inline-function.h → tests/headers/inline-function.h
diff --git a/...indgen/tests/headers/inline_namespace.hpp → tests/headers/inline_namespace.hpp b/...indgen/tests/headers/inline_namespace.hpp → tests/headers/inline_namespace.hpp
diff --git a/...headers/inline_namespace_conservative.hpp → ...headers/inline_namespace_conservative.hpp b/...headers/inline_namespace_conservative.hpp → ...headers/inline_namespace_conservative.hpp
diff --git a/...ts/headers/inline_namespace_whitelist.hpp → tests/headers/inline_namespace_whitelist.hpp b/...ts/headers/inline_namespace_whitelist.hpp → tests/headers/inline_namespace_whitelist.hpp
diff --git a/libbindgen/tests/headers/inner_const.hpp → tests/headers/inner_const.hpp b/libbindgen/tests/headers/inner_const.hpp → tests/headers/inner_const.hpp
diff --git a/...gen/tests/headers/inner_template_self.hpp → tests/headers/inner_template_self.hpp b/...gen/tests/headers/inner_template_self.hpp → tests/headers/inner_template_self.hpp
diff --git a/libbindgen/tests/headers/int128_t.h → tests/headers/int128_t.h b/libbindgen/tests/headers/int128_t.h → tests/headers/int128_t.h
diff --git a/libbindgen/tests/headers/issue-358.hpp → tests/headers/issue-358.hpp b/libbindgen/tests/headers/issue-358.hpp → tests/headers/issue-358.hpp
diff --git a/libbindgen/tests/headers/issue-372.hpp → tests/headers/issue-372.hpp b/libbindgen/tests/headers/issue-372.hpp → tests/headers/issue-372.hpp
diff --git a/libbindgen/tests/headers/issue_311.hpp → tests/headers/issue_311.hpp b/libbindgen/tests/headers/issue_311.hpp → tests/headers/issue_311.hpp
diff --git a/libbindgen/tests/headers/issue_315.hpp → tests/headers/issue_315.hpp b/libbindgen/tests/headers/issue_315.hpp → tests/headers/issue_315.hpp
diff --git a/...gen/tests/headers/jsval_layout_opaque.hpp → tests/headers/jsval_layout_opaque.hpp b/...gen/tests/headers/jsval_layout_opaque.hpp → tests/headers/jsval_layout_opaque.hpp
diff --git a/libbindgen/tests/headers/keywords.h → tests/headers/keywords.h b/libbindgen/tests/headers/keywords.h → tests/headers/keywords.h
diff --git a/libbindgen/tests/headers/macro-expr-basic.h → tests/headers/macro-expr-basic.h b/libbindgen/tests/headers/macro-expr-basic.h → tests/headers/macro-expr-basic.h
diff --git a/libbindgen/tests/headers/macro-redef.h → tests/headers/macro-redef.h b/libbindgen/tests/headers/macro-redef.h → tests/headers/macro-redef.h
diff --git a/libbindgen/tests/headers/macro_const.h → tests/headers/macro_const.h b/libbindgen/tests/headers/macro_const.h → tests/headers/macro_const.h
diff --git a/...n/tests/headers/maddness-is-avoidable.hpp → tests/headers/maddness-is-avoidable.hpp b/...n/tests/headers/maddness-is-avoidable.hpp → tests/headers/maddness-is-avoidable.hpp
diff --git a/libbindgen/tests/headers/method-mangling.hpp → tests/headers/method-mangling.hpp b/libbindgen/tests/headers/method-mangling.hpp → tests/headers/method-mangling.hpp
diff --git a/...dgen/tests/headers/module-whitelisted.hpp → tests/headers/module-whitelisted.hpp b/...dgen/tests/headers/module-whitelisted.hpp → tests/headers/module-whitelisted.hpp
diff --git a/libbindgen/tests/headers/msvc-no-usr.hpp → tests/headers/msvc-no-usr.hpp b/libbindgen/tests/headers/msvc-no-usr.hpp → tests/headers/msvc-no-usr.hpp
diff --git a/...multiple-inherit-empty-correct-layout.hpp → ...multiple-inherit-empty-correct-layout.hpp b/...multiple-inherit-empty-correct-layout.hpp → ...multiple-inherit-empty-correct-layout.hpp
diff --git a/libbindgen/tests/headers/mutable.hpp → tests/headers/mutable.hpp b/libbindgen/tests/headers/mutable.hpp → tests/headers/mutable.hpp
diff --git a/libbindgen/tests/headers/namespace.hpp → tests/headers/namespace.hpp b/libbindgen/tests/headers/namespace.hpp → tests/headers/namespace.hpp