diff --git a/.travis.yml b/.travis.yml index d5fb44555f..dd271f22e5 100644 --- 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 index c1ec96d1a1..d30df68dbe 100644 --- 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 index 106e652be5..2187a1964a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,66 @@ -[workspace] -members = [ - "bindgen", - "bindgen-integration", - "libbindgen", - "libbindgen/tests/expectations", +[package] +authors = [ + "Jyun-Yan You ", + "Emilio Cobos Álvarez ", + "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 index 15ef6db231..2f36d11583 100644 --- 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 index e0687f9959..9b8e341d7b 100644 --- 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 "] -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 index ff8ba172f6..2c18c94a44 100644 --- 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 deleted file mode 100644 index a445df6940..0000000000 --- a/bindgen/Cargo.toml +++ /dev/null @@ -1,26 +0,0 @@ -[package] -authors = [ - "Jyun-Yan You ", - "Emilio Cobos Álvarez ", - "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.17.1" -workspace = ".." - -[dependencies] -clang-sys = "0.12" -clap = "2" -libbindgen = { path = "../libbindgen" } -log = "0.3" -env_logger = "0.4" -rustc-serialize = "0.3.19" - -[features] -llvm_stable = ["libbindgen/llvm_stable"] diff --git a/libbindgen/build.rs b/build.rs similarity index 100% rename from libbindgen/build.rs rename to build.rs diff --git a/libbindgen/Cargo.toml b/libbindgen/Cargo.toml deleted file mode 100644 index 2615b822f1..0000000000 --- a/libbindgen/Cargo.toml +++ /dev/null @@ -1,58 +0,0 @@ -[package] -authors = [ - "Jyun-Yan You ", - "Emilio Cobos Álvarez ", - "The Servo project developers", -] -build = "build.rs" -description = "A binding generator for Rust" -homepage = "https://github.com/servo/rust-bindgen" -keywords = ["bindings", "ffi", "code-generation"] -license = "BSD-3-Clause" -name = "libbindgen" -readme = "README.md" -repository = "https://github.com/servo/rust-bindgen" -version = "0.1.7" -workspace = ".." - -[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" - -[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/libbindgen/README.md b/libbindgen/README.md deleted file mode 100644 index e0bbddf50b..0000000000 --- a/libbindgen/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# `libbindgen` - -Generate Rust FFI bindings from C/C++ header files. diff --git a/libbindgen/src/chooser.rs b/src/chooser.rs similarity index 100% rename from libbindgen/src/chooser.rs rename to src/chooser.rs diff --git a/libbindgen/src/clang.rs b/src/clang.rs similarity index 100% rename from libbindgen/src/clang.rs rename to src/clang.rs diff --git a/libbindgen/src/codegen/helpers.rs b/src/codegen/helpers.rs similarity index 100% rename from libbindgen/src/codegen/helpers.rs rename to src/codegen/helpers.rs diff --git a/libbindgen/src/codegen/mod.rs b/src/codegen/mod.rs similarity index 100% rename from libbindgen/src/codegen/mod.rs rename to src/codegen/mod.rs diff --git a/libbindgen/src/ir/annotations.rs b/src/ir/annotations.rs similarity index 100% rename from libbindgen/src/ir/annotations.rs rename to src/ir/annotations.rs diff --git a/libbindgen/src/ir/comp.rs b/src/ir/comp.rs similarity index 100% rename from libbindgen/src/ir/comp.rs rename to src/ir/comp.rs diff --git a/libbindgen/src/ir/context.rs b/src/ir/context.rs similarity index 100% rename from libbindgen/src/ir/context.rs rename to src/ir/context.rs diff --git a/libbindgen/src/ir/derive.rs b/src/ir/derive.rs similarity index 100% rename from libbindgen/src/ir/derive.rs rename to src/ir/derive.rs diff --git a/libbindgen/src/ir/enum_ty.rs b/src/ir/enum_ty.rs similarity index 100% rename from libbindgen/src/ir/enum_ty.rs rename to src/ir/enum_ty.rs diff --git a/libbindgen/src/ir/function.rs b/src/ir/function.rs similarity index 100% rename from libbindgen/src/ir/function.rs rename to src/ir/function.rs diff --git a/libbindgen/src/ir/int.rs b/src/ir/int.rs similarity index 100% rename from libbindgen/src/ir/int.rs rename to src/ir/int.rs diff --git a/libbindgen/src/ir/item.rs b/src/ir/item.rs similarity index 100% rename from libbindgen/src/ir/item.rs rename to src/ir/item.rs diff --git a/libbindgen/src/ir/item_kind.rs b/src/ir/item_kind.rs similarity index 100% rename from libbindgen/src/ir/item_kind.rs rename to src/ir/item_kind.rs diff --git a/libbindgen/src/ir/layout.rs b/src/ir/layout.rs similarity index 100% rename from libbindgen/src/ir/layout.rs rename to src/ir/layout.rs diff --git a/libbindgen/src/ir/mod.rs b/src/ir/mod.rs similarity index 100% rename from libbindgen/src/ir/mod.rs rename to src/ir/mod.rs diff --git a/libbindgen/src/ir/module.rs b/src/ir/module.rs similarity index 100% rename from libbindgen/src/ir/module.rs rename to src/ir/module.rs diff --git a/libbindgen/src/ir/ty.rs b/src/ir/ty.rs similarity index 100% rename from libbindgen/src/ir/ty.rs rename to src/ir/ty.rs diff --git a/libbindgen/src/ir/type_collector.rs b/src/ir/type_collector.rs similarity index 100% rename from libbindgen/src/ir/type_collector.rs rename to src/ir/type_collector.rs diff --git a/libbindgen/src/ir/var.rs b/src/ir/var.rs similarity index 100% rename from libbindgen/src/ir/var.rs rename to src/ir/var.rs diff --git a/libbindgen/src/lib.rs b/src/lib.rs similarity index 100% rename from libbindgen/src/lib.rs rename to src/lib.rs diff --git a/libbindgen/src/log_stubs.rs b/src/log_stubs.rs similarity index 100% rename from libbindgen/src/log_stubs.rs rename to src/log_stubs.rs diff --git a/bindgen/src/main.rs b/src/main.rs similarity index 96% rename from bindgen/src/main.rs rename to src/main.rs index 515d1d1a29..a7bd961890 100644 --- a/bindgen/src/main.rs +++ b/src/main.rs @@ -1,4 +1,4 @@ -extern crate libbindgen; +extern crate bindgen; extern crate env_logger; #[macro_use] extern crate log; @@ -6,7 +6,7 @@ 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 b/src/options.rs similarity index 99% rename from bindgen/src/options.rs rename to src/options.rs index e6226350c7..3456bfea9b 100644 --- a/bindgen/src/options.rs +++ b/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 b/src/parse.rs similarity index 100% rename from libbindgen/src/parse.rs rename to src/parse.rs diff --git a/libbindgen/src/regex_set.rs b/src/regex_set.rs similarity index 100% rename from libbindgen/src/regex_set.rs rename to src/regex_set.rs diff --git a/libbindgen/src/uses.rs b/src/uses.rs similarity index 100% rename from libbindgen/src/uses.rs rename to src/uses.rs diff --git a/libbindgen/tests/expectations/Cargo.toml b/tests/expectations/Cargo.toml similarity index 75% rename from libbindgen/tests/expectations/Cargo.toml rename to tests/expectations/Cargo.toml index 0980c56432..034aa14151 100644 --- a/libbindgen/tests/expectations/Cargo.toml +++ b/tests/expectations/Cargo.toml @@ -4,9 +4,8 @@ description = "bindgen results when ran on ../headers/*" version = "0.1.0" authors = [ "Jyun-Yan You ", - "Emilio Cobos Álvarez ", + "Emilio Cobos Álvarez ", "The Servo project developers", ] -workspace = "../../.." [dependencies] diff --git a/libbindgen/tests/expectations/src/lib.rs b/tests/expectations/lib.rs similarity index 100% rename from libbindgen/tests/expectations/src/lib.rs rename to tests/expectations/lib.rs diff --git a/tests/expectations/src/lib.rs b/tests/expectations/src/lib.rs new file mode 100644 index 0000000000..e69de29bb2 diff --git a/libbindgen/tests/expectations/tests/accessors.rs b/tests/expectations/tests/accessors.rs similarity index 100% rename from libbindgen/tests/expectations/tests/accessors.rs rename to tests/expectations/tests/accessors.rs diff --git a/libbindgen/tests/expectations/tests/annotation_hide.rs b/tests/expectations/tests/annotation_hide.rs similarity index 100% rename from libbindgen/tests/expectations/tests/annotation_hide.rs rename to tests/expectations/tests/annotation_hide.rs diff --git a/libbindgen/tests/expectations/tests/anon_enum.rs b/tests/expectations/tests/anon_enum.rs similarity index 100% rename from libbindgen/tests/expectations/tests/anon_enum.rs rename to tests/expectations/tests/anon_enum.rs diff --git a/libbindgen/tests/expectations/tests/anon_enum_trait.rs b/tests/expectations/tests/anon_enum_trait.rs similarity index 100% rename from libbindgen/tests/expectations/tests/anon_enum_trait.rs rename to tests/expectations/tests/anon_enum_trait.rs diff --git a/libbindgen/tests/expectations/tests/anon_enum_whitelist.rs b/tests/expectations/tests/anon_enum_whitelist.rs similarity index 100% rename from libbindgen/tests/expectations/tests/anon_enum_whitelist.rs rename to tests/expectations/tests/anon_enum_whitelist.rs diff --git a/libbindgen/tests/expectations/tests/anon_union.rs b/tests/expectations/tests/anon_union.rs similarity index 100% rename from libbindgen/tests/expectations/tests/anon_union.rs rename to tests/expectations/tests/anon_union.rs diff --git a/libbindgen/tests/expectations/tests/arg_keyword.rs b/tests/expectations/tests/arg_keyword.rs similarity index 100% rename from libbindgen/tests/expectations/tests/arg_keyword.rs rename to tests/expectations/tests/arg_keyword.rs diff --git a/libbindgen/tests/expectations/tests/auto.rs b/tests/expectations/tests/auto.rs similarity index 100% rename from libbindgen/tests/expectations/tests/auto.rs rename to tests/expectations/tests/auto.rs diff --git a/libbindgen/tests/expectations/tests/bad-namespace-parenthood-inheritance.rs b/tests/expectations/tests/bad-namespace-parenthood-inheritance.rs similarity index 100% rename from libbindgen/tests/expectations/tests/bad-namespace-parenthood-inheritance.rs rename to tests/expectations/tests/bad-namespace-parenthood-inheritance.rs diff --git a/libbindgen/tests/expectations/tests/base-to-derived.rs b/tests/expectations/tests/base-to-derived.rs similarity index 100% rename from libbindgen/tests/expectations/tests/base-to-derived.rs rename to tests/expectations/tests/base-to-derived.rs diff --git a/libbindgen/tests/expectations/tests/bitfield-enum-basic.rs b/tests/expectations/tests/bitfield-enum-basic.rs similarity index 100% rename from libbindgen/tests/expectations/tests/bitfield-enum-basic.rs rename to tests/expectations/tests/bitfield-enum-basic.rs diff --git a/libbindgen/tests/expectations/tests/bitfield_method_mangling.rs b/tests/expectations/tests/bitfield_method_mangling.rs similarity index 100% rename from libbindgen/tests/expectations/tests/bitfield_method_mangling.rs rename to tests/expectations/tests/bitfield_method_mangling.rs diff --git a/libbindgen/tests/expectations/tests/blocks.rs b/tests/expectations/tests/blocks.rs similarity index 100% rename from libbindgen/tests/expectations/tests/blocks.rs rename to tests/expectations/tests/blocks.rs diff --git a/libbindgen/tests/expectations/tests/canonical_path_without_namespacing.rs b/tests/expectations/tests/canonical_path_without_namespacing.rs similarity index 100% rename from libbindgen/tests/expectations/tests/canonical_path_without_namespacing.rs rename to tests/expectations/tests/canonical_path_without_namespacing.rs diff --git a/libbindgen/tests/expectations/tests/class.rs b/tests/expectations/tests/class.rs similarity index 100% rename from libbindgen/tests/expectations/tests/class.rs rename to tests/expectations/tests/class.rs diff --git a/libbindgen/tests/expectations/tests/class_nested.rs b/tests/expectations/tests/class_nested.rs similarity index 100% rename from libbindgen/tests/expectations/tests/class_nested.rs rename to tests/expectations/tests/class_nested.rs diff --git a/libbindgen/tests/expectations/tests/class_no_members.rs b/tests/expectations/tests/class_no_members.rs similarity index 100% rename from libbindgen/tests/expectations/tests/class_no_members.rs rename to tests/expectations/tests/class_no_members.rs diff --git a/libbindgen/tests/expectations/tests/class_static.rs b/tests/expectations/tests/class_static.rs similarity index 100% rename from libbindgen/tests/expectations/tests/class_static.rs rename to tests/expectations/tests/class_static.rs diff --git a/libbindgen/tests/expectations/tests/class_static_const.rs b/tests/expectations/tests/class_static_const.rs similarity index 100% rename from libbindgen/tests/expectations/tests/class_static_const.rs rename to tests/expectations/tests/class_static_const.rs diff --git a/libbindgen/tests/expectations/tests/class_use_as.rs b/tests/expectations/tests/class_use_as.rs similarity index 100% rename from libbindgen/tests/expectations/tests/class_use_as.rs rename to tests/expectations/tests/class_use_as.rs diff --git a/libbindgen/tests/expectations/tests/class_with_dtor.rs b/tests/expectations/tests/class_with_dtor.rs similarity index 100% rename from libbindgen/tests/expectations/tests/class_with_dtor.rs rename to tests/expectations/tests/class_with_dtor.rs diff --git a/libbindgen/tests/expectations/tests/class_with_inner_struct.rs b/tests/expectations/tests/class_with_inner_struct.rs similarity index 100% rename from libbindgen/tests/expectations/tests/class_with_inner_struct.rs rename to tests/expectations/tests/class_with_inner_struct.rs diff --git a/libbindgen/tests/expectations/tests/class_with_typedef.rs b/tests/expectations/tests/class_with_typedef.rs similarity index 100% rename from libbindgen/tests/expectations/tests/class_with_typedef.rs rename to tests/expectations/tests/class_with_typedef.rs diff --git a/libbindgen/tests/expectations/tests/complex.rs b/tests/expectations/tests/complex.rs similarity index 100% rename from libbindgen/tests/expectations/tests/complex.rs rename to tests/expectations/tests/complex.rs diff --git a/libbindgen/tests/expectations/tests/complex_global.rs b/tests/expectations/tests/complex_global.rs similarity index 100% rename from libbindgen/tests/expectations/tests/complex_global.rs rename to tests/expectations/tests/complex_global.rs diff --git a/libbindgen/tests/expectations/tests/const_bool.rs b/tests/expectations/tests/const_bool.rs similarity index 100% rename from libbindgen/tests/expectations/tests/const_bool.rs rename to tests/expectations/tests/const_bool.rs diff --git a/libbindgen/tests/expectations/tests/const_enum_unnamed.rs b/tests/expectations/tests/const_enum_unnamed.rs similarity index 100% rename from libbindgen/tests/expectations/tests/const_enum_unnamed.rs rename to tests/expectations/tests/const_enum_unnamed.rs diff --git a/libbindgen/tests/expectations/tests/const_ptr.rs b/tests/expectations/tests/const_ptr.rs similarity index 100% rename from libbindgen/tests/expectations/tests/const_ptr.rs rename to tests/expectations/tests/const_ptr.rs diff --git a/libbindgen/tests/expectations/tests/const_resolved_ty.rs b/tests/expectations/tests/const_resolved_ty.rs similarity index 100% rename from libbindgen/tests/expectations/tests/const_resolved_ty.rs rename to tests/expectations/tests/const_resolved_ty.rs diff --git a/libbindgen/tests/expectations/tests/const_tparam.rs b/tests/expectations/tests/const_tparam.rs similarity index 100% rename from libbindgen/tests/expectations/tests/const_tparam.rs rename to tests/expectations/tests/const_tparam.rs diff --git a/libbindgen/tests/expectations/tests/constant-evaluate.rs b/tests/expectations/tests/constant-evaluate.rs similarity index 100% rename from libbindgen/tests/expectations/tests/constant-evaluate.rs rename to tests/expectations/tests/constant-evaluate.rs diff --git a/libbindgen/tests/expectations/tests/constify-enum.rs b/tests/expectations/tests/constify-enum.rs similarity index 100% rename from libbindgen/tests/expectations/tests/constify-enum.rs rename to tests/expectations/tests/constify-enum.rs diff --git a/libbindgen/tests/expectations/tests/constructor-tp.rs b/tests/expectations/tests/constructor-tp.rs similarity index 100% rename from libbindgen/tests/expectations/tests/constructor-tp.rs rename to tests/expectations/tests/constructor-tp.rs diff --git a/libbindgen/tests/expectations/tests/constructors.rs b/tests/expectations/tests/constructors.rs similarity index 100% rename from libbindgen/tests/expectations/tests/constructors.rs rename to tests/expectations/tests/constructors.rs diff --git a/libbindgen/tests/expectations/tests/convert-floats.rs b/tests/expectations/tests/convert-floats.rs similarity index 100% rename from libbindgen/tests/expectations/tests/convert-floats.rs rename to tests/expectations/tests/convert-floats.rs diff --git a/libbindgen/tests/expectations/tests/crtp.rs b/tests/expectations/tests/crtp.rs similarity index 100% rename from libbindgen/tests/expectations/tests/crtp.rs rename to tests/expectations/tests/crtp.rs diff --git a/libbindgen/tests/expectations/tests/dash_language.rs b/tests/expectations/tests/dash_language.rs similarity index 100% rename from libbindgen/tests/expectations/tests/dash_language.rs rename to tests/expectations/tests/dash_language.rs diff --git a/libbindgen/tests/expectations/tests/decl_extern_int_twice.rs b/tests/expectations/tests/decl_extern_int_twice.rs similarity index 100% rename from libbindgen/tests/expectations/tests/decl_extern_int_twice.rs rename to tests/expectations/tests/decl_extern_int_twice.rs diff --git a/libbindgen/tests/expectations/tests/decl_ptr_to_array.rs b/tests/expectations/tests/decl_ptr_to_array.rs similarity index 100% rename from libbindgen/tests/expectations/tests/decl_ptr_to_array.rs rename to tests/expectations/tests/decl_ptr_to_array.rs diff --git a/libbindgen/tests/expectations/tests/disable-namespacing.rs b/tests/expectations/tests/disable-namespacing.rs similarity index 100% rename from libbindgen/tests/expectations/tests/disable-namespacing.rs rename to tests/expectations/tests/disable-namespacing.rs diff --git a/libbindgen/tests/expectations/tests/duplicated-namespaces-definitions.rs b/tests/expectations/tests/duplicated-namespaces-definitions.rs similarity index 100% rename from libbindgen/tests/expectations/tests/duplicated-namespaces-definitions.rs rename to tests/expectations/tests/duplicated-namespaces-definitions.rs diff --git a/libbindgen/tests/expectations/tests/duplicated-namespaces.rs b/tests/expectations/tests/duplicated-namespaces.rs similarity index 100% rename from libbindgen/tests/expectations/tests/duplicated-namespaces.rs rename to tests/expectations/tests/duplicated-namespaces.rs diff --git a/libbindgen/tests/expectations/tests/duplicated_constants_in_ns.rs b/tests/expectations/tests/duplicated_constants_in_ns.rs similarity index 100% rename from libbindgen/tests/expectations/tests/duplicated_constants_in_ns.rs rename to tests/expectations/tests/duplicated_constants_in_ns.rs diff --git a/libbindgen/tests/expectations/tests/elaborated.rs b/tests/expectations/tests/elaborated.rs similarity index 100% rename from libbindgen/tests/expectations/tests/elaborated.rs rename to tests/expectations/tests/elaborated.rs diff --git a/libbindgen/tests/expectations/tests/empty_template_param_name.rs b/tests/expectations/tests/empty_template_param_name.rs similarity index 100% rename from libbindgen/tests/expectations/tests/empty_template_param_name.rs rename to tests/expectations/tests/empty_template_param_name.rs diff --git a/libbindgen/tests/expectations/tests/enum.rs b/tests/expectations/tests/enum.rs similarity index 100% rename from libbindgen/tests/expectations/tests/enum.rs rename to tests/expectations/tests/enum.rs diff --git a/libbindgen/tests/expectations/tests/enum_alias.rs b/tests/expectations/tests/enum_alias.rs similarity index 100% rename from libbindgen/tests/expectations/tests/enum_alias.rs rename to tests/expectations/tests/enum_alias.rs diff --git a/libbindgen/tests/expectations/tests/enum_and_vtable_mangling.rs b/tests/expectations/tests/enum_and_vtable_mangling.rs similarity index 100% rename from libbindgen/tests/expectations/tests/enum_and_vtable_mangling.rs rename to tests/expectations/tests/enum_and_vtable_mangling.rs diff --git a/libbindgen/tests/expectations/tests/enum_dupe.rs b/tests/expectations/tests/enum_dupe.rs similarity index 100% rename from libbindgen/tests/expectations/tests/enum_dupe.rs rename to tests/expectations/tests/enum_dupe.rs diff --git a/libbindgen/tests/expectations/tests/enum_explicit_type.rs b/tests/expectations/tests/enum_explicit_type.rs similarity index 100% rename from libbindgen/tests/expectations/tests/enum_explicit_type.rs rename to tests/expectations/tests/enum_explicit_type.rs diff --git a/libbindgen/tests/expectations/tests/enum_in_template_with_typedef.rs b/tests/expectations/tests/enum_in_template_with_typedef.rs similarity index 100% rename from libbindgen/tests/expectations/tests/enum_in_template_with_typedef.rs rename to tests/expectations/tests/enum_in_template_with_typedef.rs diff --git a/libbindgen/tests/expectations/tests/enum_negative.rs b/tests/expectations/tests/enum_negative.rs similarity index 100% rename from libbindgen/tests/expectations/tests/enum_negative.rs rename to tests/expectations/tests/enum_negative.rs diff --git a/libbindgen/tests/expectations/tests/enum_packed.rs b/tests/expectations/tests/enum_packed.rs similarity index 100% rename from libbindgen/tests/expectations/tests/enum_packed.rs rename to tests/expectations/tests/enum_packed.rs diff --git a/libbindgen/tests/expectations/tests/eval-variadic-template-parameter.rs b/tests/expectations/tests/eval-variadic-template-parameter.rs similarity index 100% rename from libbindgen/tests/expectations/tests/eval-variadic-template-parameter.rs rename to tests/expectations/tests/eval-variadic-template-parameter.rs diff --git a/libbindgen/tests/expectations/tests/extern.rs b/tests/expectations/tests/extern.rs similarity index 100% rename from libbindgen/tests/expectations/tests/extern.rs rename to tests/expectations/tests/extern.rs diff --git a/libbindgen/tests/expectations/tests/float128.rs b/tests/expectations/tests/float128.rs similarity index 100% rename from libbindgen/tests/expectations/tests/float128.rs rename to tests/expectations/tests/float128.rs diff --git a/libbindgen/tests/expectations/tests/forward-inherit-struct-with-fields.rs b/tests/expectations/tests/forward-inherit-struct-with-fields.rs similarity index 100% rename from libbindgen/tests/expectations/tests/forward-inherit-struct-with-fields.rs rename to tests/expectations/tests/forward-inherit-struct-with-fields.rs diff --git a/libbindgen/tests/expectations/tests/forward-inherit-struct.rs b/tests/expectations/tests/forward-inherit-struct.rs similarity index 100% rename from libbindgen/tests/expectations/tests/forward-inherit-struct.rs rename to tests/expectations/tests/forward-inherit-struct.rs diff --git a/libbindgen/tests/expectations/tests/forward_declared_struct.rs b/tests/expectations/tests/forward_declared_struct.rs similarity index 100% rename from libbindgen/tests/expectations/tests/forward_declared_struct.rs rename to tests/expectations/tests/forward_declared_struct.rs diff --git a/libbindgen/tests/expectations/tests/func_proto.rs b/tests/expectations/tests/func_proto.rs similarity index 100% rename from libbindgen/tests/expectations/tests/func_proto.rs rename to tests/expectations/tests/func_proto.rs diff --git a/libbindgen/tests/expectations/tests/func_ptr.rs b/tests/expectations/tests/func_ptr.rs similarity index 100% rename from libbindgen/tests/expectations/tests/func_ptr.rs rename to tests/expectations/tests/func_ptr.rs diff --git a/libbindgen/tests/expectations/tests/func_ptr_in_struct.rs b/tests/expectations/tests/func_ptr_in_struct.rs similarity index 100% rename from libbindgen/tests/expectations/tests/func_ptr_in_struct.rs rename to tests/expectations/tests/func_ptr_in_struct.rs diff --git a/libbindgen/tests/expectations/tests/func_with_array_arg.rs b/tests/expectations/tests/func_with_array_arg.rs similarity index 100% rename from libbindgen/tests/expectations/tests/func_with_array_arg.rs rename to tests/expectations/tests/func_with_array_arg.rs diff --git a/libbindgen/tests/expectations/tests/func_with_func_ptr_arg.rs b/tests/expectations/tests/func_with_func_ptr_arg.rs similarity index 100% rename from libbindgen/tests/expectations/tests/func_with_func_ptr_arg.rs rename to tests/expectations/tests/func_with_func_ptr_arg.rs diff --git a/libbindgen/tests/expectations/tests/in_class_typedef.rs b/tests/expectations/tests/in_class_typedef.rs similarity index 100% rename from libbindgen/tests/expectations/tests/in_class_typedef.rs rename to tests/expectations/tests/in_class_typedef.rs diff --git a/libbindgen/tests/expectations/tests/inherit-namespaced.rs b/tests/expectations/tests/inherit-namespaced.rs similarity index 100% rename from libbindgen/tests/expectations/tests/inherit-namespaced.rs rename to tests/expectations/tests/inherit-namespaced.rs diff --git a/libbindgen/tests/expectations/tests/inherit_named.rs b/tests/expectations/tests/inherit_named.rs similarity index 100% rename from libbindgen/tests/expectations/tests/inherit_named.rs rename to tests/expectations/tests/inherit_named.rs diff --git a/libbindgen/tests/expectations/tests/inherit_typedef.rs b/tests/expectations/tests/inherit_typedef.rs similarity index 100% rename from libbindgen/tests/expectations/tests/inherit_typedef.rs rename to tests/expectations/tests/inherit_typedef.rs diff --git a/libbindgen/tests/expectations/tests/inline-function.rs b/tests/expectations/tests/inline-function.rs similarity index 100% rename from libbindgen/tests/expectations/tests/inline-function.rs rename to tests/expectations/tests/inline-function.rs diff --git a/libbindgen/tests/expectations/tests/inline_namespace.rs b/tests/expectations/tests/inline_namespace.rs similarity index 100% rename from libbindgen/tests/expectations/tests/inline_namespace.rs rename to tests/expectations/tests/inline_namespace.rs diff --git a/libbindgen/tests/expectations/tests/inline_namespace_conservative.rs b/tests/expectations/tests/inline_namespace_conservative.rs similarity index 100% rename from libbindgen/tests/expectations/tests/inline_namespace_conservative.rs rename to tests/expectations/tests/inline_namespace_conservative.rs diff --git a/libbindgen/tests/expectations/tests/inline_namespace_whitelist.rs b/tests/expectations/tests/inline_namespace_whitelist.rs similarity index 100% rename from libbindgen/tests/expectations/tests/inline_namespace_whitelist.rs rename to tests/expectations/tests/inline_namespace_whitelist.rs diff --git a/libbindgen/tests/expectations/tests/inner_const.rs b/tests/expectations/tests/inner_const.rs similarity index 100% rename from libbindgen/tests/expectations/tests/inner_const.rs rename to tests/expectations/tests/inner_const.rs diff --git a/libbindgen/tests/expectations/tests/inner_template_self.rs b/tests/expectations/tests/inner_template_self.rs similarity index 100% rename from libbindgen/tests/expectations/tests/inner_template_self.rs rename to tests/expectations/tests/inner_template_self.rs diff --git a/libbindgen/tests/expectations/tests/int128_t.rs b/tests/expectations/tests/int128_t.rs similarity index 100% rename from libbindgen/tests/expectations/tests/int128_t.rs rename to tests/expectations/tests/int128_t.rs diff --git a/libbindgen/tests/expectations/tests/issue-358.rs b/tests/expectations/tests/issue-358.rs similarity index 100% rename from libbindgen/tests/expectations/tests/issue-358.rs rename to tests/expectations/tests/issue-358.rs diff --git a/libbindgen/tests/expectations/tests/issue-372.rs b/tests/expectations/tests/issue-372.rs similarity index 100% rename from libbindgen/tests/expectations/tests/issue-372.rs rename to tests/expectations/tests/issue-372.rs diff --git a/libbindgen/tests/expectations/tests/issue_311.rs b/tests/expectations/tests/issue_311.rs similarity index 100% rename from libbindgen/tests/expectations/tests/issue_311.rs rename to tests/expectations/tests/issue_311.rs diff --git a/libbindgen/tests/expectations/tests/issue_315.rs b/tests/expectations/tests/issue_315.rs similarity index 100% rename from libbindgen/tests/expectations/tests/issue_315.rs rename to tests/expectations/tests/issue_315.rs diff --git a/libbindgen/tests/expectations/tests/jsval_layout_opaque.rs b/tests/expectations/tests/jsval_layout_opaque.rs similarity index 100% rename from libbindgen/tests/expectations/tests/jsval_layout_opaque.rs rename to tests/expectations/tests/jsval_layout_opaque.rs diff --git a/libbindgen/tests/expectations/tests/keywords.rs b/tests/expectations/tests/keywords.rs similarity index 100% rename from libbindgen/tests/expectations/tests/keywords.rs rename to tests/expectations/tests/keywords.rs diff --git a/libbindgen/tests/expectations/tests/macro-expr-basic.rs b/tests/expectations/tests/macro-expr-basic.rs similarity index 100% rename from libbindgen/tests/expectations/tests/macro-expr-basic.rs rename to tests/expectations/tests/macro-expr-basic.rs diff --git a/libbindgen/tests/expectations/tests/macro-redef.rs b/tests/expectations/tests/macro-redef.rs similarity index 100% rename from libbindgen/tests/expectations/tests/macro-redef.rs rename to tests/expectations/tests/macro-redef.rs diff --git a/libbindgen/tests/expectations/tests/macro_const.rs b/tests/expectations/tests/macro_const.rs similarity index 100% rename from libbindgen/tests/expectations/tests/macro_const.rs rename to tests/expectations/tests/macro_const.rs diff --git a/libbindgen/tests/expectations/tests/maddness-is-avoidable.rs b/tests/expectations/tests/maddness-is-avoidable.rs similarity index 100% rename from libbindgen/tests/expectations/tests/maddness-is-avoidable.rs rename to tests/expectations/tests/maddness-is-avoidable.rs diff --git a/libbindgen/tests/expectations/tests/method-mangling.rs b/tests/expectations/tests/method-mangling.rs similarity index 100% rename from libbindgen/tests/expectations/tests/method-mangling.rs rename to tests/expectations/tests/method-mangling.rs diff --git a/libbindgen/tests/expectations/tests/module-whitelisted.rs b/tests/expectations/tests/module-whitelisted.rs similarity index 100% rename from libbindgen/tests/expectations/tests/module-whitelisted.rs rename to tests/expectations/tests/module-whitelisted.rs diff --git a/libbindgen/tests/expectations/tests/msvc-no-usr.rs b/tests/expectations/tests/msvc-no-usr.rs similarity index 100% rename from libbindgen/tests/expectations/tests/msvc-no-usr.rs rename to tests/expectations/tests/msvc-no-usr.rs diff --git a/libbindgen/tests/expectations/tests/multiple-inherit-empty-correct-layout.rs b/tests/expectations/tests/multiple-inherit-empty-correct-layout.rs similarity index 100% rename from libbindgen/tests/expectations/tests/multiple-inherit-empty-correct-layout.rs rename to tests/expectations/tests/multiple-inherit-empty-correct-layout.rs diff --git a/libbindgen/tests/expectations/tests/mutable.rs b/tests/expectations/tests/mutable.rs similarity index 100% rename from libbindgen/tests/expectations/tests/mutable.rs rename to tests/expectations/tests/mutable.rs diff --git a/libbindgen/tests/expectations/tests/namespace.rs b/tests/expectations/tests/namespace.rs similarity index 100% rename from libbindgen/tests/expectations/tests/namespace.rs rename to tests/expectations/tests/namespace.rs diff --git a/libbindgen/tests/expectations/tests/nested.rs b/tests/expectations/tests/nested.rs similarity index 100% rename from libbindgen/tests/expectations/tests/nested.rs rename to tests/expectations/tests/nested.rs diff --git a/libbindgen/tests/expectations/tests/nested_vtable.rs b/tests/expectations/tests/nested_vtable.rs similarity index 100% rename from libbindgen/tests/expectations/tests/nested_vtable.rs rename to tests/expectations/tests/nested_vtable.rs diff --git a/libbindgen/tests/expectations/tests/nested_within_namespace.rs b/tests/expectations/tests/nested_within_namespace.rs similarity index 100% rename from libbindgen/tests/expectations/tests/nested_within_namespace.rs rename to tests/expectations/tests/nested_within_namespace.rs diff --git a/libbindgen/tests/expectations/tests/no-std.rs b/tests/expectations/tests/no-std.rs similarity index 100% rename from libbindgen/tests/expectations/tests/no-std.rs rename to tests/expectations/tests/no-std.rs diff --git a/libbindgen/tests/expectations/tests/no_copy.rs b/tests/expectations/tests/no_copy.rs similarity index 100% rename from libbindgen/tests/expectations/tests/no_copy.rs rename to tests/expectations/tests/no_copy.rs diff --git a/libbindgen/tests/expectations/tests/nsStyleAutoArray.rs b/tests/expectations/tests/nsStyleAutoArray.rs similarity index 100% rename from libbindgen/tests/expectations/tests/nsStyleAutoArray.rs rename to tests/expectations/tests/nsStyleAutoArray.rs diff --git a/libbindgen/tests/expectations/tests/only_bitfields.rs b/tests/expectations/tests/only_bitfields.rs similarity index 100% rename from libbindgen/tests/expectations/tests/only_bitfields.rs rename to tests/expectations/tests/only_bitfields.rs diff --git a/libbindgen/tests/expectations/tests/opaque-tracing.rs b/tests/expectations/tests/opaque-tracing.rs similarity index 100% rename from libbindgen/tests/expectations/tests/opaque-tracing.rs rename to tests/expectations/tests/opaque-tracing.rs diff --git a/libbindgen/tests/expectations/tests/opaque_in_struct.rs b/tests/expectations/tests/opaque_in_struct.rs similarity index 100% rename from libbindgen/tests/expectations/tests/opaque_in_struct.rs rename to tests/expectations/tests/opaque_in_struct.rs diff --git a/libbindgen/tests/expectations/tests/opaque_pointer.rs b/tests/expectations/tests/opaque_pointer.rs similarity index 100% rename from libbindgen/tests/expectations/tests/opaque_pointer.rs rename to tests/expectations/tests/opaque_pointer.rs diff --git a/libbindgen/tests/expectations/tests/opaque_typedef.rs b/tests/expectations/tests/opaque_typedef.rs similarity index 100% rename from libbindgen/tests/expectations/tests/opaque_typedef.rs rename to tests/expectations/tests/opaque_typedef.rs diff --git a/libbindgen/tests/expectations/tests/overflowed_enum.rs b/tests/expectations/tests/overflowed_enum.rs similarity index 100% rename from libbindgen/tests/expectations/tests/overflowed_enum.rs rename to tests/expectations/tests/overflowed_enum.rs diff --git a/libbindgen/tests/expectations/tests/overloading.rs b/tests/expectations/tests/overloading.rs similarity index 100% rename from libbindgen/tests/expectations/tests/overloading.rs rename to tests/expectations/tests/overloading.rs diff --git a/libbindgen/tests/expectations/tests/private.rs b/tests/expectations/tests/private.rs similarity index 100% rename from libbindgen/tests/expectations/tests/private.rs rename to tests/expectations/tests/private.rs diff --git a/libbindgen/tests/expectations/tests/public-dtor.rs b/tests/expectations/tests/public-dtor.rs similarity index 100% rename from libbindgen/tests/expectations/tests/public-dtor.rs rename to tests/expectations/tests/public-dtor.rs diff --git a/libbindgen/tests/expectations/tests/redeclaration.rs b/tests/expectations/tests/redeclaration.rs similarity index 100% rename from libbindgen/tests/expectations/tests/redeclaration.rs rename to tests/expectations/tests/redeclaration.rs diff --git a/libbindgen/tests/expectations/tests/ref_argument_array.rs b/tests/expectations/tests/ref_argument_array.rs similarity index 100% rename from libbindgen/tests/expectations/tests/ref_argument_array.rs rename to tests/expectations/tests/ref_argument_array.rs diff --git a/libbindgen/tests/expectations/tests/reparented_replacement.rs b/tests/expectations/tests/reparented_replacement.rs similarity index 100% rename from libbindgen/tests/expectations/tests/reparented_replacement.rs rename to tests/expectations/tests/reparented_replacement.rs diff --git a/libbindgen/tests/expectations/tests/replace_template_alias.rs b/tests/expectations/tests/replace_template_alias.rs similarity index 100% rename from libbindgen/tests/expectations/tests/replace_template_alias.rs rename to tests/expectations/tests/replace_template_alias.rs diff --git a/libbindgen/tests/expectations/tests/replace_use.rs b/tests/expectations/tests/replace_use.rs similarity index 100% rename from libbindgen/tests/expectations/tests/replace_use.rs rename to tests/expectations/tests/replace_use.rs diff --git a/libbindgen/tests/expectations/tests/replaces_double.rs b/tests/expectations/tests/replaces_double.rs similarity index 100% rename from libbindgen/tests/expectations/tests/replaces_double.rs rename to tests/expectations/tests/replaces_double.rs diff --git a/libbindgen/tests/expectations/tests/resolved_type_def_function.rs b/tests/expectations/tests/resolved_type_def_function.rs similarity index 100% rename from libbindgen/tests/expectations/tests/resolved_type_def_function.rs rename to tests/expectations/tests/resolved_type_def_function.rs diff --git a/libbindgen/tests/expectations/tests/same_struct_name_in_different_namespaces.rs b/tests/expectations/tests/same_struct_name_in_different_namespaces.rs similarity index 100% rename from libbindgen/tests/expectations/tests/same_struct_name_in_different_namespaces.rs rename to tests/expectations/tests/same_struct_name_in_different_namespaces.rs diff --git a/libbindgen/tests/expectations/tests/size_t_template.rs b/tests/expectations/tests/size_t_template.rs similarity index 100% rename from libbindgen/tests/expectations/tests/size_t_template.rs rename to tests/expectations/tests/size_t_template.rs diff --git a/libbindgen/tests/expectations/tests/struct_containing_forward_declared_struct.rs b/tests/expectations/tests/struct_containing_forward_declared_struct.rs similarity index 100% rename from libbindgen/tests/expectations/tests/struct_containing_forward_declared_struct.rs rename to tests/expectations/tests/struct_containing_forward_declared_struct.rs diff --git a/libbindgen/tests/expectations/tests/struct_with_anon_struct.rs b/tests/expectations/tests/struct_with_anon_struct.rs similarity index 100% rename from libbindgen/tests/expectations/tests/struct_with_anon_struct.rs rename to tests/expectations/tests/struct_with_anon_struct.rs diff --git a/libbindgen/tests/expectations/tests/struct_with_anon_struct_array.rs b/tests/expectations/tests/struct_with_anon_struct_array.rs similarity index 100% rename from libbindgen/tests/expectations/tests/struct_with_anon_struct_array.rs rename to tests/expectations/tests/struct_with_anon_struct_array.rs diff --git a/libbindgen/tests/expectations/tests/struct_with_anon_struct_pointer.rs b/tests/expectations/tests/struct_with_anon_struct_pointer.rs similarity index 100% rename from libbindgen/tests/expectations/tests/struct_with_anon_struct_pointer.rs rename to tests/expectations/tests/struct_with_anon_struct_pointer.rs diff --git a/libbindgen/tests/expectations/tests/struct_with_anon_union.rs b/tests/expectations/tests/struct_with_anon_union.rs similarity index 100% rename from libbindgen/tests/expectations/tests/struct_with_anon_union.rs rename to tests/expectations/tests/struct_with_anon_union.rs diff --git a/libbindgen/tests/expectations/tests/struct_with_anon_unnamed_struct.rs b/tests/expectations/tests/struct_with_anon_unnamed_struct.rs similarity index 100% rename from libbindgen/tests/expectations/tests/struct_with_anon_unnamed_struct.rs rename to tests/expectations/tests/struct_with_anon_unnamed_struct.rs diff --git a/libbindgen/tests/expectations/tests/struct_with_anon_unnamed_union.rs b/tests/expectations/tests/struct_with_anon_unnamed_union.rs similarity index 100% rename from libbindgen/tests/expectations/tests/struct_with_anon_unnamed_union.rs rename to tests/expectations/tests/struct_with_anon_unnamed_union.rs diff --git a/libbindgen/tests/expectations/tests/struct_with_bitfields.rs b/tests/expectations/tests/struct_with_bitfields.rs similarity index 100% rename from libbindgen/tests/expectations/tests/struct_with_bitfields.rs rename to tests/expectations/tests/struct_with_bitfields.rs diff --git a/libbindgen/tests/expectations/tests/struct_with_derive_debug.rs b/tests/expectations/tests/struct_with_derive_debug.rs similarity index 100% rename from libbindgen/tests/expectations/tests/struct_with_derive_debug.rs rename to tests/expectations/tests/struct_with_derive_debug.rs diff --git a/libbindgen/tests/expectations/tests/struct_with_nesting.rs b/tests/expectations/tests/struct_with_nesting.rs similarity index 100% rename from libbindgen/tests/expectations/tests/struct_with_nesting.rs rename to tests/expectations/tests/struct_with_nesting.rs diff --git a/libbindgen/tests/expectations/tests/struct_with_packing.rs b/tests/expectations/tests/struct_with_packing.rs similarity index 100% rename from libbindgen/tests/expectations/tests/struct_with_packing.rs rename to tests/expectations/tests/struct_with_packing.rs diff --git a/libbindgen/tests/expectations/tests/struct_with_struct.rs b/tests/expectations/tests/struct_with_struct.rs similarity index 100% rename from libbindgen/tests/expectations/tests/struct_with_struct.rs rename to tests/expectations/tests/struct_with_struct.rs diff --git a/libbindgen/tests/expectations/tests/struct_with_typedef_template_arg.rs b/tests/expectations/tests/struct_with_typedef_template_arg.rs similarity index 100% rename from libbindgen/tests/expectations/tests/struct_with_typedef_template_arg.rs rename to tests/expectations/tests/struct_with_typedef_template_arg.rs diff --git a/libbindgen/tests/expectations/tests/template.rs b/tests/expectations/tests/template.rs similarity index 100% rename from libbindgen/tests/expectations/tests/template.rs rename to tests/expectations/tests/template.rs diff --git a/libbindgen/tests/expectations/tests/template_alias.rs b/tests/expectations/tests/template_alias.rs similarity index 100% rename from libbindgen/tests/expectations/tests/template_alias.rs rename to tests/expectations/tests/template_alias.rs diff --git a/libbindgen/tests/expectations/tests/template_alias_basic.rs b/tests/expectations/tests/template_alias_basic.rs similarity index 100% rename from libbindgen/tests/expectations/tests/template_alias_basic.rs rename to tests/expectations/tests/template_alias_basic.rs diff --git a/libbindgen/tests/expectations/tests/template_alias_namespace.rs b/tests/expectations/tests/template_alias_namespace.rs similarity index 100% rename from libbindgen/tests/expectations/tests/template_alias_namespace.rs rename to tests/expectations/tests/template_alias_namespace.rs diff --git a/libbindgen/tests/expectations/tests/template_typedef_transitive_param.rs b/tests/expectations/tests/template_typedef_transitive_param.rs similarity index 100% rename from libbindgen/tests/expectations/tests/template_typedef_transitive_param.rs rename to tests/expectations/tests/template_typedef_transitive_param.rs diff --git a/libbindgen/tests/expectations/tests/template_typedefs.rs b/tests/expectations/tests/template_typedefs.rs similarity index 100% rename from libbindgen/tests/expectations/tests/template_typedefs.rs rename to tests/expectations/tests/template_typedefs.rs diff --git a/libbindgen/tests/expectations/tests/templateref_opaque.rs b/tests/expectations/tests/templateref_opaque.rs similarity index 100% rename from libbindgen/tests/expectations/tests/templateref_opaque.rs rename to tests/expectations/tests/templateref_opaque.rs diff --git a/libbindgen/tests/expectations/tests/type-referenced-by-whitelisted-function.rs b/tests/expectations/tests/type-referenced-by-whitelisted-function.rs similarity index 100% rename from libbindgen/tests/expectations/tests/type-referenced-by-whitelisted-function.rs rename to tests/expectations/tests/type-referenced-by-whitelisted-function.rs diff --git a/libbindgen/tests/expectations/tests/type_alias_empty.rs b/tests/expectations/tests/type_alias_empty.rs similarity index 100% rename from libbindgen/tests/expectations/tests/type_alias_empty.rs rename to tests/expectations/tests/type_alias_empty.rs diff --git a/libbindgen/tests/expectations/tests/type_alias_partial_template_especialization.rs b/tests/expectations/tests/type_alias_partial_template_especialization.rs similarity index 100% rename from libbindgen/tests/expectations/tests/type_alias_partial_template_especialization.rs rename to tests/expectations/tests/type_alias_partial_template_especialization.rs diff --git a/libbindgen/tests/expectations/tests/type_alias_template_specialized.rs b/tests/expectations/tests/type_alias_template_specialized.rs similarity index 100% rename from libbindgen/tests/expectations/tests/type_alias_template_specialized.rs rename to tests/expectations/tests/type_alias_template_specialized.rs diff --git a/libbindgen/tests/expectations/tests/typedefd-array-as-function-arg.rs b/tests/expectations/tests/typedefd-array-as-function-arg.rs similarity index 100% rename from libbindgen/tests/expectations/tests/typedefd-array-as-function-arg.rs rename to tests/expectations/tests/typedefd-array-as-function-arg.rs diff --git a/libbindgen/tests/expectations/tests/typeref.rs b/tests/expectations/tests/typeref.rs similarity index 100% rename from libbindgen/tests/expectations/tests/typeref.rs rename to tests/expectations/tests/typeref.rs diff --git a/libbindgen/tests/expectations/tests/union-in-ns.rs b/tests/expectations/tests/union-in-ns.rs similarity index 100% rename from libbindgen/tests/expectations/tests/union-in-ns.rs rename to tests/expectations/tests/union-in-ns.rs diff --git a/libbindgen/tests/expectations/tests/union_dtor.rs b/tests/expectations/tests/union_dtor.rs similarity index 100% rename from libbindgen/tests/expectations/tests/union_dtor.rs rename to tests/expectations/tests/union_dtor.rs diff --git a/libbindgen/tests/expectations/tests/union_fields.rs b/tests/expectations/tests/union_fields.rs similarity index 100% rename from libbindgen/tests/expectations/tests/union_fields.rs rename to tests/expectations/tests/union_fields.rs diff --git a/libbindgen/tests/expectations/tests/union_template.rs b/tests/expectations/tests/union_template.rs similarity index 100% rename from libbindgen/tests/expectations/tests/union_template.rs rename to tests/expectations/tests/union_template.rs diff --git a/libbindgen/tests/expectations/tests/union_with_anon_struct.rs b/tests/expectations/tests/union_with_anon_struct.rs similarity index 100% rename from libbindgen/tests/expectations/tests/union_with_anon_struct.rs rename to tests/expectations/tests/union_with_anon_struct.rs diff --git a/libbindgen/tests/expectations/tests/union_with_anon_struct_bitfield.rs b/tests/expectations/tests/union_with_anon_struct_bitfield.rs similarity index 100% rename from libbindgen/tests/expectations/tests/union_with_anon_struct_bitfield.rs rename to tests/expectations/tests/union_with_anon_struct_bitfield.rs diff --git a/libbindgen/tests/expectations/tests/union_with_anon_union.rs b/tests/expectations/tests/union_with_anon_union.rs similarity index 100% rename from libbindgen/tests/expectations/tests/union_with_anon_union.rs rename to tests/expectations/tests/union_with_anon_union.rs diff --git a/libbindgen/tests/expectations/tests/union_with_anon_unnamed_struct.rs b/tests/expectations/tests/union_with_anon_unnamed_struct.rs similarity index 100% rename from libbindgen/tests/expectations/tests/union_with_anon_unnamed_struct.rs rename to tests/expectations/tests/union_with_anon_unnamed_struct.rs diff --git a/libbindgen/tests/expectations/tests/union_with_anon_unnamed_union.rs b/tests/expectations/tests/union_with_anon_unnamed_union.rs similarity index 100% rename from libbindgen/tests/expectations/tests/union_with_anon_unnamed_union.rs rename to tests/expectations/tests/union_with_anon_unnamed_union.rs diff --git a/libbindgen/tests/expectations/tests/union_with_big_member.rs b/tests/expectations/tests/union_with_big_member.rs similarity index 100% rename from libbindgen/tests/expectations/tests/union_with_big_member.rs rename to tests/expectations/tests/union_with_big_member.rs diff --git a/libbindgen/tests/expectations/tests/union_with_nesting.rs b/tests/expectations/tests/union_with_nesting.rs similarity index 100% rename from libbindgen/tests/expectations/tests/union_with_nesting.rs rename to tests/expectations/tests/union_with_nesting.rs diff --git a/libbindgen/tests/expectations/tests/unknown_attr.rs b/tests/expectations/tests/unknown_attr.rs similarity index 100% rename from libbindgen/tests/expectations/tests/unknown_attr.rs rename to tests/expectations/tests/unknown_attr.rs diff --git a/libbindgen/tests/expectations/tests/use-core.rs b/tests/expectations/tests/use-core.rs similarity index 100% rename from libbindgen/tests/expectations/tests/use-core.rs rename to tests/expectations/tests/use-core.rs diff --git a/libbindgen/tests/expectations/tests/using.rs b/tests/expectations/tests/using.rs similarity index 100% rename from libbindgen/tests/expectations/tests/using.rs rename to tests/expectations/tests/using.rs diff --git a/libbindgen/tests/expectations/tests/var-tracing.rs b/tests/expectations/tests/var-tracing.rs similarity index 100% rename from libbindgen/tests/expectations/tests/var-tracing.rs rename to tests/expectations/tests/var-tracing.rs diff --git a/libbindgen/tests/expectations/tests/variadic-method.rs b/tests/expectations/tests/variadic-method.rs similarity index 100% rename from libbindgen/tests/expectations/tests/variadic-method.rs rename to tests/expectations/tests/variadic-method.rs diff --git a/libbindgen/tests/expectations/tests/variadic_template_function.rs b/tests/expectations/tests/variadic_template_function.rs similarity index 100% rename from libbindgen/tests/expectations/tests/variadic_template_function.rs rename to tests/expectations/tests/variadic_template_function.rs diff --git a/libbindgen/tests/expectations/tests/vector.rs b/tests/expectations/tests/vector.rs similarity index 100% rename from libbindgen/tests/expectations/tests/vector.rs rename to tests/expectations/tests/vector.rs diff --git a/libbindgen/tests/expectations/tests/virtual_dtor.rs b/tests/expectations/tests/virtual_dtor.rs similarity index 100% rename from libbindgen/tests/expectations/tests/virtual_dtor.rs rename to tests/expectations/tests/virtual_dtor.rs diff --git a/libbindgen/tests/expectations/tests/virtual_inheritance.rs b/tests/expectations/tests/virtual_inheritance.rs similarity index 100% rename from libbindgen/tests/expectations/tests/virtual_inheritance.rs rename to tests/expectations/tests/virtual_inheritance.rs diff --git a/libbindgen/tests/expectations/tests/virtual_overloaded.rs b/tests/expectations/tests/virtual_overloaded.rs similarity index 100% rename from libbindgen/tests/expectations/tests/virtual_overloaded.rs rename to tests/expectations/tests/virtual_overloaded.rs diff --git a/libbindgen/tests/expectations/tests/vtable_recursive_sig.rs b/tests/expectations/tests/vtable_recursive_sig.rs similarity index 100% rename from libbindgen/tests/expectations/tests/vtable_recursive_sig.rs rename to tests/expectations/tests/vtable_recursive_sig.rs diff --git a/libbindgen/tests/expectations/tests/weird_bitfields.rs b/tests/expectations/tests/weird_bitfields.rs similarity index 100% rename from libbindgen/tests/expectations/tests/weird_bitfields.rs rename to tests/expectations/tests/weird_bitfields.rs diff --git a/libbindgen/tests/expectations/tests/what_is_going_on.rs b/tests/expectations/tests/what_is_going_on.rs similarity index 100% rename from libbindgen/tests/expectations/tests/what_is_going_on.rs rename to tests/expectations/tests/what_is_going_on.rs diff --git a/libbindgen/tests/expectations/tests/whitelist-namespaces-basic.rs b/tests/expectations/tests/whitelist-namespaces-basic.rs similarity index 100% rename from libbindgen/tests/expectations/tests/whitelist-namespaces-basic.rs rename to tests/expectations/tests/whitelist-namespaces-basic.rs diff --git a/libbindgen/tests/expectations/tests/whitelist-namespaces.rs b/tests/expectations/tests/whitelist-namespaces.rs similarity index 100% rename from libbindgen/tests/expectations/tests/whitelist-namespaces.rs rename to tests/expectations/tests/whitelist-namespaces.rs diff --git a/libbindgen/tests/expectations/tests/whitelist_basic.rs b/tests/expectations/tests/whitelist_basic.rs similarity index 100% rename from libbindgen/tests/expectations/tests/whitelist_basic.rs rename to tests/expectations/tests/whitelist_basic.rs diff --git a/libbindgen/tests/expectations/tests/whitelist_fix.rs b/tests/expectations/tests/whitelist_fix.rs similarity index 100% rename from libbindgen/tests/expectations/tests/whitelist_fix.rs rename to tests/expectations/tests/whitelist_fix.rs diff --git a/libbindgen/tests/expectations/tests/whitelist_vars.rs b/tests/expectations/tests/whitelist_vars.rs similarity index 100% rename from libbindgen/tests/expectations/tests/whitelist_vars.rs rename to tests/expectations/tests/whitelist_vars.rs diff --git a/libbindgen/tests/headers/accessors.hpp b/tests/headers/accessors.hpp similarity index 100% rename from libbindgen/tests/headers/accessors.hpp rename to tests/headers/accessors.hpp diff --git a/libbindgen/tests/headers/annotation_hide.hpp b/tests/headers/annotation_hide.hpp similarity index 100% rename from libbindgen/tests/headers/annotation_hide.hpp rename to tests/headers/annotation_hide.hpp diff --git a/libbindgen/tests/headers/anon_enum.hpp b/tests/headers/anon_enum.hpp similarity index 100% rename from libbindgen/tests/headers/anon_enum.hpp rename to tests/headers/anon_enum.hpp diff --git a/libbindgen/tests/headers/anon_enum_trait.hpp b/tests/headers/anon_enum_trait.hpp similarity index 100% rename from libbindgen/tests/headers/anon_enum_trait.hpp rename to tests/headers/anon_enum_trait.hpp diff --git a/libbindgen/tests/headers/anon_enum_whitelist.h b/tests/headers/anon_enum_whitelist.h similarity index 100% rename from libbindgen/tests/headers/anon_enum_whitelist.h rename to tests/headers/anon_enum_whitelist.h diff --git a/libbindgen/tests/headers/anon_union.hpp b/tests/headers/anon_union.hpp similarity index 100% rename from libbindgen/tests/headers/anon_union.hpp rename to tests/headers/anon_union.hpp diff --git a/libbindgen/tests/headers/arg_keyword.hpp b/tests/headers/arg_keyword.hpp similarity index 100% rename from libbindgen/tests/headers/arg_keyword.hpp rename to tests/headers/arg_keyword.hpp diff --git a/libbindgen/tests/headers/auto.hpp b/tests/headers/auto.hpp similarity index 100% rename from libbindgen/tests/headers/auto.hpp rename to tests/headers/auto.hpp diff --git a/libbindgen/tests/headers/bad-namespace-parenthood-inheritance.hpp b/tests/headers/bad-namespace-parenthood-inheritance.hpp similarity index 100% rename from libbindgen/tests/headers/bad-namespace-parenthood-inheritance.hpp rename to tests/headers/bad-namespace-parenthood-inheritance.hpp diff --git a/libbindgen/tests/headers/base-to-derived.hpp b/tests/headers/base-to-derived.hpp similarity index 100% rename from libbindgen/tests/headers/base-to-derived.hpp rename to tests/headers/base-to-derived.hpp diff --git a/libbindgen/tests/headers/bitfield-enum-basic.hpp b/tests/headers/bitfield-enum-basic.hpp similarity index 100% rename from libbindgen/tests/headers/bitfield-enum-basic.hpp rename to tests/headers/bitfield-enum-basic.hpp diff --git a/libbindgen/tests/headers/bitfield_method_mangling.h b/tests/headers/bitfield_method_mangling.h similarity index 100% rename from libbindgen/tests/headers/bitfield_method_mangling.h rename to tests/headers/bitfield_method_mangling.h diff --git a/libbindgen/tests/headers/blocks.h b/tests/headers/blocks.h similarity index 100% rename from libbindgen/tests/headers/blocks.h rename to tests/headers/blocks.h diff --git a/libbindgen/tests/headers/canonical_path_without_namespacing.hpp b/tests/headers/canonical_path_without_namespacing.hpp similarity index 100% rename from libbindgen/tests/headers/canonical_path_without_namespacing.hpp rename to tests/headers/canonical_path_without_namespacing.hpp diff --git a/libbindgen/tests/headers/class.hpp b/tests/headers/class.hpp similarity index 100% rename from libbindgen/tests/headers/class.hpp rename to tests/headers/class.hpp diff --git a/libbindgen/tests/headers/class_nested.hpp b/tests/headers/class_nested.hpp similarity index 100% rename from libbindgen/tests/headers/class_nested.hpp rename to tests/headers/class_nested.hpp diff --git a/libbindgen/tests/headers/class_no_members.hpp b/tests/headers/class_no_members.hpp similarity index 100% rename from libbindgen/tests/headers/class_no_members.hpp rename to tests/headers/class_no_members.hpp diff --git a/libbindgen/tests/headers/class_static.hpp b/tests/headers/class_static.hpp similarity index 100% rename from libbindgen/tests/headers/class_static.hpp rename to tests/headers/class_static.hpp diff --git a/libbindgen/tests/headers/class_static_const.hpp b/tests/headers/class_static_const.hpp similarity index 100% rename from libbindgen/tests/headers/class_static_const.hpp rename to tests/headers/class_static_const.hpp diff --git a/libbindgen/tests/headers/class_use_as.hpp b/tests/headers/class_use_as.hpp similarity index 100% rename from libbindgen/tests/headers/class_use_as.hpp rename to tests/headers/class_use_as.hpp diff --git a/libbindgen/tests/headers/class_with_dtor.hpp b/tests/headers/class_with_dtor.hpp similarity index 100% rename from libbindgen/tests/headers/class_with_dtor.hpp rename to tests/headers/class_with_dtor.hpp diff --git a/libbindgen/tests/headers/class_with_inner_struct.hpp b/tests/headers/class_with_inner_struct.hpp similarity index 100% rename from libbindgen/tests/headers/class_with_inner_struct.hpp rename to tests/headers/class_with_inner_struct.hpp diff --git a/libbindgen/tests/headers/class_with_typedef.hpp b/tests/headers/class_with_typedef.hpp similarity index 100% rename from libbindgen/tests/headers/class_with_typedef.hpp rename to tests/headers/class_with_typedef.hpp diff --git a/libbindgen/tests/headers/complex.h b/tests/headers/complex.h similarity index 100% rename from libbindgen/tests/headers/complex.h rename to tests/headers/complex.h diff --git a/libbindgen/tests/headers/complex_global.h b/tests/headers/complex_global.h similarity index 100% rename from libbindgen/tests/headers/complex_global.h rename to tests/headers/complex_global.h diff --git a/libbindgen/tests/headers/const_bool.hpp b/tests/headers/const_bool.hpp similarity index 100% rename from libbindgen/tests/headers/const_bool.hpp rename to tests/headers/const_bool.hpp diff --git a/libbindgen/tests/headers/const_enum_unnamed.hpp b/tests/headers/const_enum_unnamed.hpp similarity index 100% rename from libbindgen/tests/headers/const_enum_unnamed.hpp rename to tests/headers/const_enum_unnamed.hpp diff --git a/libbindgen/tests/headers/const_ptr.hpp b/tests/headers/const_ptr.hpp similarity index 100% rename from libbindgen/tests/headers/const_ptr.hpp rename to tests/headers/const_ptr.hpp diff --git a/libbindgen/tests/headers/const_resolved_ty.h b/tests/headers/const_resolved_ty.h similarity index 100% rename from libbindgen/tests/headers/const_resolved_ty.h rename to tests/headers/const_resolved_ty.h diff --git a/libbindgen/tests/headers/const_tparam.hpp b/tests/headers/const_tparam.hpp similarity index 100% rename from libbindgen/tests/headers/const_tparam.hpp rename to tests/headers/const_tparam.hpp diff --git a/libbindgen/tests/headers/constant-evaluate.h b/tests/headers/constant-evaluate.h similarity index 100% rename from libbindgen/tests/headers/constant-evaluate.h rename to tests/headers/constant-evaluate.h diff --git a/libbindgen/tests/headers/constify-enum.h b/tests/headers/constify-enum.h similarity index 100% rename from libbindgen/tests/headers/constify-enum.h rename to tests/headers/constify-enum.h diff --git a/libbindgen/tests/headers/constructor-tp.hpp b/tests/headers/constructor-tp.hpp similarity index 100% rename from libbindgen/tests/headers/constructor-tp.hpp rename to tests/headers/constructor-tp.hpp diff --git a/libbindgen/tests/headers/constructors.hpp b/tests/headers/constructors.hpp similarity index 100% rename from libbindgen/tests/headers/constructors.hpp rename to tests/headers/constructors.hpp diff --git a/libbindgen/tests/headers/convert-floats.h b/tests/headers/convert-floats.h similarity index 100% rename from libbindgen/tests/headers/convert-floats.h rename to tests/headers/convert-floats.h diff --git a/libbindgen/tests/headers/crtp.hpp b/tests/headers/crtp.hpp similarity index 100% rename from libbindgen/tests/headers/crtp.hpp rename to tests/headers/crtp.hpp diff --git a/libbindgen/tests/headers/dash_language.h b/tests/headers/dash_language.h similarity index 100% rename from libbindgen/tests/headers/dash_language.h rename to tests/headers/dash_language.h diff --git a/libbindgen/tests/headers/decl_extern_int_twice.h b/tests/headers/decl_extern_int_twice.h similarity index 100% rename from libbindgen/tests/headers/decl_extern_int_twice.h rename to tests/headers/decl_extern_int_twice.h diff --git a/libbindgen/tests/headers/decl_ptr_to_array.h b/tests/headers/decl_ptr_to_array.h similarity index 100% rename from libbindgen/tests/headers/decl_ptr_to_array.h rename to tests/headers/decl_ptr_to_array.h diff --git a/libbindgen/tests/headers/disable-namespacing.hpp b/tests/headers/disable-namespacing.hpp similarity index 100% rename from libbindgen/tests/headers/disable-namespacing.hpp rename to tests/headers/disable-namespacing.hpp diff --git a/libbindgen/tests/headers/duplicated-namespaces-definitions.hpp b/tests/headers/duplicated-namespaces-definitions.hpp similarity index 100% rename from libbindgen/tests/headers/duplicated-namespaces-definitions.hpp rename to tests/headers/duplicated-namespaces-definitions.hpp diff --git a/libbindgen/tests/headers/duplicated-namespaces.hpp b/tests/headers/duplicated-namespaces.hpp similarity index 100% rename from libbindgen/tests/headers/duplicated-namespaces.hpp rename to tests/headers/duplicated-namespaces.hpp diff --git a/libbindgen/tests/headers/duplicated_constants_in_ns.hpp b/tests/headers/duplicated_constants_in_ns.hpp similarity index 100% rename from libbindgen/tests/headers/duplicated_constants_in_ns.hpp rename to tests/headers/duplicated_constants_in_ns.hpp diff --git a/libbindgen/tests/headers/elaborated.hpp b/tests/headers/elaborated.hpp similarity index 100% rename from libbindgen/tests/headers/elaborated.hpp rename to tests/headers/elaborated.hpp diff --git a/libbindgen/tests/headers/empty_template_param_name.hpp b/tests/headers/empty_template_param_name.hpp similarity index 100% rename from libbindgen/tests/headers/empty_template_param_name.hpp rename to tests/headers/empty_template_param_name.hpp diff --git a/libbindgen/tests/headers/enum.h b/tests/headers/enum.h similarity index 100% rename from libbindgen/tests/headers/enum.h rename to tests/headers/enum.h diff --git a/libbindgen/tests/headers/enum_alias.hpp b/tests/headers/enum_alias.hpp similarity index 100% rename from libbindgen/tests/headers/enum_alias.hpp rename to tests/headers/enum_alias.hpp diff --git a/libbindgen/tests/headers/enum_and_vtable_mangling.hpp b/tests/headers/enum_and_vtable_mangling.hpp similarity index 100% rename from libbindgen/tests/headers/enum_and_vtable_mangling.hpp rename to tests/headers/enum_and_vtable_mangling.hpp diff --git a/libbindgen/tests/headers/enum_dupe.h b/tests/headers/enum_dupe.h similarity index 100% rename from libbindgen/tests/headers/enum_dupe.h rename to tests/headers/enum_dupe.h diff --git a/libbindgen/tests/headers/enum_explicit_type.hpp b/tests/headers/enum_explicit_type.hpp similarity index 100% rename from libbindgen/tests/headers/enum_explicit_type.hpp rename to tests/headers/enum_explicit_type.hpp diff --git a/libbindgen/tests/headers/enum_in_template_with_typedef.hpp b/tests/headers/enum_in_template_with_typedef.hpp similarity index 100% rename from libbindgen/tests/headers/enum_in_template_with_typedef.hpp rename to tests/headers/enum_in_template_with_typedef.hpp diff --git a/libbindgen/tests/headers/enum_negative.h b/tests/headers/enum_negative.h similarity index 100% rename from libbindgen/tests/headers/enum_negative.h rename to tests/headers/enum_negative.h diff --git a/libbindgen/tests/headers/enum_packed.h b/tests/headers/enum_packed.h similarity index 100% rename from libbindgen/tests/headers/enum_packed.h rename to tests/headers/enum_packed.h diff --git a/libbindgen/tests/headers/eval-variadic-template-parameter.hpp b/tests/headers/eval-variadic-template-parameter.hpp similarity index 100% rename from libbindgen/tests/headers/eval-variadic-template-parameter.hpp rename to tests/headers/eval-variadic-template-parameter.hpp diff --git a/libbindgen/tests/headers/extern.hpp b/tests/headers/extern.hpp similarity index 100% rename from libbindgen/tests/headers/extern.hpp rename to tests/headers/extern.hpp diff --git a/libbindgen/tests/headers/float128.hpp b/tests/headers/float128.hpp similarity index 100% rename from libbindgen/tests/headers/float128.hpp rename to tests/headers/float128.hpp diff --git a/libbindgen/tests/headers/forward-inherit-struct-with-fields.hpp b/tests/headers/forward-inherit-struct-with-fields.hpp similarity index 100% rename from libbindgen/tests/headers/forward-inherit-struct-with-fields.hpp rename to tests/headers/forward-inherit-struct-with-fields.hpp diff --git a/libbindgen/tests/headers/forward-inherit-struct.hpp b/tests/headers/forward-inherit-struct.hpp similarity index 100% rename from libbindgen/tests/headers/forward-inherit-struct.hpp rename to tests/headers/forward-inherit-struct.hpp diff --git a/libbindgen/tests/headers/forward_declared_struct.h b/tests/headers/forward_declared_struct.h similarity index 100% rename from libbindgen/tests/headers/forward_declared_struct.h rename to tests/headers/forward_declared_struct.h diff --git a/libbindgen/tests/headers/func_proto.h b/tests/headers/func_proto.h similarity index 100% rename from libbindgen/tests/headers/func_proto.h rename to tests/headers/func_proto.h diff --git a/libbindgen/tests/headers/func_ptr.h b/tests/headers/func_ptr.h similarity index 100% rename from libbindgen/tests/headers/func_ptr.h rename to tests/headers/func_ptr.h diff --git a/libbindgen/tests/headers/func_ptr_in_struct.h b/tests/headers/func_ptr_in_struct.h similarity index 100% rename from libbindgen/tests/headers/func_ptr_in_struct.h rename to tests/headers/func_ptr_in_struct.h diff --git a/libbindgen/tests/headers/func_with_array_arg.h b/tests/headers/func_with_array_arg.h similarity index 100% rename from libbindgen/tests/headers/func_with_array_arg.h rename to tests/headers/func_with_array_arg.h diff --git a/libbindgen/tests/headers/func_with_func_ptr_arg.h b/tests/headers/func_with_func_ptr_arg.h similarity index 100% rename from libbindgen/tests/headers/func_with_func_ptr_arg.h rename to tests/headers/func_with_func_ptr_arg.h diff --git a/libbindgen/tests/headers/in_class_typedef.hpp b/tests/headers/in_class_typedef.hpp similarity index 100% rename from libbindgen/tests/headers/in_class_typedef.hpp rename to tests/headers/in_class_typedef.hpp diff --git a/libbindgen/tests/headers/inherit-namespaced.hpp b/tests/headers/inherit-namespaced.hpp similarity index 100% rename from libbindgen/tests/headers/inherit-namespaced.hpp rename to tests/headers/inherit-namespaced.hpp diff --git a/libbindgen/tests/headers/inherit_named.hpp b/tests/headers/inherit_named.hpp similarity index 100% rename from libbindgen/tests/headers/inherit_named.hpp rename to tests/headers/inherit_named.hpp diff --git a/libbindgen/tests/headers/inherit_typedef.hpp b/tests/headers/inherit_typedef.hpp similarity index 100% rename from libbindgen/tests/headers/inherit_typedef.hpp rename to tests/headers/inherit_typedef.hpp diff --git a/libbindgen/tests/headers/inline-function.h b/tests/headers/inline-function.h similarity index 100% rename from libbindgen/tests/headers/inline-function.h rename to tests/headers/inline-function.h diff --git a/libbindgen/tests/headers/inline_namespace.hpp b/tests/headers/inline_namespace.hpp similarity index 100% rename from libbindgen/tests/headers/inline_namespace.hpp rename to tests/headers/inline_namespace.hpp diff --git a/libbindgen/tests/headers/inline_namespace_conservative.hpp b/tests/headers/inline_namespace_conservative.hpp similarity index 100% rename from libbindgen/tests/headers/inline_namespace_conservative.hpp rename to tests/headers/inline_namespace_conservative.hpp diff --git a/libbindgen/tests/headers/inline_namespace_whitelist.hpp b/tests/headers/inline_namespace_whitelist.hpp similarity index 100% rename from libbindgen/tests/headers/inline_namespace_whitelist.hpp rename to tests/headers/inline_namespace_whitelist.hpp diff --git a/libbindgen/tests/headers/inner_const.hpp b/tests/headers/inner_const.hpp similarity index 100% rename from libbindgen/tests/headers/inner_const.hpp rename to tests/headers/inner_const.hpp diff --git a/libbindgen/tests/headers/inner_template_self.hpp b/tests/headers/inner_template_self.hpp similarity index 100% rename from libbindgen/tests/headers/inner_template_self.hpp rename to tests/headers/inner_template_self.hpp diff --git a/libbindgen/tests/headers/int128_t.h b/tests/headers/int128_t.h similarity index 100% rename from libbindgen/tests/headers/int128_t.h rename to tests/headers/int128_t.h diff --git a/libbindgen/tests/headers/issue-358.hpp b/tests/headers/issue-358.hpp similarity index 100% rename from libbindgen/tests/headers/issue-358.hpp rename to tests/headers/issue-358.hpp diff --git a/libbindgen/tests/headers/issue-372.hpp b/tests/headers/issue-372.hpp similarity index 100% rename from libbindgen/tests/headers/issue-372.hpp rename to tests/headers/issue-372.hpp diff --git a/libbindgen/tests/headers/issue_311.hpp b/tests/headers/issue_311.hpp similarity index 100% rename from libbindgen/tests/headers/issue_311.hpp rename to tests/headers/issue_311.hpp diff --git a/libbindgen/tests/headers/issue_315.hpp b/tests/headers/issue_315.hpp similarity index 100% rename from libbindgen/tests/headers/issue_315.hpp rename to tests/headers/issue_315.hpp diff --git a/libbindgen/tests/headers/jsval_layout_opaque.hpp b/tests/headers/jsval_layout_opaque.hpp similarity index 100% rename from libbindgen/tests/headers/jsval_layout_opaque.hpp rename to tests/headers/jsval_layout_opaque.hpp diff --git a/libbindgen/tests/headers/keywords.h b/tests/headers/keywords.h similarity index 100% rename from libbindgen/tests/headers/keywords.h rename to tests/headers/keywords.h diff --git a/libbindgen/tests/headers/macro-expr-basic.h b/tests/headers/macro-expr-basic.h similarity index 100% rename from libbindgen/tests/headers/macro-expr-basic.h rename to tests/headers/macro-expr-basic.h diff --git a/libbindgen/tests/headers/macro-redef.h b/tests/headers/macro-redef.h similarity index 100% rename from libbindgen/tests/headers/macro-redef.h rename to tests/headers/macro-redef.h diff --git a/libbindgen/tests/headers/macro_const.h b/tests/headers/macro_const.h similarity index 100% rename from libbindgen/tests/headers/macro_const.h rename to tests/headers/macro_const.h diff --git a/libbindgen/tests/headers/maddness-is-avoidable.hpp b/tests/headers/maddness-is-avoidable.hpp similarity index 100% rename from libbindgen/tests/headers/maddness-is-avoidable.hpp rename to tests/headers/maddness-is-avoidable.hpp diff --git a/libbindgen/tests/headers/method-mangling.hpp b/tests/headers/method-mangling.hpp similarity index 100% rename from libbindgen/tests/headers/method-mangling.hpp rename to tests/headers/method-mangling.hpp diff --git a/libbindgen/tests/headers/module-whitelisted.hpp b/tests/headers/module-whitelisted.hpp similarity index 100% rename from libbindgen/tests/headers/module-whitelisted.hpp rename to tests/headers/module-whitelisted.hpp diff --git a/libbindgen/tests/headers/msvc-no-usr.hpp b/tests/headers/msvc-no-usr.hpp similarity index 100% rename from libbindgen/tests/headers/msvc-no-usr.hpp rename to tests/headers/msvc-no-usr.hpp diff --git a/libbindgen/tests/headers/multiple-inherit-empty-correct-layout.hpp b/tests/headers/multiple-inherit-empty-correct-layout.hpp similarity index 100% rename from libbindgen/tests/headers/multiple-inherit-empty-correct-layout.hpp rename to tests/headers/multiple-inherit-empty-correct-layout.hpp diff --git a/libbindgen/tests/headers/mutable.hpp b/tests/headers/mutable.hpp similarity index 100% rename from libbindgen/tests/headers/mutable.hpp rename to tests/headers/mutable.hpp diff --git a/libbindgen/tests/headers/namespace.hpp b/tests/headers/namespace.hpp similarity index 100% rename from libbindgen/tests/headers/namespace.hpp rename to tests/headers/namespace.hpp diff --git a/libbindgen/tests/headers/nested.hpp b/tests/headers/nested.hpp similarity index 100% rename from libbindgen/tests/headers/nested.hpp rename to tests/headers/nested.hpp diff --git a/libbindgen/tests/headers/nested_vtable.hpp b/tests/headers/nested_vtable.hpp similarity index 100% rename from libbindgen/tests/headers/nested_vtable.hpp rename to tests/headers/nested_vtable.hpp diff --git a/libbindgen/tests/headers/nested_within_namespace.hpp b/tests/headers/nested_within_namespace.hpp similarity index 100% rename from libbindgen/tests/headers/nested_within_namespace.hpp rename to tests/headers/nested_within_namespace.hpp diff --git a/libbindgen/tests/headers/no-std.h b/tests/headers/no-std.h similarity index 100% rename from libbindgen/tests/headers/no-std.h rename to tests/headers/no-std.h diff --git a/libbindgen/tests/headers/no_copy.hpp b/tests/headers/no_copy.hpp similarity index 100% rename from libbindgen/tests/headers/no_copy.hpp rename to tests/headers/no_copy.hpp diff --git a/libbindgen/tests/headers/nsStyleAutoArray.hpp b/tests/headers/nsStyleAutoArray.hpp similarity index 100% rename from libbindgen/tests/headers/nsStyleAutoArray.hpp rename to tests/headers/nsStyleAutoArray.hpp diff --git a/libbindgen/tests/headers/only_bitfields.hpp b/tests/headers/only_bitfields.hpp similarity index 100% rename from libbindgen/tests/headers/only_bitfields.hpp rename to tests/headers/only_bitfields.hpp diff --git a/libbindgen/tests/headers/opaque-tracing.hpp b/tests/headers/opaque-tracing.hpp similarity index 100% rename from libbindgen/tests/headers/opaque-tracing.hpp rename to tests/headers/opaque-tracing.hpp diff --git a/libbindgen/tests/headers/opaque_in_struct.hpp b/tests/headers/opaque_in_struct.hpp similarity index 100% rename from libbindgen/tests/headers/opaque_in_struct.hpp rename to tests/headers/opaque_in_struct.hpp diff --git a/libbindgen/tests/headers/opaque_pointer.hpp b/tests/headers/opaque_pointer.hpp similarity index 100% rename from libbindgen/tests/headers/opaque_pointer.hpp rename to tests/headers/opaque_pointer.hpp diff --git a/libbindgen/tests/headers/opaque_typedef.hpp b/tests/headers/opaque_typedef.hpp similarity index 100% rename from libbindgen/tests/headers/opaque_typedef.hpp rename to tests/headers/opaque_typedef.hpp diff --git a/libbindgen/tests/headers/overflowed_enum.hpp b/tests/headers/overflowed_enum.hpp similarity index 100% rename from libbindgen/tests/headers/overflowed_enum.hpp rename to tests/headers/overflowed_enum.hpp diff --git a/libbindgen/tests/headers/overloading.hpp b/tests/headers/overloading.hpp similarity index 100% rename from libbindgen/tests/headers/overloading.hpp rename to tests/headers/overloading.hpp diff --git a/libbindgen/tests/headers/private.hpp b/tests/headers/private.hpp similarity index 100% rename from libbindgen/tests/headers/private.hpp rename to tests/headers/private.hpp diff --git a/libbindgen/tests/headers/public-dtor.hpp b/tests/headers/public-dtor.hpp similarity index 100% rename from libbindgen/tests/headers/public-dtor.hpp rename to tests/headers/public-dtor.hpp diff --git a/libbindgen/tests/headers/redeclaration.hpp b/tests/headers/redeclaration.hpp similarity index 100% rename from libbindgen/tests/headers/redeclaration.hpp rename to tests/headers/redeclaration.hpp diff --git a/libbindgen/tests/headers/ref_argument_array.hpp b/tests/headers/ref_argument_array.hpp similarity index 100% rename from libbindgen/tests/headers/ref_argument_array.hpp rename to tests/headers/ref_argument_array.hpp diff --git a/libbindgen/tests/headers/reparented_replacement.hpp b/tests/headers/reparented_replacement.hpp similarity index 100% rename from libbindgen/tests/headers/reparented_replacement.hpp rename to tests/headers/reparented_replacement.hpp diff --git a/libbindgen/tests/headers/replace_template_alias.hpp b/tests/headers/replace_template_alias.hpp similarity index 100% rename from libbindgen/tests/headers/replace_template_alias.hpp rename to tests/headers/replace_template_alias.hpp diff --git a/libbindgen/tests/headers/replace_use.hpp b/tests/headers/replace_use.hpp similarity index 100% rename from libbindgen/tests/headers/replace_use.hpp rename to tests/headers/replace_use.hpp diff --git a/libbindgen/tests/headers/replaces_double.hpp b/tests/headers/replaces_double.hpp similarity index 100% rename from libbindgen/tests/headers/replaces_double.hpp rename to tests/headers/replaces_double.hpp diff --git a/libbindgen/tests/headers/resolved_type_def_function.h b/tests/headers/resolved_type_def_function.h similarity index 100% rename from libbindgen/tests/headers/resolved_type_def_function.h rename to tests/headers/resolved_type_def_function.h diff --git a/libbindgen/tests/headers/same_struct_name_in_different_namespaces.hpp b/tests/headers/same_struct_name_in_different_namespaces.hpp similarity index 100% rename from libbindgen/tests/headers/same_struct_name_in_different_namespaces.hpp rename to tests/headers/same_struct_name_in_different_namespaces.hpp diff --git a/libbindgen/tests/headers/size_t_template.hpp b/tests/headers/size_t_template.hpp similarity index 100% rename from libbindgen/tests/headers/size_t_template.hpp rename to tests/headers/size_t_template.hpp diff --git a/libbindgen/tests/headers/struct_containing_forward_declared_struct.h b/tests/headers/struct_containing_forward_declared_struct.h similarity index 100% rename from libbindgen/tests/headers/struct_containing_forward_declared_struct.h rename to tests/headers/struct_containing_forward_declared_struct.h diff --git a/libbindgen/tests/headers/struct_with_anon_struct.h b/tests/headers/struct_with_anon_struct.h similarity index 100% rename from libbindgen/tests/headers/struct_with_anon_struct.h rename to tests/headers/struct_with_anon_struct.h diff --git a/libbindgen/tests/headers/struct_with_anon_struct_array.h b/tests/headers/struct_with_anon_struct_array.h similarity index 100% rename from libbindgen/tests/headers/struct_with_anon_struct_array.h rename to tests/headers/struct_with_anon_struct_array.h diff --git a/libbindgen/tests/headers/struct_with_anon_struct_pointer.h b/tests/headers/struct_with_anon_struct_pointer.h similarity index 100% rename from libbindgen/tests/headers/struct_with_anon_struct_pointer.h rename to tests/headers/struct_with_anon_struct_pointer.h diff --git a/libbindgen/tests/headers/struct_with_anon_union.h b/tests/headers/struct_with_anon_union.h similarity index 100% rename from libbindgen/tests/headers/struct_with_anon_union.h rename to tests/headers/struct_with_anon_union.h diff --git a/libbindgen/tests/headers/struct_with_anon_unnamed_struct.h b/tests/headers/struct_with_anon_unnamed_struct.h similarity index 100% rename from libbindgen/tests/headers/struct_with_anon_unnamed_struct.h rename to tests/headers/struct_with_anon_unnamed_struct.h diff --git a/libbindgen/tests/headers/struct_with_anon_unnamed_union.h b/tests/headers/struct_with_anon_unnamed_union.h similarity index 100% rename from libbindgen/tests/headers/struct_with_anon_unnamed_union.h rename to tests/headers/struct_with_anon_unnamed_union.h diff --git a/libbindgen/tests/headers/struct_with_bitfields.h b/tests/headers/struct_with_bitfields.h similarity index 100% rename from libbindgen/tests/headers/struct_with_bitfields.h rename to tests/headers/struct_with_bitfields.h diff --git a/libbindgen/tests/headers/struct_with_derive_debug.h b/tests/headers/struct_with_derive_debug.h similarity index 100% rename from libbindgen/tests/headers/struct_with_derive_debug.h rename to tests/headers/struct_with_derive_debug.h diff --git a/libbindgen/tests/headers/struct_with_nesting.h b/tests/headers/struct_with_nesting.h similarity index 100% rename from libbindgen/tests/headers/struct_with_nesting.h rename to tests/headers/struct_with_nesting.h diff --git a/libbindgen/tests/headers/struct_with_packing.h b/tests/headers/struct_with_packing.h similarity index 100% rename from libbindgen/tests/headers/struct_with_packing.h rename to tests/headers/struct_with_packing.h diff --git a/libbindgen/tests/headers/struct_with_struct.h b/tests/headers/struct_with_struct.h similarity index 100% rename from libbindgen/tests/headers/struct_with_struct.h rename to tests/headers/struct_with_struct.h diff --git a/libbindgen/tests/headers/struct_with_typedef_template_arg.hpp b/tests/headers/struct_with_typedef_template_arg.hpp similarity index 100% rename from libbindgen/tests/headers/struct_with_typedef_template_arg.hpp rename to tests/headers/struct_with_typedef_template_arg.hpp diff --git a/libbindgen/tests/headers/template.hpp b/tests/headers/template.hpp similarity index 100% rename from libbindgen/tests/headers/template.hpp rename to tests/headers/template.hpp diff --git a/libbindgen/tests/headers/template_alias.hpp b/tests/headers/template_alias.hpp similarity index 100% rename from libbindgen/tests/headers/template_alias.hpp rename to tests/headers/template_alias.hpp diff --git a/libbindgen/tests/headers/template_alias_basic.hpp b/tests/headers/template_alias_basic.hpp similarity index 100% rename from libbindgen/tests/headers/template_alias_basic.hpp rename to tests/headers/template_alias_basic.hpp diff --git a/libbindgen/tests/headers/template_alias_namespace.hpp b/tests/headers/template_alias_namespace.hpp similarity index 100% rename from libbindgen/tests/headers/template_alias_namespace.hpp rename to tests/headers/template_alias_namespace.hpp diff --git a/libbindgen/tests/headers/template_typedef_transitive_param.hpp b/tests/headers/template_typedef_transitive_param.hpp similarity index 100% rename from libbindgen/tests/headers/template_typedef_transitive_param.hpp rename to tests/headers/template_typedef_transitive_param.hpp diff --git a/libbindgen/tests/headers/template_typedefs.hpp b/tests/headers/template_typedefs.hpp similarity index 100% rename from libbindgen/tests/headers/template_typedefs.hpp rename to tests/headers/template_typedefs.hpp diff --git a/libbindgen/tests/headers/templateref_opaque.hpp b/tests/headers/templateref_opaque.hpp similarity index 100% rename from libbindgen/tests/headers/templateref_opaque.hpp rename to tests/headers/templateref_opaque.hpp diff --git a/libbindgen/tests/headers/type-referenced-by-whitelisted-function.h b/tests/headers/type-referenced-by-whitelisted-function.h similarity index 100% rename from libbindgen/tests/headers/type-referenced-by-whitelisted-function.h rename to tests/headers/type-referenced-by-whitelisted-function.h diff --git a/libbindgen/tests/headers/type_alias_empty.hpp b/tests/headers/type_alias_empty.hpp similarity index 100% rename from libbindgen/tests/headers/type_alias_empty.hpp rename to tests/headers/type_alias_empty.hpp diff --git a/libbindgen/tests/headers/type_alias_partial_template_especialization.hpp b/tests/headers/type_alias_partial_template_especialization.hpp similarity index 100% rename from libbindgen/tests/headers/type_alias_partial_template_especialization.hpp rename to tests/headers/type_alias_partial_template_especialization.hpp diff --git a/libbindgen/tests/headers/type_alias_template_specialized.hpp b/tests/headers/type_alias_template_specialized.hpp similarity index 100% rename from libbindgen/tests/headers/type_alias_template_specialized.hpp rename to tests/headers/type_alias_template_specialized.hpp diff --git a/libbindgen/tests/headers/typedefd-array-as-function-arg.h b/tests/headers/typedefd-array-as-function-arg.h similarity index 100% rename from libbindgen/tests/headers/typedefd-array-as-function-arg.h rename to tests/headers/typedefd-array-as-function-arg.h diff --git a/libbindgen/tests/headers/typeref.hpp b/tests/headers/typeref.hpp similarity index 100% rename from libbindgen/tests/headers/typeref.hpp rename to tests/headers/typeref.hpp diff --git a/libbindgen/tests/headers/union-in-ns.hpp b/tests/headers/union-in-ns.hpp similarity index 100% rename from libbindgen/tests/headers/union-in-ns.hpp rename to tests/headers/union-in-ns.hpp diff --git a/libbindgen/tests/headers/union_dtor.hpp b/tests/headers/union_dtor.hpp similarity index 100% rename from libbindgen/tests/headers/union_dtor.hpp rename to tests/headers/union_dtor.hpp diff --git a/libbindgen/tests/headers/union_fields.hpp b/tests/headers/union_fields.hpp similarity index 100% rename from libbindgen/tests/headers/union_fields.hpp rename to tests/headers/union_fields.hpp diff --git a/libbindgen/tests/headers/union_template.hpp b/tests/headers/union_template.hpp similarity index 100% rename from libbindgen/tests/headers/union_template.hpp rename to tests/headers/union_template.hpp diff --git a/libbindgen/tests/headers/union_with_anon_struct.h b/tests/headers/union_with_anon_struct.h similarity index 100% rename from libbindgen/tests/headers/union_with_anon_struct.h rename to tests/headers/union_with_anon_struct.h diff --git a/libbindgen/tests/headers/union_with_anon_struct_bitfield.h b/tests/headers/union_with_anon_struct_bitfield.h similarity index 100% rename from libbindgen/tests/headers/union_with_anon_struct_bitfield.h rename to tests/headers/union_with_anon_struct_bitfield.h diff --git a/libbindgen/tests/headers/union_with_anon_union.h b/tests/headers/union_with_anon_union.h similarity index 100% rename from libbindgen/tests/headers/union_with_anon_union.h rename to tests/headers/union_with_anon_union.h diff --git a/libbindgen/tests/headers/union_with_anon_unnamed_struct.h b/tests/headers/union_with_anon_unnamed_struct.h similarity index 100% rename from libbindgen/tests/headers/union_with_anon_unnamed_struct.h rename to tests/headers/union_with_anon_unnamed_struct.h diff --git a/libbindgen/tests/headers/union_with_anon_unnamed_union.h b/tests/headers/union_with_anon_unnamed_union.h similarity index 100% rename from libbindgen/tests/headers/union_with_anon_unnamed_union.h rename to tests/headers/union_with_anon_unnamed_union.h diff --git a/libbindgen/tests/headers/union_with_big_member.h b/tests/headers/union_with_big_member.h similarity index 100% rename from libbindgen/tests/headers/union_with_big_member.h rename to tests/headers/union_with_big_member.h diff --git a/libbindgen/tests/headers/union_with_nesting.h b/tests/headers/union_with_nesting.h similarity index 100% rename from libbindgen/tests/headers/union_with_nesting.h rename to tests/headers/union_with_nesting.h diff --git a/libbindgen/tests/headers/unknown_attr.h b/tests/headers/unknown_attr.h similarity index 100% rename from libbindgen/tests/headers/unknown_attr.h rename to tests/headers/unknown_attr.h diff --git a/libbindgen/tests/headers/use-core.h b/tests/headers/use-core.h similarity index 100% rename from libbindgen/tests/headers/use-core.h rename to tests/headers/use-core.h diff --git a/libbindgen/tests/headers/using.hpp b/tests/headers/using.hpp similarity index 100% rename from libbindgen/tests/headers/using.hpp rename to tests/headers/using.hpp diff --git a/libbindgen/tests/headers/var-tracing.hpp b/tests/headers/var-tracing.hpp similarity index 100% rename from libbindgen/tests/headers/var-tracing.hpp rename to tests/headers/var-tracing.hpp diff --git a/libbindgen/tests/headers/variadic-method.hpp b/tests/headers/variadic-method.hpp similarity index 100% rename from libbindgen/tests/headers/variadic-method.hpp rename to tests/headers/variadic-method.hpp diff --git a/libbindgen/tests/headers/variadic_template_function.hpp b/tests/headers/variadic_template_function.hpp similarity index 100% rename from libbindgen/tests/headers/variadic_template_function.hpp rename to tests/headers/variadic_template_function.hpp diff --git a/libbindgen/tests/headers/vector.hpp b/tests/headers/vector.hpp similarity index 100% rename from libbindgen/tests/headers/vector.hpp rename to tests/headers/vector.hpp diff --git a/libbindgen/tests/headers/virtual_dtor.hpp b/tests/headers/virtual_dtor.hpp similarity index 100% rename from libbindgen/tests/headers/virtual_dtor.hpp rename to tests/headers/virtual_dtor.hpp diff --git a/libbindgen/tests/headers/virtual_inheritance.hpp b/tests/headers/virtual_inheritance.hpp similarity index 100% rename from libbindgen/tests/headers/virtual_inheritance.hpp rename to tests/headers/virtual_inheritance.hpp diff --git a/libbindgen/tests/headers/virtual_overloaded.hpp b/tests/headers/virtual_overloaded.hpp similarity index 100% rename from libbindgen/tests/headers/virtual_overloaded.hpp rename to tests/headers/virtual_overloaded.hpp diff --git a/libbindgen/tests/headers/vtable_recursive_sig.hpp b/tests/headers/vtable_recursive_sig.hpp similarity index 100% rename from libbindgen/tests/headers/vtable_recursive_sig.hpp rename to tests/headers/vtable_recursive_sig.hpp diff --git a/libbindgen/tests/headers/weird_bitfields.hpp b/tests/headers/weird_bitfields.hpp similarity index 100% rename from libbindgen/tests/headers/weird_bitfields.hpp rename to tests/headers/weird_bitfields.hpp diff --git a/libbindgen/tests/headers/what_is_going_on.hpp b/tests/headers/what_is_going_on.hpp similarity index 100% rename from libbindgen/tests/headers/what_is_going_on.hpp rename to tests/headers/what_is_going_on.hpp diff --git a/libbindgen/tests/headers/whitelist-namespaces-basic.hpp b/tests/headers/whitelist-namespaces-basic.hpp similarity index 100% rename from libbindgen/tests/headers/whitelist-namespaces-basic.hpp rename to tests/headers/whitelist-namespaces-basic.hpp diff --git a/libbindgen/tests/headers/whitelist-namespaces.hpp b/tests/headers/whitelist-namespaces.hpp similarity index 100% rename from libbindgen/tests/headers/whitelist-namespaces.hpp rename to tests/headers/whitelist-namespaces.hpp diff --git a/libbindgen/tests/headers/whitelist_basic.hpp b/tests/headers/whitelist_basic.hpp similarity index 100% rename from libbindgen/tests/headers/whitelist_basic.hpp rename to tests/headers/whitelist_basic.hpp diff --git a/libbindgen/tests/headers/whitelist_fix.hpp b/tests/headers/whitelist_fix.hpp similarity index 100% rename from libbindgen/tests/headers/whitelist_fix.hpp rename to tests/headers/whitelist_fix.hpp diff --git a/libbindgen/tests/headers/whitelist_vars.h b/tests/headers/whitelist_vars.h similarity index 100% rename from libbindgen/tests/headers/whitelist_vars.h rename to tests/headers/whitelist_vars.h diff --git a/libbindgen/tests/tests.rs b/tests/tests.rs similarity index 95% rename from libbindgen/tests/tests.rs rename to tests/tests.rs index 014308794f..05c8ad2c73 100644 --- a/libbindgen/tests/tests.rs +++ b/tests/tests.rs @@ -1,18 +1,19 @@ extern crate clap; extern crate diff; -extern crate libbindgen; +extern crate bindgen; extern crate shlex; +use bindgen::Builder; use std::fs; use std::io::{BufRead, BufReader, Error, ErrorKind, Read, Write}; use std::path::PathBuf; -#[path="../../bindgen/src/options.rs"] +#[path="../src/options.rs"] mod options; use options::builder_from_flags; fn compare_generated_header(header: &PathBuf, - builder: libbindgen::Builder) + builder: Builder) -> Result<(), Error> { let file_name = try!(header.file_name() .ok_or(Error::new(ErrorKind::Other, "spawn_bindgen expects a file"))); @@ -68,7 +69,7 @@ fn compare_generated_header(header: &PathBuf, } fn create_bindgen_builder(header: &PathBuf) - -> Result, Error> { + -> Result, Error> { let source = try!(fs::File::open(header)); let reader = BufReader::new(source); diff --git a/libbindgen/tests/uses/.gitignore b/tests/uses/.gitignore similarity index 100% rename from libbindgen/tests/uses/.gitignore rename to tests/uses/.gitignore