diff --git a/.github/workflows/all-rust-targets.yml b/.github/workflows/all-rust-targets.yml new file mode 100644 index 0000000000..6cef18bac1 --- /dev/null +++ b/.github/workflows/all-rust-targets.yml @@ -0,0 +1,32 @@ +name: all-rust-targets + +on: + push: + branches: + - master + pull_request: + branches: + - master + +jobs: + test-expectations: + runs-on: ${{matrix.os}} + continue-on-error: true + strategy: + matrix: + # TODO(#1954): These should be run on mac too, but turns out they're + # broken. + os: [ubuntu-latest, macos-latest] + rust: ["1.30.0", "1.33.0", "1.36.0", "1.40.0", "1.47.0", "1.64.0", nightly] + steps: + - uses: actions/checkout@v3 + + - name: Install rust + uses: actions-rs/toolchain@v1 + with: + profile: minimal + toolchain: ${{matrix.rust}} + override: true + + - name: Test expectations + run: rm Cargo.toml; cd bindgen-tests/tests/expectations && cargo test diff --git a/bindgen-tests/tests/expectations/tests/.gitattributes b/bindgen-tests/tests/expectations/bindings/.gitattributes similarity index 100% rename from bindgen-tests/tests/expectations/tests/.gitattributes rename to bindgen-tests/tests/expectations/bindings/.gitattributes diff --git a/bindgen-tests/tests/expectations/tests/16-byte-alignment.rs b/bindgen-tests/tests/expectations/bindings/16-byte-alignment.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/16-byte-alignment.rs rename to bindgen-tests/tests/expectations/bindings/16-byte-alignment.rs diff --git a/bindgen-tests/tests/expectations/tests/16-byte-alignment_1_0.rs b/bindgen-tests/tests/expectations/bindings/16-byte-alignment_1_0.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/16-byte-alignment_1_0.rs rename to bindgen-tests/tests/expectations/bindings/16-byte-alignment_1_0.rs diff --git a/bindgen-tests/tests/expectations/tests/381-decltype-alias.rs b/bindgen-tests/tests/expectations/bindings/381-decltype-alias.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/381-decltype-alias.rs rename to bindgen-tests/tests/expectations/bindings/381-decltype-alias.rs diff --git a/bindgen-tests/tests/expectations/tests/abi-override.rs b/bindgen-tests/tests/expectations/bindings/abi-override.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/abi-override.rs rename to bindgen-tests/tests/expectations/bindings/abi-override.rs diff --git a/bindgen-tests/tests/expectations/tests/accessors.rs b/bindgen-tests/tests/expectations/bindings/accessors.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/accessors.rs rename to bindgen-tests/tests/expectations/bindings/accessors.rs diff --git a/bindgen-tests/tests/expectations/tests/allowlist-file.rs b/bindgen-tests/tests/expectations/bindings/allowlist-file.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/allowlist-file.rs rename to bindgen-tests/tests/expectations/bindings/allowlist-file.rs diff --git a/bindgen-tests/tests/expectations/tests/allowlist-namespaces-basic.rs b/bindgen-tests/tests/expectations/bindings/allowlist-namespaces-basic.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/allowlist-namespaces-basic.rs rename to bindgen-tests/tests/expectations/bindings/allowlist-namespaces-basic.rs diff --git a/bindgen-tests/tests/expectations/tests/allowlist-namespaces.rs b/bindgen-tests/tests/expectations/bindings/allowlist-namespaces.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/allowlist-namespaces.rs rename to bindgen-tests/tests/expectations/bindings/allowlist-namespaces.rs diff --git a/bindgen-tests/tests/expectations/tests/allowlist_basic.rs b/bindgen-tests/tests/expectations/bindings/allowlist_basic.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/allowlist_basic.rs rename to bindgen-tests/tests/expectations/bindings/allowlist_basic.rs diff --git a/bindgen-tests/tests/expectations/tests/allowlist_fix.rs b/bindgen-tests/tests/expectations/bindings/allowlist_fix.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/allowlist_fix.rs rename to bindgen-tests/tests/expectations/bindings/allowlist_fix.rs diff --git a/bindgen-tests/tests/expectations/tests/allowlist_vars.rs b/bindgen-tests/tests/expectations/bindings/allowlist_vars.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/allowlist_vars.rs rename to bindgen-tests/tests/expectations/bindings/allowlist_vars.rs diff --git a/bindgen-tests/tests/expectations/tests/allowlist_warnings.rs b/bindgen-tests/tests/expectations/bindings/allowlist_warnings.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/allowlist_warnings.rs rename to bindgen-tests/tests/expectations/bindings/allowlist_warnings.rs diff --git a/bindgen-tests/tests/expectations/tests/allowlisted-item-references-no-hash.rs b/bindgen-tests/tests/expectations/bindings/allowlisted-item-references-no-hash.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/allowlisted-item-references-no-hash.rs rename to bindgen-tests/tests/expectations/bindings/allowlisted-item-references-no-hash.rs diff --git a/bindgen-tests/tests/expectations/tests/allowlisted-item-references-no-partialeq.rs b/bindgen-tests/tests/expectations/bindings/allowlisted-item-references-no-partialeq.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/allowlisted-item-references-no-partialeq.rs rename to bindgen-tests/tests/expectations/bindings/allowlisted-item-references-no-partialeq.rs diff --git a/bindgen-tests/tests/expectations/tests/allowlisted_item_references_no_copy.rs b/bindgen-tests/tests/expectations/bindings/allowlisted_item_references_no_copy.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/allowlisted_item_references_no_copy.rs rename to bindgen-tests/tests/expectations/bindings/allowlisted_item_references_no_copy.rs diff --git a/bindgen-tests/tests/expectations/tests/annotation_hide.rs b/bindgen-tests/tests/expectations/bindings/annotation_hide.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/annotation_hide.rs rename to bindgen-tests/tests/expectations/bindings/annotation_hide.rs diff --git a/bindgen-tests/tests/expectations/tests/anon-fields-prefix.rs b/bindgen-tests/tests/expectations/bindings/anon-fields-prefix.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/anon-fields-prefix.rs rename to bindgen-tests/tests/expectations/bindings/anon-fields-prefix.rs diff --git a/bindgen-tests/tests/expectations/tests/anon_enum.rs b/bindgen-tests/tests/expectations/bindings/anon_enum.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/anon_enum.rs rename to bindgen-tests/tests/expectations/bindings/anon_enum.rs diff --git a/bindgen-tests/tests/expectations/tests/anon_enum_allowlist.rs b/bindgen-tests/tests/expectations/bindings/anon_enum_allowlist.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/anon_enum_allowlist.rs rename to bindgen-tests/tests/expectations/bindings/anon_enum_allowlist.rs diff --git a/bindgen-tests/tests/expectations/tests/anon_enum_trait.rs b/bindgen-tests/tests/expectations/bindings/anon_enum_trait.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/anon_enum_trait.rs rename to bindgen-tests/tests/expectations/bindings/anon_enum_trait.rs diff --git a/bindgen-tests/tests/expectations/tests/anon_struct_in_union.rs b/bindgen-tests/tests/expectations/bindings/anon_struct_in_union.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/anon_struct_in_union.rs rename to bindgen-tests/tests/expectations/bindings/anon_struct_in_union.rs diff --git a/bindgen-tests/tests/expectations/tests/anon_struct_in_union_1_0.rs b/bindgen-tests/tests/expectations/bindings/anon_struct_in_union_1_0.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/anon_struct_in_union_1_0.rs rename to bindgen-tests/tests/expectations/bindings/anon_struct_in_union_1_0.rs diff --git a/bindgen-tests/tests/expectations/tests/anon_union.rs b/bindgen-tests/tests/expectations/bindings/anon_union.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/anon_union.rs rename to bindgen-tests/tests/expectations/bindings/anon_union.rs diff --git a/bindgen-tests/tests/expectations/tests/anon_union_1_0.rs b/bindgen-tests/tests/expectations/bindings/anon_union_1_0.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/anon_union_1_0.rs rename to bindgen-tests/tests/expectations/bindings/anon_union_1_0.rs diff --git a/bindgen-tests/tests/expectations/tests/anonymous-template-types.rs b/bindgen-tests/tests/expectations/bindings/anonymous-template-types.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/anonymous-template-types.rs rename to bindgen-tests/tests/expectations/bindings/anonymous-template-types.rs diff --git a/bindgen-tests/tests/expectations/tests/arg_keyword.rs b/bindgen-tests/tests/expectations/bindings/arg_keyword.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/arg_keyword.rs rename to bindgen-tests/tests/expectations/bindings/arg_keyword.rs diff --git a/bindgen-tests/tests/expectations/tests/array-of-zero-sized-types.rs b/bindgen-tests/tests/expectations/bindings/array-of-zero-sized-types.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/array-of-zero-sized-types.rs rename to bindgen-tests/tests/expectations/bindings/array-of-zero-sized-types.rs diff --git a/bindgen-tests/tests/expectations/tests/attribute_warn_unused_result.rs b/bindgen-tests/tests/expectations/bindings/attribute_warn_unused_result.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/attribute_warn_unused_result.rs rename to bindgen-tests/tests/expectations/bindings/attribute_warn_unused_result.rs diff --git a/bindgen-tests/tests/expectations/tests/attribute_warn_unused_result_no_attribute_detection.rs b/bindgen-tests/tests/expectations/bindings/attribute_warn_unused_result_no_attribute_detection.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/attribute_warn_unused_result_no_attribute_detection.rs rename to bindgen-tests/tests/expectations/bindings/attribute_warn_unused_result_no_attribute_detection.rs diff --git a/bindgen-tests/tests/expectations/tests/attribute_warn_unused_result_pre_1_27.rs b/bindgen-tests/tests/expectations/bindings/attribute_warn_unused_result_pre_1_27.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/attribute_warn_unused_result_pre_1_27.rs rename to bindgen-tests/tests/expectations/bindings/attribute_warn_unused_result_pre_1_27.rs diff --git a/bindgen-tests/tests/expectations/tests/bad-namespace-parenthood-inheritance.rs b/bindgen-tests/tests/expectations/bindings/bad-namespace-parenthood-inheritance.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/bad-namespace-parenthood-inheritance.rs rename to bindgen-tests/tests/expectations/bindings/bad-namespace-parenthood-inheritance.rs diff --git a/bindgen-tests/tests/expectations/tests/base-to-derived.rs b/bindgen-tests/tests/expectations/bindings/base-to-derived.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/base-to-derived.rs rename to bindgen-tests/tests/expectations/bindings/base-to-derived.rs diff --git a/bindgen-tests/tests/expectations/tests/bindgen-union-inside-namespace.rs b/bindgen-tests/tests/expectations/bindings/bindgen-union-inside-namespace.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/bindgen-union-inside-namespace.rs rename to bindgen-tests/tests/expectations/bindings/bindgen-union-inside-namespace.rs diff --git a/bindgen-tests/tests/expectations/tests/bitfield-32bit-overflow.rs b/bindgen-tests/tests/expectations/bindings/bitfield-32bit-overflow.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/bitfield-32bit-overflow.rs rename to bindgen-tests/tests/expectations/bindings/bitfield-32bit-overflow.rs diff --git a/bindgen-tests/tests/expectations/tests/bitfield-enum-basic.rs b/bindgen-tests/tests/expectations/bindings/bitfield-enum-basic.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/bitfield-enum-basic.rs rename to bindgen-tests/tests/expectations/bindings/bitfield-enum-basic.rs diff --git a/bindgen-tests/tests/expectations/tests/bitfield-enum-repr-c.rs b/bindgen-tests/tests/expectations/bindings/bitfield-enum-repr-c.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/bitfield-enum-repr-c.rs rename to bindgen-tests/tests/expectations/bindings/bitfield-enum-repr-c.rs diff --git a/bindgen-tests/tests/expectations/tests/bitfield-enum-repr-transparent.rs b/bindgen-tests/tests/expectations/bindings/bitfield-enum-repr-transparent.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/bitfield-enum-repr-transparent.rs rename to bindgen-tests/tests/expectations/bindings/bitfield-enum-repr-transparent.rs diff --git a/bindgen-tests/tests/expectations/tests/bitfield-large.rs b/bindgen-tests/tests/expectations/bindings/bitfield-large.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/bitfield-large.rs rename to bindgen-tests/tests/expectations/bindings/bitfield-large.rs diff --git a/bindgen-tests/tests/expectations/tests/bitfield-linux-32.rs b/bindgen-tests/tests/expectations/bindings/bitfield-linux-32.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/bitfield-linux-32.rs rename to bindgen-tests/tests/expectations/bindings/bitfield-linux-32.rs diff --git a/bindgen-tests/tests/expectations/tests/bitfield-method-same-name.rs b/bindgen-tests/tests/expectations/bindings/bitfield-method-same-name.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/bitfield-method-same-name.rs rename to bindgen-tests/tests/expectations/bindings/bitfield-method-same-name.rs diff --git a/bindgen-tests/tests/expectations/tests/bitfield_align.rs b/bindgen-tests/tests/expectations/bindings/bitfield_align.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/bitfield_align.rs rename to bindgen-tests/tests/expectations/bindings/bitfield_align.rs diff --git a/bindgen-tests/tests/expectations/tests/bitfield_align_2.rs b/bindgen-tests/tests/expectations/bindings/bitfield_align_2.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/bitfield_align_2.rs rename to bindgen-tests/tests/expectations/bindings/bitfield_align_2.rs diff --git a/bindgen-tests/tests/expectations/tests/bitfield_large_overflow.rs b/bindgen-tests/tests/expectations/bindings/bitfield_large_overflow.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/bitfield_large_overflow.rs rename to bindgen-tests/tests/expectations/bindings/bitfield_large_overflow.rs diff --git a/bindgen-tests/tests/expectations/tests/bitfield_method_mangling.rs b/bindgen-tests/tests/expectations/bindings/bitfield_method_mangling.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/bitfield_method_mangling.rs rename to bindgen-tests/tests/expectations/bindings/bitfield_method_mangling.rs diff --git a/bindgen-tests/tests/expectations/tests/bitfield_pragma_packed.rs b/bindgen-tests/tests/expectations/bindings/bitfield_pragma_packed.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/bitfield_pragma_packed.rs rename to bindgen-tests/tests/expectations/bindings/bitfield_pragma_packed.rs diff --git a/bindgen-tests/tests/expectations/tests/block_return_type.rs b/bindgen-tests/tests/expectations/bindings/block_return_type.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/block_return_type.rs rename to bindgen-tests/tests/expectations/bindings/block_return_type.rs diff --git a/bindgen-tests/tests/expectations/tests/blocklist-and-impl-debug.rs b/bindgen-tests/tests/expectations/bindings/blocklist-and-impl-debug.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/blocklist-and-impl-debug.rs rename to bindgen-tests/tests/expectations/bindings/blocklist-and-impl-debug.rs diff --git a/bindgen-tests/tests/expectations/tests/blocklist-file.rs b/bindgen-tests/tests/expectations/bindings/blocklist-file.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/blocklist-file.rs rename to bindgen-tests/tests/expectations/bindings/blocklist-file.rs diff --git a/bindgen-tests/tests/expectations/tests/blocklist-function.rs b/bindgen-tests/tests/expectations/bindings/blocklist-function.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/blocklist-function.rs rename to bindgen-tests/tests/expectations/bindings/blocklist-function.rs diff --git a/bindgen-tests/tests/expectations/tests/blocklist-item.rs b/bindgen-tests/tests/expectations/bindings/blocklist-item.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/blocklist-item.rs rename to bindgen-tests/tests/expectations/bindings/blocklist-item.rs diff --git a/bindgen-tests/tests/expectations/tests/blocklist-methods.rs b/bindgen-tests/tests/expectations/bindings/blocklist-methods.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/blocklist-methods.rs rename to bindgen-tests/tests/expectations/bindings/blocklist-methods.rs diff --git a/bindgen-tests/tests/expectations/tests/blocks-signature.rs b/bindgen-tests/tests/expectations/bindings/blocks-signature.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/blocks-signature.rs rename to bindgen-tests/tests/expectations/bindings/blocks-signature.rs diff --git a/bindgen-tests/tests/expectations/tests/blocks.rs b/bindgen-tests/tests/expectations/bindings/blocks.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/blocks.rs rename to bindgen-tests/tests/expectations/bindings/blocks.rs diff --git a/bindgen-tests/tests/expectations/tests/bug-1529681.rs b/bindgen-tests/tests/expectations/bindings/bug-1529681.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/bug-1529681.rs rename to bindgen-tests/tests/expectations/bindings/bug-1529681.rs diff --git a/bindgen-tests/tests/expectations/tests/builtin-template.rs b/bindgen-tests/tests/expectations/bindings/builtin-template.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/builtin-template.rs rename to bindgen-tests/tests/expectations/bindings/builtin-template.rs diff --git a/bindgen-tests/tests/expectations/tests/c-empty-layout.rs b/bindgen-tests/tests/expectations/bindings/c-empty-layout.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/c-empty-layout.rs rename to bindgen-tests/tests/expectations/bindings/c-empty-layout.rs diff --git a/bindgen-tests/tests/expectations/tests/c-unwind-abi-override-nightly.rs b/bindgen-tests/tests/expectations/bindings/c-unwind-abi-override-nightly.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/c-unwind-abi-override-nightly.rs rename to bindgen-tests/tests/expectations/bindings/c-unwind-abi-override-nightly.rs diff --git a/bindgen-tests/tests/expectations/tests/c_naming.rs b/bindgen-tests/tests/expectations/bindings/c_naming.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/c_naming.rs rename to bindgen-tests/tests/expectations/bindings/c_naming.rs diff --git a/bindgen-tests/tests/expectations/tests/call-conv-typedef.rs b/bindgen-tests/tests/expectations/bindings/call-conv-typedef.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/call-conv-typedef.rs rename to bindgen-tests/tests/expectations/bindings/call-conv-typedef.rs diff --git a/bindgen-tests/tests/expectations/tests/canonical-types.rs b/bindgen-tests/tests/expectations/bindings/canonical-types.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/canonical-types.rs rename to bindgen-tests/tests/expectations/bindings/canonical-types.rs diff --git a/bindgen-tests/tests/expectations/tests/canonical_path_without_namespacing.rs b/bindgen-tests/tests/expectations/bindings/canonical_path_without_namespacing.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/canonical_path_without_namespacing.rs rename to bindgen-tests/tests/expectations/bindings/canonical_path_without_namespacing.rs diff --git a/bindgen-tests/tests/expectations/tests/char.rs b/bindgen-tests/tests/expectations/bindings/char.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/char.rs rename to bindgen-tests/tests/expectations/bindings/char.rs diff --git a/bindgen-tests/tests/expectations/tests/class.rs b/bindgen-tests/tests/expectations/bindings/class.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/class.rs rename to bindgen-tests/tests/expectations/bindings/class.rs diff --git a/bindgen-tests/tests/expectations/tests/class_1_0.rs b/bindgen-tests/tests/expectations/bindings/class_1_0.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/class_1_0.rs rename to bindgen-tests/tests/expectations/bindings/class_1_0.rs diff --git a/bindgen-tests/tests/expectations/tests/class_nested.rs b/bindgen-tests/tests/expectations/bindings/class_nested.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/class_nested.rs rename to bindgen-tests/tests/expectations/bindings/class_nested.rs diff --git a/bindgen-tests/tests/expectations/tests/class_no_members.rs b/bindgen-tests/tests/expectations/bindings/class_no_members.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/class_no_members.rs rename to bindgen-tests/tests/expectations/bindings/class_no_members.rs diff --git a/bindgen-tests/tests/expectations/tests/class_static.rs b/bindgen-tests/tests/expectations/bindings/class_static.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/class_static.rs rename to bindgen-tests/tests/expectations/bindings/class_static.rs diff --git a/bindgen-tests/tests/expectations/tests/class_static_const.rs b/bindgen-tests/tests/expectations/bindings/class_static_const.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/class_static_const.rs rename to bindgen-tests/tests/expectations/bindings/class_static_const.rs diff --git a/bindgen-tests/tests/expectations/tests/class_use_as.rs b/bindgen-tests/tests/expectations/bindings/class_use_as.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/class_use_as.rs rename to bindgen-tests/tests/expectations/bindings/class_use_as.rs diff --git a/bindgen-tests/tests/expectations/tests/class_with_dtor.rs b/bindgen-tests/tests/expectations/bindings/class_with_dtor.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/class_with_dtor.rs rename to bindgen-tests/tests/expectations/bindings/class_with_dtor.rs diff --git a/bindgen-tests/tests/expectations/tests/class_with_inner_struct.rs b/bindgen-tests/tests/expectations/bindings/class_with_inner_struct.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/class_with_inner_struct.rs rename to bindgen-tests/tests/expectations/bindings/class_with_inner_struct.rs diff --git a/bindgen-tests/tests/expectations/tests/class_with_inner_struct_1_0.rs b/bindgen-tests/tests/expectations/bindings/class_with_inner_struct_1_0.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/class_with_inner_struct_1_0.rs rename to bindgen-tests/tests/expectations/bindings/class_with_inner_struct_1_0.rs diff --git a/bindgen-tests/tests/expectations/tests/class_with_typedef.rs b/bindgen-tests/tests/expectations/bindings/class_with_typedef.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/class_with_typedef.rs rename to bindgen-tests/tests/expectations/bindings/class_with_typedef.rs diff --git a/bindgen-tests/tests/expectations/tests/comment-indent.rs b/bindgen-tests/tests/expectations/bindings/comment-indent.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/comment-indent.rs rename to bindgen-tests/tests/expectations/bindings/comment-indent.rs diff --git a/bindgen-tests/tests/expectations/tests/complex.rs b/bindgen-tests/tests/expectations/bindings/complex.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/complex.rs rename to bindgen-tests/tests/expectations/bindings/complex.rs diff --git a/bindgen-tests/tests/expectations/tests/complex_global.rs b/bindgen-tests/tests/expectations/bindings/complex_global.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/complex_global.rs rename to bindgen-tests/tests/expectations/bindings/complex_global.rs diff --git a/bindgen-tests/tests/expectations/tests/const-const-mut-ptr.rs b/bindgen-tests/tests/expectations/bindings/const-const-mut-ptr.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/const-const-mut-ptr.rs rename to bindgen-tests/tests/expectations/bindings/const-const-mut-ptr.rs diff --git a/bindgen-tests/tests/expectations/tests/const_array.rs b/bindgen-tests/tests/expectations/bindings/const_array.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/const_array.rs rename to bindgen-tests/tests/expectations/bindings/const_array.rs diff --git a/bindgen-tests/tests/expectations/tests/const_array_fn_arg.rs b/bindgen-tests/tests/expectations/bindings/const_array_fn_arg.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/const_array_fn_arg.rs rename to bindgen-tests/tests/expectations/bindings/const_array_fn_arg.rs diff --git a/bindgen-tests/tests/expectations/tests/const_enum_unnamed.rs b/bindgen-tests/tests/expectations/bindings/const_enum_unnamed.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/const_enum_unnamed.rs rename to bindgen-tests/tests/expectations/bindings/const_enum_unnamed.rs diff --git a/bindgen-tests/tests/expectations/tests/const_multidim_array_fn_arg.rs b/bindgen-tests/tests/expectations/bindings/const_multidim_array_fn_arg.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/const_multidim_array_fn_arg.rs rename to bindgen-tests/tests/expectations/bindings/const_multidim_array_fn_arg.rs diff --git a/bindgen-tests/tests/expectations/tests/const_ptr.rs b/bindgen-tests/tests/expectations/bindings/const_ptr.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/const_ptr.rs rename to bindgen-tests/tests/expectations/bindings/const_ptr.rs diff --git a/bindgen-tests/tests/expectations/tests/const_resolved_ty.rs b/bindgen-tests/tests/expectations/bindings/const_resolved_ty.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/const_resolved_ty.rs rename to bindgen-tests/tests/expectations/bindings/const_resolved_ty.rs diff --git a/bindgen-tests/tests/expectations/tests/const_tparam.rs b/bindgen-tests/tests/expectations/bindings/const_tparam.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/const_tparam.rs rename to bindgen-tests/tests/expectations/bindings/const_tparam.rs diff --git a/bindgen-tests/tests/expectations/tests/constant-non-specialized-tp.rs b/bindgen-tests/tests/expectations/bindings/constant-non-specialized-tp.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/constant-non-specialized-tp.rs rename to bindgen-tests/tests/expectations/bindings/constant-non-specialized-tp.rs diff --git a/bindgen-tests/tests/expectations/tests/constified-enum-module-overflow.rs b/bindgen-tests/tests/expectations/bindings/constified-enum-module-overflow.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/constified-enum-module-overflow.rs rename to bindgen-tests/tests/expectations/bindings/constified-enum-module-overflow.rs diff --git a/bindgen-tests/tests/expectations/tests/constify-all-enums.rs b/bindgen-tests/tests/expectations/bindings/constify-all-enums.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/constify-all-enums.rs rename to bindgen-tests/tests/expectations/bindings/constify-all-enums.rs diff --git a/bindgen-tests/tests/expectations/tests/constify-enum.rs b/bindgen-tests/tests/expectations/bindings/constify-enum.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/constify-enum.rs rename to bindgen-tests/tests/expectations/bindings/constify-enum.rs diff --git a/bindgen-tests/tests/expectations/tests/constify-module-enums-basic.rs b/bindgen-tests/tests/expectations/bindings/constify-module-enums-basic.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/constify-module-enums-basic.rs rename to bindgen-tests/tests/expectations/bindings/constify-module-enums-basic.rs diff --git a/bindgen-tests/tests/expectations/tests/constify-module-enums-namespace.rs b/bindgen-tests/tests/expectations/bindings/constify-module-enums-namespace.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/constify-module-enums-namespace.rs rename to bindgen-tests/tests/expectations/bindings/constify-module-enums-namespace.rs diff --git a/bindgen-tests/tests/expectations/tests/constify-module-enums-shadow-name.rs b/bindgen-tests/tests/expectations/bindings/constify-module-enums-shadow-name.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/constify-module-enums-shadow-name.rs rename to bindgen-tests/tests/expectations/bindings/constify-module-enums-shadow-name.rs diff --git a/bindgen-tests/tests/expectations/tests/constify-module-enums-simple-alias.rs b/bindgen-tests/tests/expectations/bindings/constify-module-enums-simple-alias.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/constify-module-enums-simple-alias.rs rename to bindgen-tests/tests/expectations/bindings/constify-module-enums-simple-alias.rs diff --git a/bindgen-tests/tests/expectations/tests/constify-module-enums-simple-nonamespace.rs b/bindgen-tests/tests/expectations/bindings/constify-module-enums-simple-nonamespace.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/constify-module-enums-simple-nonamespace.rs rename to bindgen-tests/tests/expectations/bindings/constify-module-enums-simple-nonamespace.rs diff --git a/bindgen-tests/tests/expectations/tests/constify-module-enums-types.rs b/bindgen-tests/tests/expectations/bindings/constify-module-enums-types.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/constify-module-enums-types.rs rename to bindgen-tests/tests/expectations/bindings/constify-module-enums-types.rs diff --git a/bindgen-tests/tests/expectations/tests/constructor-tp.rs b/bindgen-tests/tests/expectations/bindings/constructor-tp.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/constructor-tp.rs rename to bindgen-tests/tests/expectations/bindings/constructor-tp.rs diff --git a/bindgen-tests/tests/expectations/tests/constructors.rs b/bindgen-tests/tests/expectations/bindings/constructors.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/constructors.rs rename to bindgen-tests/tests/expectations/bindings/constructors.rs diff --git a/bindgen-tests/tests/expectations/tests/constructors_1_33.rs b/bindgen-tests/tests/expectations/bindings/constructors_1_33.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/constructors_1_33.rs rename to bindgen-tests/tests/expectations/bindings/constructors_1_33.rs diff --git a/bindgen-tests/tests/expectations/tests/contains-vs-inherits-zero-sized.rs b/bindgen-tests/tests/expectations/bindings/contains-vs-inherits-zero-sized.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/contains-vs-inherits-zero-sized.rs rename to bindgen-tests/tests/expectations/bindings/contains-vs-inherits-zero-sized.rs diff --git a/bindgen-tests/tests/expectations/tests/convert-cpp-comment-to-rust.rs b/bindgen-tests/tests/expectations/bindings/convert-cpp-comment-to-rust.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/convert-cpp-comment-to-rust.rs rename to bindgen-tests/tests/expectations/bindings/convert-cpp-comment-to-rust.rs diff --git a/bindgen-tests/tests/expectations/tests/convert-floats.rs b/bindgen-tests/tests/expectations/bindings/convert-floats.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/convert-floats.rs rename to bindgen-tests/tests/expectations/bindings/convert-floats.rs diff --git a/bindgen-tests/tests/expectations/tests/core_ffi_c.rs b/bindgen-tests/tests/expectations/bindings/core_ffi_c.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/core_ffi_c.rs rename to bindgen-tests/tests/expectations/bindings/core_ffi_c.rs diff --git a/bindgen-tests/tests/expectations/tests/cpp-empty-layout.rs b/bindgen-tests/tests/expectations/bindings/cpp-empty-layout.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/cpp-empty-layout.rs rename to bindgen-tests/tests/expectations/bindings/cpp-empty-layout.rs diff --git a/bindgen-tests/tests/expectations/tests/crtp.rs b/bindgen-tests/tests/expectations/bindings/crtp.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/crtp.rs rename to bindgen-tests/tests/expectations/bindings/crtp.rs diff --git a/bindgen-tests/tests/expectations/tests/ctypes-prefix-path.rs b/bindgen-tests/tests/expectations/bindings/ctypes-prefix-path.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/ctypes-prefix-path.rs rename to bindgen-tests/tests/expectations/bindings/ctypes-prefix-path.rs diff --git a/bindgen-tests/tests/expectations/tests/dash_language.rs b/bindgen-tests/tests/expectations/bindings/dash_language.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/dash_language.rs rename to bindgen-tests/tests/expectations/bindings/dash_language.rs diff --git a/bindgen-tests/tests/expectations/tests/decl_extern_int_twice.rs b/bindgen-tests/tests/expectations/bindings/decl_extern_int_twice.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/decl_extern_int_twice.rs rename to bindgen-tests/tests/expectations/bindings/decl_extern_int_twice.rs diff --git a/bindgen-tests/tests/expectations/tests/decl_ptr_to_array.rs b/bindgen-tests/tests/expectations/bindings/decl_ptr_to_array.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/decl_ptr_to_array.rs rename to bindgen-tests/tests/expectations/bindings/decl_ptr_to_array.rs diff --git a/bindgen-tests/tests/expectations/tests/default-enum-style-constified-module.rs b/bindgen-tests/tests/expectations/bindings/default-enum-style-constified-module.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/default-enum-style-constified-module.rs rename to bindgen-tests/tests/expectations/bindings/default-enum-style-constified-module.rs diff --git a/bindgen-tests/tests/expectations/tests/default-macro-constant-type-signed.rs b/bindgen-tests/tests/expectations/bindings/default-macro-constant-type-signed.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/default-macro-constant-type-signed.rs rename to bindgen-tests/tests/expectations/bindings/default-macro-constant-type-signed.rs diff --git a/bindgen-tests/tests/expectations/tests/default-macro-constant-type-unsigned.rs b/bindgen-tests/tests/expectations/bindings/default-macro-constant-type-unsigned.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/default-macro-constant-type-unsigned.rs rename to bindgen-tests/tests/expectations/bindings/default-macro-constant-type-unsigned.rs diff --git a/bindgen-tests/tests/expectations/tests/default-macro-constant-type.rs b/bindgen-tests/tests/expectations/bindings/default-macro-constant-type.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/default-macro-constant-type.rs rename to bindgen-tests/tests/expectations/bindings/default-macro-constant-type.rs diff --git a/bindgen-tests/tests/expectations/tests/default-template-parameter.rs b/bindgen-tests/tests/expectations/bindings/default-template-parameter.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/default-template-parameter.rs rename to bindgen-tests/tests/expectations/bindings/default-template-parameter.rs diff --git a/bindgen-tests/tests/expectations/tests/deleted-function.rs b/bindgen-tests/tests/expectations/bindings/deleted-function.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/deleted-function.rs rename to bindgen-tests/tests/expectations/bindings/deleted-function.rs diff --git a/bindgen-tests/tests/expectations/tests/derive-bitfield-method-same-name.rs b/bindgen-tests/tests/expectations/bindings/derive-bitfield-method-same-name.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/derive-bitfield-method-same-name.rs rename to bindgen-tests/tests/expectations/bindings/derive-bitfield-method-same-name.rs diff --git a/bindgen-tests/tests/expectations/tests/derive-clone.rs b/bindgen-tests/tests/expectations/bindings/derive-clone.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/derive-clone.rs rename to bindgen-tests/tests/expectations/bindings/derive-clone.rs diff --git a/bindgen-tests/tests/expectations/tests/derive-clone_1_0.rs b/bindgen-tests/tests/expectations/bindings/derive-clone_1_0.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/derive-clone_1_0.rs rename to bindgen-tests/tests/expectations/bindings/derive-clone_1_0.rs diff --git a/bindgen-tests/tests/expectations/tests/derive-custom.rs b/bindgen-tests/tests/expectations/bindings/derive-custom.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/derive-custom.rs rename to bindgen-tests/tests/expectations/bindings/derive-custom.rs diff --git a/bindgen-tests/tests/expectations/tests/derive-debug-bitfield-core.rs b/bindgen-tests/tests/expectations/bindings/derive-debug-bitfield-core.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/derive-debug-bitfield-core.rs rename to bindgen-tests/tests/expectations/bindings/derive-debug-bitfield-core.rs diff --git a/bindgen-tests/tests/expectations/tests/derive-debug-bitfield.rs b/bindgen-tests/tests/expectations/bindings/derive-debug-bitfield.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/derive-debug-bitfield.rs rename to bindgen-tests/tests/expectations/bindings/derive-debug-bitfield.rs diff --git a/bindgen-tests/tests/expectations/tests/derive-debug-function-pointer.rs b/bindgen-tests/tests/expectations/bindings/derive-debug-function-pointer.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/derive-debug-function-pointer.rs rename to bindgen-tests/tests/expectations/bindings/derive-debug-function-pointer.rs diff --git a/bindgen-tests/tests/expectations/tests/derive-debug-generic.rs b/bindgen-tests/tests/expectations/bindings/derive-debug-generic.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/derive-debug-generic.rs rename to bindgen-tests/tests/expectations/bindings/derive-debug-generic.rs diff --git a/bindgen-tests/tests/expectations/tests/derive-debug-mangle-name.rs b/bindgen-tests/tests/expectations/bindings/derive-debug-mangle-name.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/derive-debug-mangle-name.rs rename to bindgen-tests/tests/expectations/bindings/derive-debug-mangle-name.rs diff --git a/bindgen-tests/tests/expectations/tests/derive-debug-opaque-template-instantiation.rs b/bindgen-tests/tests/expectations/bindings/derive-debug-opaque-template-instantiation.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/derive-debug-opaque-template-instantiation.rs rename to bindgen-tests/tests/expectations/bindings/derive-debug-opaque-template-instantiation.rs diff --git a/bindgen-tests/tests/expectations/tests/derive-debug-opaque.rs b/bindgen-tests/tests/expectations/bindings/derive-debug-opaque.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/derive-debug-opaque.rs rename to bindgen-tests/tests/expectations/bindings/derive-debug-opaque.rs diff --git a/bindgen-tests/tests/expectations/tests/derive-default-and-blocklist.rs b/bindgen-tests/tests/expectations/bindings/derive-default-and-blocklist.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/derive-default-and-blocklist.rs rename to bindgen-tests/tests/expectations/bindings/derive-default-and-blocklist.rs diff --git a/bindgen-tests/tests/expectations/tests/derive-fn-ptr.rs b/bindgen-tests/tests/expectations/bindings/derive-fn-ptr.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/derive-fn-ptr.rs rename to bindgen-tests/tests/expectations/bindings/derive-fn-ptr.rs diff --git a/bindgen-tests/tests/expectations/tests/derive-hash-and-blocklist.rs b/bindgen-tests/tests/expectations/bindings/derive-hash-and-blocklist.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/derive-hash-and-blocklist.rs rename to bindgen-tests/tests/expectations/bindings/derive-hash-and-blocklist.rs diff --git a/bindgen-tests/tests/expectations/tests/derive-hash-blocklisting.rs b/bindgen-tests/tests/expectations/bindings/derive-hash-blocklisting.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/derive-hash-blocklisting.rs rename to bindgen-tests/tests/expectations/bindings/derive-hash-blocklisting.rs diff --git a/bindgen-tests/tests/expectations/tests/derive-hash-struct-with-anon-struct-float.rs b/bindgen-tests/tests/expectations/bindings/derive-hash-struct-with-anon-struct-float.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/derive-hash-struct-with-anon-struct-float.rs rename to bindgen-tests/tests/expectations/bindings/derive-hash-struct-with-anon-struct-float.rs diff --git a/bindgen-tests/tests/expectations/tests/derive-hash-struct-with-float-array.rs b/bindgen-tests/tests/expectations/bindings/derive-hash-struct-with-float-array.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/derive-hash-struct-with-float-array.rs rename to bindgen-tests/tests/expectations/bindings/derive-hash-struct-with-float-array.rs diff --git a/bindgen-tests/tests/expectations/tests/derive-hash-struct-with-incomplete-array.rs b/bindgen-tests/tests/expectations/bindings/derive-hash-struct-with-incomplete-array.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/derive-hash-struct-with-incomplete-array.rs rename to bindgen-tests/tests/expectations/bindings/derive-hash-struct-with-incomplete-array.rs diff --git a/bindgen-tests/tests/expectations/tests/derive-hash-struct-with-pointer.rs b/bindgen-tests/tests/expectations/bindings/derive-hash-struct-with-pointer.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/derive-hash-struct-with-pointer.rs rename to bindgen-tests/tests/expectations/bindings/derive-hash-struct-with-pointer.rs diff --git a/bindgen-tests/tests/expectations/tests/derive-hash-template-def-float.rs b/bindgen-tests/tests/expectations/bindings/derive-hash-template-def-float.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/derive-hash-template-def-float.rs rename to bindgen-tests/tests/expectations/bindings/derive-hash-template-def-float.rs diff --git a/bindgen-tests/tests/expectations/tests/derive-hash-template-inst-float.rs b/bindgen-tests/tests/expectations/bindings/derive-hash-template-inst-float.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/derive-hash-template-inst-float.rs rename to bindgen-tests/tests/expectations/bindings/derive-hash-template-inst-float.rs diff --git a/bindgen-tests/tests/expectations/tests/derive-partialeq-and-blocklist.rs b/bindgen-tests/tests/expectations/bindings/derive-partialeq-and-blocklist.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/derive-partialeq-and-blocklist.rs rename to bindgen-tests/tests/expectations/bindings/derive-partialeq-and-blocklist.rs diff --git a/bindgen-tests/tests/expectations/tests/derive-partialeq-anonfield.rs b/bindgen-tests/tests/expectations/bindings/derive-partialeq-anonfield.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/derive-partialeq-anonfield.rs rename to bindgen-tests/tests/expectations/bindings/derive-partialeq-anonfield.rs diff --git a/bindgen-tests/tests/expectations/tests/derive-partialeq-base.rs b/bindgen-tests/tests/expectations/bindings/derive-partialeq-base.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/derive-partialeq-base.rs rename to bindgen-tests/tests/expectations/bindings/derive-partialeq-base.rs diff --git a/bindgen-tests/tests/expectations/tests/derive-partialeq-bitfield.rs b/bindgen-tests/tests/expectations/bindings/derive-partialeq-bitfield.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/derive-partialeq-bitfield.rs rename to bindgen-tests/tests/expectations/bindings/derive-partialeq-bitfield.rs diff --git a/bindgen-tests/tests/expectations/tests/derive-partialeq-core.rs b/bindgen-tests/tests/expectations/bindings/derive-partialeq-core.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/derive-partialeq-core.rs rename to bindgen-tests/tests/expectations/bindings/derive-partialeq-core.rs diff --git a/bindgen-tests/tests/expectations/tests/derive-partialeq-pointer.rs b/bindgen-tests/tests/expectations/bindings/derive-partialeq-pointer.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/derive-partialeq-pointer.rs rename to bindgen-tests/tests/expectations/bindings/derive-partialeq-pointer.rs diff --git a/bindgen-tests/tests/expectations/tests/derive-partialeq-union.rs b/bindgen-tests/tests/expectations/bindings/derive-partialeq-union.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/derive-partialeq-union.rs rename to bindgen-tests/tests/expectations/bindings/derive-partialeq-union.rs diff --git a/bindgen-tests/tests/expectations/tests/derive-partialeq-union_1_0.rs b/bindgen-tests/tests/expectations/bindings/derive-partialeq-union_1_0.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/derive-partialeq-union_1_0.rs rename to bindgen-tests/tests/expectations/bindings/derive-partialeq-union_1_0.rs diff --git a/bindgen-tests/tests/expectations/tests/disable-namespacing.rs b/bindgen-tests/tests/expectations/bindings/disable-namespacing.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/disable-namespacing.rs rename to bindgen-tests/tests/expectations/bindings/disable-namespacing.rs diff --git a/bindgen-tests/tests/expectations/tests/disable-nested-struct-naming.rs b/bindgen-tests/tests/expectations/bindings/disable-nested-struct-naming.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/disable-nested-struct-naming.rs rename to bindgen-tests/tests/expectations/bindings/disable-nested-struct-naming.rs diff --git a/bindgen-tests/tests/expectations/tests/disable-untagged-union.rs b/bindgen-tests/tests/expectations/bindings/disable-untagged-union.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/disable-untagged-union.rs rename to bindgen-tests/tests/expectations/bindings/disable-untagged-union.rs diff --git a/bindgen-tests/tests/expectations/tests/divide-by-zero-in-struct-layout.rs b/bindgen-tests/tests/expectations/bindings/divide-by-zero-in-struct-layout.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/divide-by-zero-in-struct-layout.rs rename to bindgen-tests/tests/expectations/bindings/divide-by-zero-in-struct-layout.rs diff --git a/bindgen-tests/tests/expectations/tests/do-not-derive-copy.rs b/bindgen-tests/tests/expectations/bindings/do-not-derive-copy.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/do-not-derive-copy.rs rename to bindgen-tests/tests/expectations/bindings/do-not-derive-copy.rs diff --git a/bindgen-tests/tests/expectations/tests/doggo-or-null.rs b/bindgen-tests/tests/expectations/bindings/doggo-or-null.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/doggo-or-null.rs rename to bindgen-tests/tests/expectations/bindings/doggo-or-null.rs diff --git a/bindgen-tests/tests/expectations/tests/dupe-enum-variant-in-namespace.rs b/bindgen-tests/tests/expectations/bindings/dupe-enum-variant-in-namespace.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/dupe-enum-variant-in-namespace.rs rename to bindgen-tests/tests/expectations/bindings/dupe-enum-variant-in-namespace.rs diff --git a/bindgen-tests/tests/expectations/tests/duplicated-definition-count.rs b/bindgen-tests/tests/expectations/bindings/duplicated-definition-count.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/duplicated-definition-count.rs rename to bindgen-tests/tests/expectations/bindings/duplicated-definition-count.rs diff --git a/bindgen-tests/tests/expectations/tests/duplicated-namespaces-definitions.rs b/bindgen-tests/tests/expectations/bindings/duplicated-namespaces-definitions.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/duplicated-namespaces-definitions.rs rename to bindgen-tests/tests/expectations/bindings/duplicated-namespaces-definitions.rs diff --git a/bindgen-tests/tests/expectations/tests/duplicated-namespaces.rs b/bindgen-tests/tests/expectations/bindings/duplicated-namespaces.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/duplicated-namespaces.rs rename to bindgen-tests/tests/expectations/bindings/duplicated-namespaces.rs diff --git a/bindgen-tests/tests/expectations/tests/duplicated_constants_in_ns.rs b/bindgen-tests/tests/expectations/bindings/duplicated_constants_in_ns.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/duplicated_constants_in_ns.rs rename to bindgen-tests/tests/expectations/bindings/duplicated_constants_in_ns.rs diff --git a/bindgen-tests/tests/expectations/tests/dynamic_loading_attributes.rs b/bindgen-tests/tests/expectations/bindings/dynamic_loading_attributes.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/dynamic_loading_attributes.rs rename to bindgen-tests/tests/expectations/bindings/dynamic_loading_attributes.rs diff --git a/bindgen-tests/tests/expectations/tests/dynamic_loading_required.rs b/bindgen-tests/tests/expectations/bindings/dynamic_loading_required.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/dynamic_loading_required.rs rename to bindgen-tests/tests/expectations/bindings/dynamic_loading_required.rs diff --git a/bindgen-tests/tests/expectations/tests/dynamic_loading_simple.rs b/bindgen-tests/tests/expectations/bindings/dynamic_loading_simple.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/dynamic_loading_simple.rs rename to bindgen-tests/tests/expectations/bindings/dynamic_loading_simple.rs diff --git a/bindgen-tests/tests/expectations/tests/dynamic_loading_template.rs b/bindgen-tests/tests/expectations/bindings/dynamic_loading_template.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/dynamic_loading_template.rs rename to bindgen-tests/tests/expectations/bindings/dynamic_loading_template.rs diff --git a/bindgen-tests/tests/expectations/tests/dynamic_loading_with_allowlist.rs b/bindgen-tests/tests/expectations/bindings/dynamic_loading_with_allowlist.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/dynamic_loading_with_allowlist.rs rename to bindgen-tests/tests/expectations/bindings/dynamic_loading_with_allowlist.rs diff --git a/bindgen-tests/tests/expectations/tests/dynamic_loading_with_blocklist.rs b/bindgen-tests/tests/expectations/bindings/dynamic_loading_with_blocklist.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/dynamic_loading_with_blocklist.rs rename to bindgen-tests/tests/expectations/bindings/dynamic_loading_with_blocklist.rs diff --git a/bindgen-tests/tests/expectations/tests/dynamic_loading_with_class.rs b/bindgen-tests/tests/expectations/bindings/dynamic_loading_with_class.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/dynamic_loading_with_class.rs rename to bindgen-tests/tests/expectations/bindings/dynamic_loading_with_class.rs diff --git a/bindgen-tests/tests/expectations/tests/elaborated.rs b/bindgen-tests/tests/expectations/bindings/elaborated.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/elaborated.rs rename to bindgen-tests/tests/expectations/bindings/elaborated.rs diff --git a/bindgen-tests/tests/expectations/tests/empty-enum.rs b/bindgen-tests/tests/expectations/bindings/empty-enum.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/empty-enum.rs rename to bindgen-tests/tests/expectations/bindings/empty-enum.rs diff --git a/bindgen-tests/tests/expectations/tests/empty-union.rs b/bindgen-tests/tests/expectations/bindings/empty-union.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/empty-union.rs rename to bindgen-tests/tests/expectations/bindings/empty-union.rs diff --git a/bindgen-tests/tests/expectations/tests/empty_template_param_name.rs b/bindgen-tests/tests/expectations/bindings/empty_template_param_name.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/empty_template_param_name.rs rename to bindgen-tests/tests/expectations/bindings/empty_template_param_name.rs diff --git a/bindgen-tests/tests/expectations/tests/enum-default-bitfield.rs b/bindgen-tests/tests/expectations/bindings/enum-default-bitfield.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/enum-default-bitfield.rs rename to bindgen-tests/tests/expectations/bindings/enum-default-bitfield.rs diff --git a/bindgen-tests/tests/expectations/tests/enum-default-consts.rs b/bindgen-tests/tests/expectations/bindings/enum-default-consts.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/enum-default-consts.rs rename to bindgen-tests/tests/expectations/bindings/enum-default-consts.rs diff --git a/bindgen-tests/tests/expectations/tests/enum-default-module.rs b/bindgen-tests/tests/expectations/bindings/enum-default-module.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/enum-default-module.rs rename to bindgen-tests/tests/expectations/bindings/enum-default-module.rs diff --git a/bindgen-tests/tests/expectations/tests/enum-default-rust.d b/bindgen-tests/tests/expectations/bindings/enum-default-rust.d similarity index 100% rename from bindgen-tests/tests/expectations/tests/enum-default-rust.d rename to bindgen-tests/tests/expectations/bindings/enum-default-rust.d diff --git a/bindgen-tests/tests/expectations/tests/enum-default-rust.rs b/bindgen-tests/tests/expectations/bindings/enum-default-rust.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/enum-default-rust.rs rename to bindgen-tests/tests/expectations/bindings/enum-default-rust.rs diff --git a/bindgen-tests/tests/expectations/tests/enum-doc-bitfield.rs b/bindgen-tests/tests/expectations/bindings/enum-doc-bitfield.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/enum-doc-bitfield.rs rename to bindgen-tests/tests/expectations/bindings/enum-doc-bitfield.rs diff --git a/bindgen-tests/tests/expectations/tests/enum-doc-mod.rs b/bindgen-tests/tests/expectations/bindings/enum-doc-mod.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/enum-doc-mod.rs rename to bindgen-tests/tests/expectations/bindings/enum-doc-mod.rs diff --git a/bindgen-tests/tests/expectations/tests/enum-doc-rusty.rs b/bindgen-tests/tests/expectations/bindings/enum-doc-rusty.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/enum-doc-rusty.rs rename to bindgen-tests/tests/expectations/bindings/enum-doc-rusty.rs diff --git a/bindgen-tests/tests/expectations/tests/enum-doc.rs b/bindgen-tests/tests/expectations/bindings/enum-doc.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/enum-doc.rs rename to bindgen-tests/tests/expectations/bindings/enum-doc.rs diff --git a/bindgen-tests/tests/expectations/tests/enum-no-debug-rust.rs b/bindgen-tests/tests/expectations/bindings/enum-no-debug-rust.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/enum-no-debug-rust.rs rename to bindgen-tests/tests/expectations/bindings/enum-no-debug-rust.rs diff --git a/bindgen-tests/tests/expectations/tests/enum-translate-type.rs b/bindgen-tests/tests/expectations/bindings/enum-translate-type.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/enum-translate-type.rs rename to bindgen-tests/tests/expectations/bindings/enum-translate-type.rs diff --git a/bindgen-tests/tests/expectations/tests/enum-undefault.rs b/bindgen-tests/tests/expectations/bindings/enum-undefault.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/enum-undefault.rs rename to bindgen-tests/tests/expectations/bindings/enum-undefault.rs diff --git a/bindgen-tests/tests/expectations/tests/enum-variant-replaces.rs b/bindgen-tests/tests/expectations/bindings/enum-variant-replaces.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/enum-variant-replaces.rs rename to bindgen-tests/tests/expectations/bindings/enum-variant-replaces.rs diff --git a/bindgen-tests/tests/expectations/tests/enum.rs b/bindgen-tests/tests/expectations/bindings/enum.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/enum.rs rename to bindgen-tests/tests/expectations/bindings/enum.rs diff --git a/bindgen-tests/tests/expectations/tests/enum_alias.rs b/bindgen-tests/tests/expectations/bindings/enum_alias.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/enum_alias.rs rename to bindgen-tests/tests/expectations/bindings/enum_alias.rs diff --git a/bindgen-tests/tests/expectations/tests/enum_and_vtable_mangling.rs b/bindgen-tests/tests/expectations/bindings/enum_and_vtable_mangling.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/enum_and_vtable_mangling.rs rename to bindgen-tests/tests/expectations/bindings/enum_and_vtable_mangling.rs diff --git a/bindgen-tests/tests/expectations/tests/enum_dupe.rs b/bindgen-tests/tests/expectations/bindings/enum_dupe.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/enum_dupe.rs rename to bindgen-tests/tests/expectations/bindings/enum_dupe.rs diff --git a/bindgen-tests/tests/expectations/tests/enum_explicit_type.rs b/bindgen-tests/tests/expectations/bindings/enum_explicit_type.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/enum_explicit_type.rs rename to bindgen-tests/tests/expectations/bindings/enum_explicit_type.rs diff --git a/bindgen-tests/tests/expectations/tests/enum_explicit_type_constants.rs b/bindgen-tests/tests/expectations/bindings/enum_explicit_type_constants.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/enum_explicit_type_constants.rs rename to bindgen-tests/tests/expectations/bindings/enum_explicit_type_constants.rs diff --git a/bindgen-tests/tests/expectations/tests/enum_in_template.rs b/bindgen-tests/tests/expectations/bindings/enum_in_template.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/enum_in_template.rs rename to bindgen-tests/tests/expectations/bindings/enum_in_template.rs diff --git a/bindgen-tests/tests/expectations/tests/enum_in_template_with_typedef.rs b/bindgen-tests/tests/expectations/bindings/enum_in_template_with_typedef.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/enum_in_template_with_typedef.rs rename to bindgen-tests/tests/expectations/bindings/enum_in_template_with_typedef.rs diff --git a/bindgen-tests/tests/expectations/tests/enum_negative.rs b/bindgen-tests/tests/expectations/bindings/enum_negative.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/enum_negative.rs rename to bindgen-tests/tests/expectations/bindings/enum_negative.rs diff --git a/bindgen-tests/tests/expectations/tests/enum_packed.rs b/bindgen-tests/tests/expectations/bindings/enum_packed.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/enum_packed.rs rename to bindgen-tests/tests/expectations/bindings/enum_packed.rs diff --git a/bindgen-tests/tests/expectations/tests/eval-value-dependent.rs b/bindgen-tests/tests/expectations/bindings/eval-value-dependent.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/eval-value-dependent.rs rename to bindgen-tests/tests/expectations/bindings/eval-value-dependent.rs diff --git a/bindgen-tests/tests/expectations/tests/eval-variadic-template-parameter.rs b/bindgen-tests/tests/expectations/bindings/eval-variadic-template-parameter.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/eval-variadic-template-parameter.rs rename to bindgen-tests/tests/expectations/bindings/eval-variadic-template-parameter.rs diff --git a/bindgen-tests/tests/expectations/tests/explicit-padding.rs b/bindgen-tests/tests/expectations/bindings/explicit-padding.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/explicit-padding.rs rename to bindgen-tests/tests/expectations/bindings/explicit-padding.rs diff --git a/bindgen-tests/tests/expectations/tests/extern-const-struct.rs b/bindgen-tests/tests/expectations/bindings/extern-const-struct.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/extern-const-struct.rs rename to bindgen-tests/tests/expectations/bindings/extern-const-struct.rs diff --git a/bindgen-tests/tests/expectations/tests/extern.rs b/bindgen-tests/tests/expectations/bindings/extern.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/extern.rs rename to bindgen-tests/tests/expectations/bindings/extern.rs diff --git a/bindgen-tests/tests/expectations/tests/fit-macro-constant-types-signed.rs b/bindgen-tests/tests/expectations/bindings/fit-macro-constant-types-signed.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/fit-macro-constant-types-signed.rs rename to bindgen-tests/tests/expectations/bindings/fit-macro-constant-types-signed.rs diff --git a/bindgen-tests/tests/expectations/tests/fit-macro-constant-types.rs b/bindgen-tests/tests/expectations/bindings/fit-macro-constant-types.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/fit-macro-constant-types.rs rename to bindgen-tests/tests/expectations/bindings/fit-macro-constant-types.rs diff --git a/bindgen-tests/tests/expectations/tests/float128.rs b/bindgen-tests/tests/expectations/bindings/float128.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/float128.rs rename to bindgen-tests/tests/expectations/bindings/float128.rs diff --git a/bindgen-tests/tests/expectations/tests/forward-declaration-autoptr.rs b/bindgen-tests/tests/expectations/bindings/forward-declaration-autoptr.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/forward-declaration-autoptr.rs rename to bindgen-tests/tests/expectations/bindings/forward-declaration-autoptr.rs diff --git a/bindgen-tests/tests/expectations/tests/forward-enum-decl.rs b/bindgen-tests/tests/expectations/bindings/forward-enum-decl.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/forward-enum-decl.rs rename to bindgen-tests/tests/expectations/bindings/forward-enum-decl.rs diff --git a/bindgen-tests/tests/expectations/tests/forward-inherit-struct-with-fields.rs b/bindgen-tests/tests/expectations/bindings/forward-inherit-struct-with-fields.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/forward-inherit-struct-with-fields.rs rename to bindgen-tests/tests/expectations/bindings/forward-inherit-struct-with-fields.rs diff --git a/bindgen-tests/tests/expectations/tests/forward-inherit-struct.rs b/bindgen-tests/tests/expectations/bindings/forward-inherit-struct.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/forward-inherit-struct.rs rename to bindgen-tests/tests/expectations/bindings/forward-inherit-struct.rs diff --git a/bindgen-tests/tests/expectations/tests/forward_declared_complex_types.rs b/bindgen-tests/tests/expectations/bindings/forward_declared_complex_types.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/forward_declared_complex_types.rs rename to bindgen-tests/tests/expectations/bindings/forward_declared_complex_types.rs diff --git a/bindgen-tests/tests/expectations/tests/forward_declared_complex_types_1_0.rs b/bindgen-tests/tests/expectations/bindings/forward_declared_complex_types_1_0.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/forward_declared_complex_types_1_0.rs rename to bindgen-tests/tests/expectations/bindings/forward_declared_complex_types_1_0.rs diff --git a/bindgen-tests/tests/expectations/tests/forward_declared_opaque.rs b/bindgen-tests/tests/expectations/bindings/forward_declared_opaque.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/forward_declared_opaque.rs rename to bindgen-tests/tests/expectations/bindings/forward_declared_opaque.rs diff --git a/bindgen-tests/tests/expectations/tests/forward_declared_struct.rs b/bindgen-tests/tests/expectations/bindings/forward_declared_struct.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/forward_declared_struct.rs rename to bindgen-tests/tests/expectations/bindings/forward_declared_struct.rs diff --git a/bindgen-tests/tests/expectations/tests/func_proto.rs b/bindgen-tests/tests/expectations/bindings/func_proto.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/func_proto.rs rename to bindgen-tests/tests/expectations/bindings/func_proto.rs diff --git a/bindgen-tests/tests/expectations/tests/func_ptr.rs b/bindgen-tests/tests/expectations/bindings/func_ptr.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/func_ptr.rs rename to bindgen-tests/tests/expectations/bindings/func_ptr.rs diff --git a/bindgen-tests/tests/expectations/tests/func_ptr_in_struct.rs b/bindgen-tests/tests/expectations/bindings/func_ptr_in_struct.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/func_ptr_in_struct.rs rename to bindgen-tests/tests/expectations/bindings/func_ptr_in_struct.rs diff --git a/bindgen-tests/tests/expectations/tests/func_ptr_return_type.rs b/bindgen-tests/tests/expectations/bindings/func_ptr_return_type.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/func_ptr_return_type.rs rename to bindgen-tests/tests/expectations/bindings/func_ptr_return_type.rs diff --git a/bindgen-tests/tests/expectations/tests/func_return_must_use.rs b/bindgen-tests/tests/expectations/bindings/func_return_must_use.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/func_return_must_use.rs rename to bindgen-tests/tests/expectations/bindings/func_return_must_use.rs diff --git a/bindgen-tests/tests/expectations/tests/func_with_array_arg.rs b/bindgen-tests/tests/expectations/bindings/func_with_array_arg.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/func_with_array_arg.rs rename to bindgen-tests/tests/expectations/bindings/func_with_array_arg.rs diff --git a/bindgen-tests/tests/expectations/tests/func_with_func_ptr_arg.rs b/bindgen-tests/tests/expectations/bindings/func_with_func_ptr_arg.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/func_with_func_ptr_arg.rs rename to bindgen-tests/tests/expectations/bindings/func_with_func_ptr_arg.rs diff --git a/bindgen-tests/tests/expectations/tests/function-typedef-stdcall.rs b/bindgen-tests/tests/expectations/bindings/function-typedef-stdcall.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/function-typedef-stdcall.rs rename to bindgen-tests/tests/expectations/bindings/function-typedef-stdcall.rs diff --git a/bindgen-tests/tests/expectations/tests/gen-constructors-neg.rs b/bindgen-tests/tests/expectations/bindings/gen-constructors-neg.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/gen-constructors-neg.rs rename to bindgen-tests/tests/expectations/bindings/gen-constructors-neg.rs diff --git a/bindgen-tests/tests/expectations/tests/gen-constructors.rs b/bindgen-tests/tests/expectations/bindings/gen-constructors.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/gen-constructors.rs rename to bindgen-tests/tests/expectations/bindings/gen-constructors.rs diff --git a/bindgen-tests/tests/expectations/tests/gen-destructors-neg.rs b/bindgen-tests/tests/expectations/bindings/gen-destructors-neg.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/gen-destructors-neg.rs rename to bindgen-tests/tests/expectations/bindings/gen-destructors-neg.rs diff --git a/bindgen-tests/tests/expectations/tests/gen-destructors.rs b/bindgen-tests/tests/expectations/bindings/gen-destructors.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/gen-destructors.rs rename to bindgen-tests/tests/expectations/bindings/gen-destructors.rs diff --git a/bindgen-tests/tests/expectations/tests/generate-inline.rs b/bindgen-tests/tests/expectations/bindings/generate-inline.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/generate-inline.rs rename to bindgen-tests/tests/expectations/bindings/generate-inline.rs diff --git a/bindgen-tests/tests/expectations/tests/i128.rs b/bindgen-tests/tests/expectations/bindings/i128.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/i128.rs rename to bindgen-tests/tests/expectations/bindings/i128.rs diff --git a/bindgen-tests/tests/expectations/tests/in_class_typedef.rs b/bindgen-tests/tests/expectations/bindings/in_class_typedef.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/in_class_typedef.rs rename to bindgen-tests/tests/expectations/bindings/in_class_typedef.rs diff --git a/bindgen-tests/tests/expectations/tests/incomplete-array-padding.rs b/bindgen-tests/tests/expectations/bindings/incomplete-array-padding.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/incomplete-array-padding.rs rename to bindgen-tests/tests/expectations/bindings/incomplete-array-padding.rs diff --git a/bindgen-tests/tests/expectations/tests/infinite-macro.rs b/bindgen-tests/tests/expectations/bindings/infinite-macro.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/infinite-macro.rs rename to bindgen-tests/tests/expectations/bindings/infinite-macro.rs diff --git a/bindgen-tests/tests/expectations/tests/inherit-from-template-instantiation-with-vtable.rs b/bindgen-tests/tests/expectations/bindings/inherit-from-template-instantiation-with-vtable.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/inherit-from-template-instantiation-with-vtable.rs rename to bindgen-tests/tests/expectations/bindings/inherit-from-template-instantiation-with-vtable.rs diff --git a/bindgen-tests/tests/expectations/tests/inherit-namespaced.rs b/bindgen-tests/tests/expectations/bindings/inherit-namespaced.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/inherit-namespaced.rs rename to bindgen-tests/tests/expectations/bindings/inherit-namespaced.rs diff --git a/bindgen-tests/tests/expectations/tests/inherit_named.rs b/bindgen-tests/tests/expectations/bindings/inherit_named.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/inherit_named.rs rename to bindgen-tests/tests/expectations/bindings/inherit_named.rs diff --git a/bindgen-tests/tests/expectations/tests/inherit_typedef.rs b/bindgen-tests/tests/expectations/bindings/inherit_typedef.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/inherit_typedef.rs rename to bindgen-tests/tests/expectations/bindings/inherit_typedef.rs diff --git a/bindgen-tests/tests/expectations/tests/inline-function.rs b/bindgen-tests/tests/expectations/bindings/inline-function.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/inline-function.rs rename to bindgen-tests/tests/expectations/bindings/inline-function.rs diff --git a/bindgen-tests/tests/expectations/tests/inline_namespace.rs b/bindgen-tests/tests/expectations/bindings/inline_namespace.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/inline_namespace.rs rename to bindgen-tests/tests/expectations/bindings/inline_namespace.rs diff --git a/bindgen-tests/tests/expectations/tests/inline_namespace_allowlist.rs b/bindgen-tests/tests/expectations/bindings/inline_namespace_allowlist.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/inline_namespace_allowlist.rs rename to bindgen-tests/tests/expectations/bindings/inline_namespace_allowlist.rs diff --git a/bindgen-tests/tests/expectations/tests/inline_namespace_conservative.rs b/bindgen-tests/tests/expectations/bindings/inline_namespace_conservative.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/inline_namespace_conservative.rs rename to bindgen-tests/tests/expectations/bindings/inline_namespace_conservative.rs diff --git a/bindgen-tests/tests/expectations/tests/inline_namespace_nested.rs b/bindgen-tests/tests/expectations/bindings/inline_namespace_nested.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/inline_namespace_nested.rs rename to bindgen-tests/tests/expectations/bindings/inline_namespace_nested.rs diff --git a/bindgen-tests/tests/expectations/tests/inline_namespace_no_ns_enabled.rs b/bindgen-tests/tests/expectations/bindings/inline_namespace_no_ns_enabled.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/inline_namespace_no_ns_enabled.rs rename to bindgen-tests/tests/expectations/bindings/inline_namespace_no_ns_enabled.rs diff --git a/bindgen-tests/tests/expectations/tests/inner-typedef-gh422.rs b/bindgen-tests/tests/expectations/bindings/inner-typedef-gh422.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/inner-typedef-gh422.rs rename to bindgen-tests/tests/expectations/bindings/inner-typedef-gh422.rs diff --git a/bindgen-tests/tests/expectations/tests/inner_const.rs b/bindgen-tests/tests/expectations/bindings/inner_const.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/inner_const.rs rename to bindgen-tests/tests/expectations/bindings/inner_const.rs diff --git a/bindgen-tests/tests/expectations/tests/inner_template_self.rs b/bindgen-tests/tests/expectations/bindings/inner_template_self.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/inner_template_self.rs rename to bindgen-tests/tests/expectations/bindings/inner_template_self.rs diff --git a/bindgen-tests/tests/expectations/tests/int128_t.rs b/bindgen-tests/tests/expectations/bindings/int128_t.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/int128_t.rs rename to bindgen-tests/tests/expectations/bindings/int128_t.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-1025-unknown-enum-repr.rs b/bindgen-tests/tests/expectations/bindings/issue-1025-unknown-enum-repr.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-1025-unknown-enum-repr.rs rename to bindgen-tests/tests/expectations/bindings/issue-1025-unknown-enum-repr.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-1034.rs b/bindgen-tests/tests/expectations/bindings/issue-1034.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-1034.rs rename to bindgen-tests/tests/expectations/bindings/issue-1034.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-1040.rs b/bindgen-tests/tests/expectations/bindings/issue-1040.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-1040.rs rename to bindgen-tests/tests/expectations/bindings/issue-1040.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-1076-unnamed-bitfield-alignment.rs b/bindgen-tests/tests/expectations/bindings/issue-1076-unnamed-bitfield-alignment.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-1076-unnamed-bitfield-alignment.rs rename to bindgen-tests/tests/expectations/bindings/issue-1076-unnamed-bitfield-alignment.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-1113-template-references.rs b/bindgen-tests/tests/expectations/bindings/issue-1113-template-references.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-1113-template-references.rs rename to bindgen-tests/tests/expectations/bindings/issue-1113-template-references.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-1118-using-forward-decl.rs b/bindgen-tests/tests/expectations/bindings/issue-1118-using-forward-decl.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-1118-using-forward-decl.rs rename to bindgen-tests/tests/expectations/bindings/issue-1118-using-forward-decl.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-1197-pure-virtual-stuff.rs b/bindgen-tests/tests/expectations/bindings/issue-1197-pure-virtual-stuff.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-1197-pure-virtual-stuff.rs rename to bindgen-tests/tests/expectations/bindings/issue-1197-pure-virtual-stuff.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-1198-alias-rust-bitfield-enum.rs b/bindgen-tests/tests/expectations/bindings/issue-1198-alias-rust-bitfield-enum.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-1198-alias-rust-bitfield-enum.rs rename to bindgen-tests/tests/expectations/bindings/issue-1198-alias-rust-bitfield-enum.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-1198-alias-rust-const-mod-bitfield-enum.rs b/bindgen-tests/tests/expectations/bindings/issue-1198-alias-rust-const-mod-bitfield-enum.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-1198-alias-rust-const-mod-bitfield-enum.rs rename to bindgen-tests/tests/expectations/bindings/issue-1198-alias-rust-const-mod-bitfield-enum.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-1198-alias-rust-const-mod-enum.rs b/bindgen-tests/tests/expectations/bindings/issue-1198-alias-rust-const-mod-enum.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-1198-alias-rust-const-mod-enum.rs rename to bindgen-tests/tests/expectations/bindings/issue-1198-alias-rust-const-mod-enum.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-1198-alias-rust-enum.rs b/bindgen-tests/tests/expectations/bindings/issue-1198-alias-rust-enum.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-1198-alias-rust-enum.rs rename to bindgen-tests/tests/expectations/bindings/issue-1198-alias-rust-enum.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-1216-variadic-member.rs b/bindgen-tests/tests/expectations/bindings/issue-1216-variadic-member.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-1216-variadic-member.rs rename to bindgen-tests/tests/expectations/bindings/issue-1216-variadic-member.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-1238-fwd-no-copy.rs b/bindgen-tests/tests/expectations/bindings/issue-1238-fwd-no-copy.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-1238-fwd-no-copy.rs rename to bindgen-tests/tests/expectations/bindings/issue-1238-fwd-no-copy.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-1281.rs b/bindgen-tests/tests/expectations/bindings/issue-1281.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-1281.rs rename to bindgen-tests/tests/expectations/bindings/issue-1281.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-1285.rs b/bindgen-tests/tests/expectations/bindings/issue-1285.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-1285.rs rename to bindgen-tests/tests/expectations/bindings/issue-1285.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-1291.rs b/bindgen-tests/tests/expectations/bindings/issue-1291.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-1291.rs rename to bindgen-tests/tests/expectations/bindings/issue-1291.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-1350-attribute-overloadable.rs b/bindgen-tests/tests/expectations/bindings/issue-1350-attribute-overloadable.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-1350-attribute-overloadable.rs rename to bindgen-tests/tests/expectations/bindings/issue-1350-attribute-overloadable.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-1375-prefixed-functions.rs b/bindgen-tests/tests/expectations/bindings/issue-1375-prefixed-functions.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-1375-prefixed-functions.rs rename to bindgen-tests/tests/expectations/bindings/issue-1375-prefixed-functions.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-1382-rust-primitive-types.rs b/bindgen-tests/tests/expectations/bindings/issue-1382-rust-primitive-types.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-1382-rust-primitive-types.rs rename to bindgen-tests/tests/expectations/bindings/issue-1382-rust-primitive-types.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-1435.rs b/bindgen-tests/tests/expectations/bindings/issue-1435.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-1435.rs rename to bindgen-tests/tests/expectations/bindings/issue-1435.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-1443.rs b/bindgen-tests/tests/expectations/bindings/issue-1443.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-1443.rs rename to bindgen-tests/tests/expectations/bindings/issue-1443.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-1454.rs b/bindgen-tests/tests/expectations/bindings/issue-1454.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-1454.rs rename to bindgen-tests/tests/expectations/bindings/issue-1454.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-1464.rs b/bindgen-tests/tests/expectations/bindings/issue-1464.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-1464.rs rename to bindgen-tests/tests/expectations/bindings/issue-1464.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-1488-enum-new-type.rs b/bindgen-tests/tests/expectations/bindings/issue-1488-enum-new-type.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-1488-enum-new-type.rs rename to bindgen-tests/tests/expectations/bindings/issue-1488-enum-new-type.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-1488-options.rs b/bindgen-tests/tests/expectations/bindings/issue-1488-options.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-1488-options.rs rename to bindgen-tests/tests/expectations/bindings/issue-1488-options.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-1488-template-alias-new-type.rs b/bindgen-tests/tests/expectations/bindings/issue-1488-template-alias-new-type.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-1488-template-alias-new-type.rs rename to bindgen-tests/tests/expectations/bindings/issue-1488-template-alias-new-type.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-1498.rs b/bindgen-tests/tests/expectations/bindings/issue-1498.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-1498.rs rename to bindgen-tests/tests/expectations/bindings/issue-1498.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-1514.rs b/bindgen-tests/tests/expectations/bindings/issue-1514.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-1514.rs rename to bindgen-tests/tests/expectations/bindings/issue-1514.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-1554.rs b/bindgen-tests/tests/expectations/bindings/issue-1554.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-1554.rs rename to bindgen-tests/tests/expectations/bindings/issue-1554.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-1599-opaque-typedef-to-enum.rs b/bindgen-tests/tests/expectations/bindings/issue-1599-opaque-typedef-to-enum.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-1599-opaque-typedef-to-enum.rs rename to bindgen-tests/tests/expectations/bindings/issue-1599-opaque-typedef-to-enum.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-1676-macro-namespace-prefix.rs b/bindgen-tests/tests/expectations/bindings/issue-1676-macro-namespace-prefix.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-1676-macro-namespace-prefix.rs rename to bindgen-tests/tests/expectations/bindings/issue-1676-macro-namespace-prefix.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-1947.rs b/bindgen-tests/tests/expectations/bindings/issue-1947.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-1947.rs rename to bindgen-tests/tests/expectations/bindings/issue-1947.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-1977-larger-arrays.rs b/bindgen-tests/tests/expectations/bindings/issue-1977-larger-arrays.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-1977-larger-arrays.rs rename to bindgen-tests/tests/expectations/bindings/issue-1977-larger-arrays.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-1995.rs b/bindgen-tests/tests/expectations/bindings/issue-1995.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-1995.rs rename to bindgen-tests/tests/expectations/bindings/issue-1995.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-2019.rs b/bindgen-tests/tests/expectations/bindings/issue-2019.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-2019.rs rename to bindgen-tests/tests/expectations/bindings/issue-2019.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-2239-template-dependent-bit-width.rs b/bindgen-tests/tests/expectations/bindings/issue-2239-template-dependent-bit-width.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-2239-template-dependent-bit-width.rs rename to bindgen-tests/tests/expectations/bindings/issue-2239-template-dependent-bit-width.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-358.rs b/bindgen-tests/tests/expectations/bindings/issue-358.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-358.rs rename to bindgen-tests/tests/expectations/bindings/issue-358.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-372.rs b/bindgen-tests/tests/expectations/bindings/issue-372.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-372.rs rename to bindgen-tests/tests/expectations/bindings/issue-372.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-410.rs b/bindgen-tests/tests/expectations/bindings/issue-410.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-410.rs rename to bindgen-tests/tests/expectations/bindings/issue-410.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-446.rs b/bindgen-tests/tests/expectations/bindings/issue-446.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-446.rs rename to bindgen-tests/tests/expectations/bindings/issue-446.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-447.rs b/bindgen-tests/tests/expectations/bindings/issue-447.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-447.rs rename to bindgen-tests/tests/expectations/bindings/issue-447.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-493.rs b/bindgen-tests/tests/expectations/bindings/issue-493.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-493.rs rename to bindgen-tests/tests/expectations/bindings/issue-493.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-493_1_0.rs b/bindgen-tests/tests/expectations/bindings/issue-493_1_0.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-493_1_0.rs rename to bindgen-tests/tests/expectations/bindings/issue-493_1_0.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-511.rs b/bindgen-tests/tests/expectations/bindings/issue-511.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-511.rs rename to bindgen-tests/tests/expectations/bindings/issue-511.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-537-repr-packed-n.rs b/bindgen-tests/tests/expectations/bindings/issue-537-repr-packed-n.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-537-repr-packed-n.rs rename to bindgen-tests/tests/expectations/bindings/issue-537-repr-packed-n.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-537.rs b/bindgen-tests/tests/expectations/bindings/issue-537.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-537.rs rename to bindgen-tests/tests/expectations/bindings/issue-537.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-544-stylo-creduce-2.rs b/bindgen-tests/tests/expectations/bindings/issue-544-stylo-creduce-2.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-544-stylo-creduce-2.rs rename to bindgen-tests/tests/expectations/bindings/issue-544-stylo-creduce-2.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-544-stylo-creduce.rs b/bindgen-tests/tests/expectations/bindings/issue-544-stylo-creduce.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-544-stylo-creduce.rs rename to bindgen-tests/tests/expectations/bindings/issue-544-stylo-creduce.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-569-non-type-template-params-causing-layout-test-failures.rs b/bindgen-tests/tests/expectations/bindings/issue-569-non-type-template-params-causing-layout-test-failures.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-569-non-type-template-params-causing-layout-test-failures.rs rename to bindgen-tests/tests/expectations/bindings/issue-569-non-type-template-params-causing-layout-test-failures.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-573-layout-test-failures.rs b/bindgen-tests/tests/expectations/bindings/issue-573-layout-test-failures.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-573-layout-test-failures.rs rename to bindgen-tests/tests/expectations/bindings/issue-573-layout-test-failures.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-574-assertion-failure-in-codegen.rs b/bindgen-tests/tests/expectations/bindings/issue-574-assertion-failure-in-codegen.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-574-assertion-failure-in-codegen.rs rename to bindgen-tests/tests/expectations/bindings/issue-574-assertion-failure-in-codegen.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-584-stylo-template-analysis-panic.rs b/bindgen-tests/tests/expectations/bindings/issue-584-stylo-template-analysis-panic.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-584-stylo-template-analysis-panic.rs rename to bindgen-tests/tests/expectations/bindings/issue-584-stylo-template-analysis-panic.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-638-stylo-cannot-find-T-in-this-scope.rs b/bindgen-tests/tests/expectations/bindings/issue-638-stylo-cannot-find-T-in-this-scope.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-638-stylo-cannot-find-T-in-this-scope.rs rename to bindgen-tests/tests/expectations/bindings/issue-638-stylo-cannot-find-T-in-this-scope.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-639-typedef-anon-field.rs b/bindgen-tests/tests/expectations/bindings/issue-639-typedef-anon-field.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-639-typedef-anon-field.rs rename to bindgen-tests/tests/expectations/bindings/issue-639-typedef-anon-field.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-643-inner-struct.rs b/bindgen-tests/tests/expectations/bindings/issue-643-inner-struct.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-643-inner-struct.rs rename to bindgen-tests/tests/expectations/bindings/issue-643-inner-struct.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-645-cannot-find-type-T-in-this-scope.rs b/bindgen-tests/tests/expectations/bindings/issue-645-cannot-find-type-T-in-this-scope.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-645-cannot-find-type-T-in-this-scope.rs rename to bindgen-tests/tests/expectations/bindings/issue-645-cannot-find-type-T-in-this-scope.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-648-derive-debug-with-padding.rs b/bindgen-tests/tests/expectations/bindings/issue-648-derive-debug-with-padding.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-648-derive-debug-with-padding.rs rename to bindgen-tests/tests/expectations/bindings/issue-648-derive-debug-with-padding.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-654-struct-fn-collision.rs b/bindgen-tests/tests/expectations/bindings/issue-654-struct-fn-collision.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-654-struct-fn-collision.rs rename to bindgen-tests/tests/expectations/bindings/issue-654-struct-fn-collision.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-662-cannot-find-T-in-this-scope.rs b/bindgen-tests/tests/expectations/bindings/issue-662-cannot-find-T-in-this-scope.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-662-cannot-find-T-in-this-scope.rs rename to bindgen-tests/tests/expectations/bindings/issue-662-cannot-find-T-in-this-scope.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-662-part-2.rs b/bindgen-tests/tests/expectations/bindings/issue-662-part-2.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-662-part-2.rs rename to bindgen-tests/tests/expectations/bindings/issue-662-part-2.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-674-1.rs b/bindgen-tests/tests/expectations/bindings/issue-674-1.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-674-1.rs rename to bindgen-tests/tests/expectations/bindings/issue-674-1.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-674-2.rs b/bindgen-tests/tests/expectations/bindings/issue-674-2.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-674-2.rs rename to bindgen-tests/tests/expectations/bindings/issue-674-2.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-674-3.rs b/bindgen-tests/tests/expectations/bindings/issue-674-3.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-674-3.rs rename to bindgen-tests/tests/expectations/bindings/issue-674-3.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-677-nested-ns-specifier.rs b/bindgen-tests/tests/expectations/bindings/issue-677-nested-ns-specifier.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-677-nested-ns-specifier.rs rename to bindgen-tests/tests/expectations/bindings/issue-677-nested-ns-specifier.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-691-template-parameter-virtual.rs b/bindgen-tests/tests/expectations/bindings/issue-691-template-parameter-virtual.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-691-template-parameter-virtual.rs rename to bindgen-tests/tests/expectations/bindings/issue-691-template-parameter-virtual.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-710-must-use-type.rs b/bindgen-tests/tests/expectations/bindings/issue-710-must-use-type.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-710-must-use-type.rs rename to bindgen-tests/tests/expectations/bindings/issue-710-must-use-type.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-739-pointer-wide-bitfield.rs b/bindgen-tests/tests/expectations/bindings/issue-739-pointer-wide-bitfield.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-739-pointer-wide-bitfield.rs rename to bindgen-tests/tests/expectations/bindings/issue-739-pointer-wide-bitfield.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-801-opaque-sloppiness.rs b/bindgen-tests/tests/expectations/bindings/issue-801-opaque-sloppiness.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-801-opaque-sloppiness.rs rename to bindgen-tests/tests/expectations/bindings/issue-801-opaque-sloppiness.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-807-opaque-types-methods-being-generated.rs b/bindgen-tests/tests/expectations/bindings/issue-807-opaque-types-methods-being-generated.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-807-opaque-types-methods-being-generated.rs rename to bindgen-tests/tests/expectations/bindings/issue-807-opaque-types-methods-being-generated.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-816.rs b/bindgen-tests/tests/expectations/bindings/issue-816.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-816.rs rename to bindgen-tests/tests/expectations/bindings/issue-816.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-820-unused-template-param-in-alias.rs b/bindgen-tests/tests/expectations/bindings/issue-820-unused-template-param-in-alias.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-820-unused-template-param-in-alias.rs rename to bindgen-tests/tests/expectations/bindings/issue-820-unused-template-param-in-alias.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-826-generating-methods-when-asked-not-to.rs b/bindgen-tests/tests/expectations/bindings/issue-826-generating-methods-when-asked-not-to.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-826-generating-methods-when-asked-not-to.rs rename to bindgen-tests/tests/expectations/bindings/issue-826-generating-methods-when-asked-not-to.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-833-1.rs b/bindgen-tests/tests/expectations/bindings/issue-833-1.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-833-1.rs rename to bindgen-tests/tests/expectations/bindings/issue-833-1.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-833-2.rs b/bindgen-tests/tests/expectations/bindings/issue-833-2.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-833-2.rs rename to bindgen-tests/tests/expectations/bindings/issue-833-2.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-833.rs b/bindgen-tests/tests/expectations/bindings/issue-833.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-833.rs rename to bindgen-tests/tests/expectations/bindings/issue-833.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-834.rs b/bindgen-tests/tests/expectations/bindings/issue-834.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-834.rs rename to bindgen-tests/tests/expectations/bindings/issue-834.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-848-replacement-system-include.rs b/bindgen-tests/tests/expectations/bindings/issue-848-replacement-system-include.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-848-replacement-system-include.rs rename to bindgen-tests/tests/expectations/bindings/issue-848-replacement-system-include.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-888-enum-var-decl-jump.rs b/bindgen-tests/tests/expectations/bindings/issue-888-enum-var-decl-jump.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-888-enum-var-decl-jump.rs rename to bindgen-tests/tests/expectations/bindings/issue-888-enum-var-decl-jump.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-944-derive-copy-and-blocklisting.rs b/bindgen-tests/tests/expectations/bindings/issue-944-derive-copy-and-blocklisting.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-944-derive-copy-and-blocklisting.rs rename to bindgen-tests/tests/expectations/bindings/issue-944-derive-copy-and-blocklisting.rs diff --git a/bindgen-tests/tests/expectations/tests/issue-946.rs b/bindgen-tests/tests/expectations/bindings/issue-946.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue-946.rs rename to bindgen-tests/tests/expectations/bindings/issue-946.rs diff --git a/bindgen-tests/tests/expectations/tests/issue_311.rs b/bindgen-tests/tests/expectations/bindings/issue_311.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue_311.rs rename to bindgen-tests/tests/expectations/bindings/issue_311.rs diff --git a/bindgen-tests/tests/expectations/tests/issue_315.rs b/bindgen-tests/tests/expectations/bindings/issue_315.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/issue_315.rs rename to bindgen-tests/tests/expectations/bindings/issue_315.rs diff --git a/bindgen-tests/tests/expectations/tests/jsval_layout_opaque.rs b/bindgen-tests/tests/expectations/bindings/jsval_layout_opaque.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/jsval_layout_opaque.rs rename to bindgen-tests/tests/expectations/bindings/jsval_layout_opaque.rs diff --git a/bindgen-tests/tests/expectations/tests/jsval_layout_opaque_1_0.rs b/bindgen-tests/tests/expectations/bindings/jsval_layout_opaque_1_0.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/jsval_layout_opaque_1_0.rs rename to bindgen-tests/tests/expectations/bindings/jsval_layout_opaque_1_0.rs diff --git a/bindgen-tests/tests/expectations/tests/keywords.rs b/bindgen-tests/tests/expectations/bindings/keywords.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/keywords.rs rename to bindgen-tests/tests/expectations/bindings/keywords.rs diff --git a/bindgen-tests/tests/expectations/tests/layout.rs b/bindgen-tests/tests/expectations/bindings/layout.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/layout.rs rename to bindgen-tests/tests/expectations/bindings/layout.rs diff --git a/bindgen-tests/tests/expectations/tests/layout_align.rs b/bindgen-tests/tests/expectations/bindings/layout_align.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/layout_align.rs rename to bindgen-tests/tests/expectations/bindings/layout_align.rs diff --git a/bindgen-tests/tests/expectations/tests/layout_arp.rs b/bindgen-tests/tests/expectations/bindings/layout_arp.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/layout_arp.rs rename to bindgen-tests/tests/expectations/bindings/layout_arp.rs diff --git a/bindgen-tests/tests/expectations/tests/layout_array.rs b/bindgen-tests/tests/expectations/bindings/layout_array.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/layout_array.rs rename to bindgen-tests/tests/expectations/bindings/layout_array.rs diff --git a/bindgen-tests/tests/expectations/tests/layout_array_too_long.rs b/bindgen-tests/tests/expectations/bindings/layout_array_too_long.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/layout_array_too_long.rs rename to bindgen-tests/tests/expectations/bindings/layout_array_too_long.rs diff --git a/bindgen-tests/tests/expectations/tests/layout_cmdline_token.rs b/bindgen-tests/tests/expectations/bindings/layout_cmdline_token.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/layout_cmdline_token.rs rename to bindgen-tests/tests/expectations/bindings/layout_cmdline_token.rs diff --git a/bindgen-tests/tests/expectations/tests/layout_eth_conf.rs b/bindgen-tests/tests/expectations/bindings/layout_eth_conf.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/layout_eth_conf.rs rename to bindgen-tests/tests/expectations/bindings/layout_eth_conf.rs diff --git a/bindgen-tests/tests/expectations/tests/layout_eth_conf_1_0.rs b/bindgen-tests/tests/expectations/bindings/layout_eth_conf_1_0.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/layout_eth_conf_1_0.rs rename to bindgen-tests/tests/expectations/bindings/layout_eth_conf_1_0.rs diff --git a/bindgen-tests/tests/expectations/tests/layout_kni_mbuf.rs b/bindgen-tests/tests/expectations/bindings/layout_kni_mbuf.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/layout_kni_mbuf.rs rename to bindgen-tests/tests/expectations/bindings/layout_kni_mbuf.rs diff --git a/bindgen-tests/tests/expectations/tests/layout_large_align_field.rs b/bindgen-tests/tests/expectations/bindings/layout_large_align_field.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/layout_large_align_field.rs rename to bindgen-tests/tests/expectations/bindings/layout_large_align_field.rs diff --git a/bindgen-tests/tests/expectations/tests/layout_mbuf.rs b/bindgen-tests/tests/expectations/bindings/layout_mbuf.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/layout_mbuf.rs rename to bindgen-tests/tests/expectations/bindings/layout_mbuf.rs diff --git a/bindgen-tests/tests/expectations/tests/layout_mbuf_1_0.rs b/bindgen-tests/tests/expectations/bindings/layout_mbuf_1_0.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/layout_mbuf_1_0.rs rename to bindgen-tests/tests/expectations/bindings/layout_mbuf_1_0.rs diff --git a/bindgen-tests/tests/expectations/tests/libclang-5/abi_variadic_function.rs b/bindgen-tests/tests/expectations/bindings/libclang-5/abi_variadic_function.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/libclang-5/abi_variadic_function.rs rename to bindgen-tests/tests/expectations/bindings/libclang-5/abi_variadic_function.rs diff --git a/bindgen-tests/tests/expectations/tests/libclang-5/auto.rs b/bindgen-tests/tests/expectations/bindings/libclang-5/auto.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/libclang-5/auto.rs rename to bindgen-tests/tests/expectations/bindings/libclang-5/auto.rs diff --git a/bindgen-tests/tests/expectations/tests/libclang-5/call-conv-field.rs b/bindgen-tests/tests/expectations/bindings/libclang-5/call-conv-field.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/libclang-5/call-conv-field.rs rename to bindgen-tests/tests/expectations/bindings/libclang-5/call-conv-field.rs diff --git a/bindgen-tests/tests/expectations/tests/libclang-5/const_bool.rs b/bindgen-tests/tests/expectations/bindings/libclang-5/const_bool.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/libclang-5/const_bool.rs rename to bindgen-tests/tests/expectations/bindings/libclang-5/const_bool.rs diff --git a/bindgen-tests/tests/expectations/tests/libclang-5/constant-evaluate.rs b/bindgen-tests/tests/expectations/bindings/libclang-5/constant-evaluate.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/libclang-5/constant-evaluate.rs rename to bindgen-tests/tests/expectations/bindings/libclang-5/constant-evaluate.rs diff --git a/bindgen-tests/tests/expectations/tests/libclang-5/error-E0600-cannot-apply-unary-negation-to-u32.rs b/bindgen-tests/tests/expectations/bindings/libclang-5/error-E0600-cannot-apply-unary-negation-to-u32.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/libclang-5/error-E0600-cannot-apply-unary-negation-to-u32.rs rename to bindgen-tests/tests/expectations/bindings/libclang-5/error-E0600-cannot-apply-unary-negation-to-u32.rs diff --git a/bindgen-tests/tests/expectations/tests/libclang-5/inline_namespace_nested.rs b/bindgen-tests/tests/expectations/bindings/libclang-5/inline_namespace_nested.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/libclang-5/inline_namespace_nested.rs rename to bindgen-tests/tests/expectations/bindings/libclang-5/inline_namespace_nested.rs diff --git a/bindgen-tests/tests/expectations/tests/libclang-5/issue-769-bad-instantiation-test.rs b/bindgen-tests/tests/expectations/bindings/libclang-5/issue-769-bad-instantiation-test.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/libclang-5/issue-769-bad-instantiation-test.rs rename to bindgen-tests/tests/expectations/bindings/libclang-5/issue-769-bad-instantiation-test.rs diff --git a/bindgen-tests/tests/expectations/tests/libclang-5/mangling-win32.rs b/bindgen-tests/tests/expectations/bindings/libclang-5/mangling-win32.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/libclang-5/mangling-win32.rs rename to bindgen-tests/tests/expectations/bindings/libclang-5/mangling-win32.rs diff --git a/bindgen-tests/tests/expectations/tests/libclang-5/objc_inheritance.rs b/bindgen-tests/tests/expectations/bindings/libclang-5/objc_inheritance.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/libclang-5/objc_inheritance.rs rename to bindgen-tests/tests/expectations/bindings/libclang-5/objc_inheritance.rs diff --git a/bindgen-tests/tests/expectations/tests/libclang-5/objc_template.rs b/bindgen-tests/tests/expectations/bindings/libclang-5/objc_template.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/libclang-5/objc_template.rs rename to bindgen-tests/tests/expectations/bindings/libclang-5/objc_template.rs diff --git a/bindgen-tests/tests/expectations/tests/libclang-5/partial-specialization-and-inheritance.rs b/bindgen-tests/tests/expectations/bindings/libclang-5/partial-specialization-and-inheritance.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/libclang-5/partial-specialization-and-inheritance.rs rename to bindgen-tests/tests/expectations/bindings/libclang-5/partial-specialization-and-inheritance.rs diff --git a/bindgen-tests/tests/expectations/tests/libclang-5/type_alias_template_specialized.rs b/bindgen-tests/tests/expectations/bindings/libclang-5/type_alias_template_specialized.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/libclang-5/type_alias_template_specialized.rs rename to bindgen-tests/tests/expectations/bindings/libclang-5/type_alias_template_specialized.rs diff --git a/bindgen-tests/tests/expectations/tests/libclang-9/abi_variadic_function.rs b/bindgen-tests/tests/expectations/bindings/libclang-9/abi_variadic_function.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/libclang-9/abi_variadic_function.rs rename to bindgen-tests/tests/expectations/bindings/libclang-9/abi_variadic_function.rs diff --git a/bindgen-tests/tests/expectations/tests/libclang-9/auto.rs b/bindgen-tests/tests/expectations/bindings/libclang-9/auto.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/libclang-9/auto.rs rename to bindgen-tests/tests/expectations/bindings/libclang-9/auto.rs diff --git a/bindgen-tests/tests/expectations/tests/libclang-9/call-conv-field.rs b/bindgen-tests/tests/expectations/bindings/libclang-9/call-conv-field.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/libclang-9/call-conv-field.rs rename to bindgen-tests/tests/expectations/bindings/libclang-9/call-conv-field.rs diff --git a/bindgen-tests/tests/expectations/tests/libclang-9/class.rs b/bindgen-tests/tests/expectations/bindings/libclang-9/class.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/libclang-9/class.rs rename to bindgen-tests/tests/expectations/bindings/libclang-9/class.rs diff --git a/bindgen-tests/tests/expectations/tests/libclang-9/class_1_0.rs b/bindgen-tests/tests/expectations/bindings/libclang-9/class_1_0.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/libclang-9/class_1_0.rs rename to bindgen-tests/tests/expectations/bindings/libclang-9/class_1_0.rs diff --git a/bindgen-tests/tests/expectations/tests/libclang-9/const_bool.rs b/bindgen-tests/tests/expectations/bindings/libclang-9/const_bool.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/libclang-9/const_bool.rs rename to bindgen-tests/tests/expectations/bindings/libclang-9/const_bool.rs diff --git a/bindgen-tests/tests/expectations/tests/libclang-9/constant-evaluate.rs b/bindgen-tests/tests/expectations/bindings/libclang-9/constant-evaluate.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/libclang-9/constant-evaluate.rs rename to bindgen-tests/tests/expectations/bindings/libclang-9/constant-evaluate.rs diff --git a/bindgen-tests/tests/expectations/tests/libclang-9/derive-hash-struct-with-incomplete-array.rs b/bindgen-tests/tests/expectations/bindings/libclang-9/derive-hash-struct-with-incomplete-array.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/libclang-9/derive-hash-struct-with-incomplete-array.rs rename to bindgen-tests/tests/expectations/bindings/libclang-9/derive-hash-struct-with-incomplete-array.rs diff --git a/bindgen-tests/tests/expectations/tests/libclang-9/error-E0600-cannot-apply-unary-negation-to-u32.rs b/bindgen-tests/tests/expectations/bindings/libclang-9/error-E0600-cannot-apply-unary-negation-to-u32.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/libclang-9/error-E0600-cannot-apply-unary-negation-to-u32.rs rename to bindgen-tests/tests/expectations/bindings/libclang-9/error-E0600-cannot-apply-unary-negation-to-u32.rs diff --git a/bindgen-tests/tests/expectations/tests/libclang-9/incomplete-array-padding.rs b/bindgen-tests/tests/expectations/bindings/libclang-9/incomplete-array-padding.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/libclang-9/incomplete-array-padding.rs rename to bindgen-tests/tests/expectations/bindings/libclang-9/incomplete-array-padding.rs diff --git a/bindgen-tests/tests/expectations/tests/libclang-9/issue-643-inner-struct.rs b/bindgen-tests/tests/expectations/bindings/libclang-9/issue-643-inner-struct.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/libclang-9/issue-643-inner-struct.rs rename to bindgen-tests/tests/expectations/bindings/libclang-9/issue-643-inner-struct.rs diff --git a/bindgen-tests/tests/expectations/tests/libclang-9/issue-769-bad-instantiation-test.rs b/bindgen-tests/tests/expectations/bindings/libclang-9/issue-769-bad-instantiation-test.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/libclang-9/issue-769-bad-instantiation-test.rs rename to bindgen-tests/tests/expectations/bindings/libclang-9/issue-769-bad-instantiation-test.rs diff --git a/bindgen-tests/tests/expectations/tests/libclang-9/layout_align.rs b/bindgen-tests/tests/expectations/bindings/libclang-9/layout_align.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/libclang-9/layout_align.rs rename to bindgen-tests/tests/expectations/bindings/libclang-9/layout_align.rs diff --git a/bindgen-tests/tests/expectations/tests/libclang-9/mangling-win32.rs b/bindgen-tests/tests/expectations/bindings/libclang-9/mangling-win32.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/libclang-9/mangling-win32.rs rename to bindgen-tests/tests/expectations/bindings/libclang-9/mangling-win32.rs diff --git a/bindgen-tests/tests/expectations/tests/libclang-9/objc_inheritance.rs b/bindgen-tests/tests/expectations/bindings/libclang-9/objc_inheritance.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/libclang-9/objc_inheritance.rs rename to bindgen-tests/tests/expectations/bindings/libclang-9/objc_inheritance.rs diff --git a/bindgen-tests/tests/expectations/tests/libclang-9/objc_template.rs b/bindgen-tests/tests/expectations/bindings/libclang-9/objc_template.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/libclang-9/objc_template.rs rename to bindgen-tests/tests/expectations/bindings/libclang-9/objc_template.rs diff --git a/bindgen-tests/tests/expectations/tests/libclang-9/partial-specialization-and-inheritance.rs b/bindgen-tests/tests/expectations/bindings/libclang-9/partial-specialization-and-inheritance.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/libclang-9/partial-specialization-and-inheritance.rs rename to bindgen-tests/tests/expectations/bindings/libclang-9/partial-specialization-and-inheritance.rs diff --git a/bindgen-tests/tests/expectations/tests/libclang-9/type_alias_template_specialized.rs b/bindgen-tests/tests/expectations/bindings/libclang-9/type_alias_template_specialized.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/libclang-9/type_alias_template_specialized.rs rename to bindgen-tests/tests/expectations/bindings/libclang-9/type_alias_template_specialized.rs diff --git a/bindgen-tests/tests/expectations/tests/libclang-9/zero-sized-array.rs b/bindgen-tests/tests/expectations/bindings/libclang-9/zero-sized-array.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/libclang-9/zero-sized-array.rs rename to bindgen-tests/tests/expectations/bindings/libclang-9/zero-sized-array.rs diff --git a/bindgen-tests/tests/expectations/tests/long_double.rs b/bindgen-tests/tests/expectations/bindings/long_double.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/long_double.rs rename to bindgen-tests/tests/expectations/bindings/long_double.rs diff --git a/bindgen-tests/tests/expectations/tests/macro-expr-basic.rs b/bindgen-tests/tests/expectations/bindings/macro-expr-basic.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/macro-expr-basic.rs rename to bindgen-tests/tests/expectations/bindings/macro-expr-basic.rs diff --git a/bindgen-tests/tests/expectations/tests/macro-expr-uncommon-token.rs b/bindgen-tests/tests/expectations/bindings/macro-expr-uncommon-token.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/macro-expr-uncommon-token.rs rename to bindgen-tests/tests/expectations/bindings/macro-expr-uncommon-token.rs diff --git a/bindgen-tests/tests/expectations/tests/macro-redef.rs b/bindgen-tests/tests/expectations/bindings/macro-redef.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/macro-redef.rs rename to bindgen-tests/tests/expectations/bindings/macro-redef.rs diff --git a/bindgen-tests/tests/expectations/tests/macro_const.rs b/bindgen-tests/tests/expectations/bindings/macro_const.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/macro_const.rs rename to bindgen-tests/tests/expectations/bindings/macro_const.rs diff --git a/bindgen-tests/tests/expectations/tests/macro_const_1_0.rs b/bindgen-tests/tests/expectations/bindings/macro_const_1_0.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/macro_const_1_0.rs rename to bindgen-tests/tests/expectations/bindings/macro_const_1_0.rs diff --git a/bindgen-tests/tests/expectations/tests/maddness-is-avoidable.rs b/bindgen-tests/tests/expectations/bindings/maddness-is-avoidable.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/maddness-is-avoidable.rs rename to bindgen-tests/tests/expectations/bindings/maddness-is-avoidable.rs diff --git a/bindgen-tests/tests/expectations/tests/mangling-ios.rs b/bindgen-tests/tests/expectations/bindings/mangling-ios.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/mangling-ios.rs rename to bindgen-tests/tests/expectations/bindings/mangling-ios.rs diff --git a/bindgen-tests/tests/expectations/tests/mangling-linux32.rs b/bindgen-tests/tests/expectations/bindings/mangling-linux32.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/mangling-linux32.rs rename to bindgen-tests/tests/expectations/bindings/mangling-linux32.rs diff --git a/bindgen-tests/tests/expectations/tests/mangling-linux64.rs b/bindgen-tests/tests/expectations/bindings/mangling-linux64.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/mangling-linux64.rs rename to bindgen-tests/tests/expectations/bindings/mangling-linux64.rs diff --git a/bindgen-tests/tests/expectations/tests/mangling-macos.rs b/bindgen-tests/tests/expectations/bindings/mangling-macos.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/mangling-macos.rs rename to bindgen-tests/tests/expectations/bindings/mangling-macos.rs diff --git a/bindgen-tests/tests/expectations/tests/mangling-win64.rs b/bindgen-tests/tests/expectations/bindings/mangling-win64.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/mangling-win64.rs rename to bindgen-tests/tests/expectations/bindings/mangling-win64.rs diff --git a/bindgen-tests/tests/expectations/tests/merge-extern-blocks.rs b/bindgen-tests/tests/expectations/bindings/merge-extern-blocks.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/merge-extern-blocks.rs rename to bindgen-tests/tests/expectations/bindings/merge-extern-blocks.rs diff --git a/bindgen-tests/tests/expectations/tests/method-mangling.rs b/bindgen-tests/tests/expectations/bindings/method-mangling.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/method-mangling.rs rename to bindgen-tests/tests/expectations/bindings/method-mangling.rs diff --git a/bindgen-tests/tests/expectations/tests/module-allowlisted.rs b/bindgen-tests/tests/expectations/bindings/module-allowlisted.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/module-allowlisted.rs rename to bindgen-tests/tests/expectations/bindings/module-allowlisted.rs diff --git a/bindgen-tests/tests/expectations/tests/msvc-no-usr.rs b/bindgen-tests/tests/expectations/bindings/msvc-no-usr.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/msvc-no-usr.rs rename to bindgen-tests/tests/expectations/bindings/msvc-no-usr.rs diff --git a/bindgen-tests/tests/expectations/tests/multiple-inherit-empty-correct-layout.rs b/bindgen-tests/tests/expectations/bindings/multiple-inherit-empty-correct-layout.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/multiple-inherit-empty-correct-layout.rs rename to bindgen-tests/tests/expectations/bindings/multiple-inherit-empty-correct-layout.rs diff --git a/bindgen-tests/tests/expectations/tests/mutable.rs b/bindgen-tests/tests/expectations/bindings/mutable.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/mutable.rs rename to bindgen-tests/tests/expectations/bindings/mutable.rs diff --git a/bindgen-tests/tests/expectations/tests/namespace.rs b/bindgen-tests/tests/expectations/bindings/namespace.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/namespace.rs rename to bindgen-tests/tests/expectations/bindings/namespace.rs diff --git a/bindgen-tests/tests/expectations/tests/nested-template-typedef.rs b/bindgen-tests/tests/expectations/bindings/nested-template-typedef.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/nested-template-typedef.rs rename to bindgen-tests/tests/expectations/bindings/nested-template-typedef.rs diff --git a/bindgen-tests/tests/expectations/tests/nested.rs b/bindgen-tests/tests/expectations/bindings/nested.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/nested.rs rename to bindgen-tests/tests/expectations/bindings/nested.rs diff --git a/bindgen-tests/tests/expectations/tests/nested_vtable.rs b/bindgen-tests/tests/expectations/bindings/nested_vtable.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/nested_vtable.rs rename to bindgen-tests/tests/expectations/bindings/nested_vtable.rs diff --git a/bindgen-tests/tests/expectations/tests/nested_within_namespace.rs b/bindgen-tests/tests/expectations/bindings/nested_within_namespace.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/nested_within_namespace.rs rename to bindgen-tests/tests/expectations/bindings/nested_within_namespace.rs diff --git a/bindgen-tests/tests/expectations/tests/newtype-enum.rs b/bindgen-tests/tests/expectations/bindings/newtype-enum.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/newtype-enum.rs rename to bindgen-tests/tests/expectations/bindings/newtype-enum.rs diff --git a/bindgen-tests/tests/expectations/tests/newtype-global-enum.rs b/bindgen-tests/tests/expectations/bindings/newtype-global-enum.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/newtype-global-enum.rs rename to bindgen-tests/tests/expectations/bindings/newtype-global-enum.rs diff --git a/bindgen-tests/tests/expectations/tests/no-comments.rs b/bindgen-tests/tests/expectations/bindings/no-comments.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/no-comments.rs rename to bindgen-tests/tests/expectations/bindings/no-comments.rs diff --git a/bindgen-tests/tests/expectations/tests/no-derive-debug.rs b/bindgen-tests/tests/expectations/bindings/no-derive-debug.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/no-derive-debug.rs rename to bindgen-tests/tests/expectations/bindings/no-derive-debug.rs diff --git a/bindgen-tests/tests/expectations/tests/no-derive-default.rs b/bindgen-tests/tests/expectations/bindings/no-derive-default.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/no-derive-default.rs rename to bindgen-tests/tests/expectations/bindings/no-derive-default.rs diff --git a/bindgen-tests/tests/expectations/tests/no-hash-allowlisted.rs b/bindgen-tests/tests/expectations/bindings/no-hash-allowlisted.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/no-hash-allowlisted.rs rename to bindgen-tests/tests/expectations/bindings/no-hash-allowlisted.rs diff --git a/bindgen-tests/tests/expectations/tests/no-hash-opaque.rs b/bindgen-tests/tests/expectations/bindings/no-hash-opaque.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/no-hash-opaque.rs rename to bindgen-tests/tests/expectations/bindings/no-hash-opaque.rs diff --git a/bindgen-tests/tests/expectations/tests/no-partialeq-allowlisted.rs b/bindgen-tests/tests/expectations/bindings/no-partialeq-allowlisted.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/no-partialeq-allowlisted.rs rename to bindgen-tests/tests/expectations/bindings/no-partialeq-allowlisted.rs diff --git a/bindgen-tests/tests/expectations/tests/no-partialeq-opaque.rs b/bindgen-tests/tests/expectations/bindings/no-partialeq-opaque.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/no-partialeq-opaque.rs rename to bindgen-tests/tests/expectations/bindings/no-partialeq-opaque.rs diff --git a/bindgen-tests/tests/expectations/tests/no-recursive-allowlisting.rs b/bindgen-tests/tests/expectations/bindings/no-recursive-allowlisting.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/no-recursive-allowlisting.rs rename to bindgen-tests/tests/expectations/bindings/no-recursive-allowlisting.rs diff --git a/bindgen-tests/tests/expectations/tests/no-std.rs b/bindgen-tests/tests/expectations/bindings/no-std.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/no-std.rs rename to bindgen-tests/tests/expectations/bindings/no-std.rs diff --git a/bindgen-tests/tests/expectations/tests/no_copy.rs b/bindgen-tests/tests/expectations/bindings/no_copy.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/no_copy.rs rename to bindgen-tests/tests/expectations/bindings/no_copy.rs diff --git a/bindgen-tests/tests/expectations/tests/no_copy_allowlisted.rs b/bindgen-tests/tests/expectations/bindings/no_copy_allowlisted.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/no_copy_allowlisted.rs rename to bindgen-tests/tests/expectations/bindings/no_copy_allowlisted.rs diff --git a/bindgen-tests/tests/expectations/tests/no_copy_opaque.rs b/bindgen-tests/tests/expectations/bindings/no_copy_opaque.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/no_copy_opaque.rs rename to bindgen-tests/tests/expectations/bindings/no_copy_opaque.rs diff --git a/bindgen-tests/tests/expectations/tests/no_debug.rs b/bindgen-tests/tests/expectations/bindings/no_debug.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/no_debug.rs rename to bindgen-tests/tests/expectations/bindings/no_debug.rs diff --git a/bindgen-tests/tests/expectations/tests/no_debug_allowlisted.rs b/bindgen-tests/tests/expectations/bindings/no_debug_allowlisted.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/no_debug_allowlisted.rs rename to bindgen-tests/tests/expectations/bindings/no_debug_allowlisted.rs diff --git a/bindgen-tests/tests/expectations/tests/no_debug_bypass_impl_debug.rs b/bindgen-tests/tests/expectations/bindings/no_debug_bypass_impl_debug.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/no_debug_bypass_impl_debug.rs rename to bindgen-tests/tests/expectations/bindings/no_debug_bypass_impl_debug.rs diff --git a/bindgen-tests/tests/expectations/tests/no_debug_opaque.rs b/bindgen-tests/tests/expectations/bindings/no_debug_opaque.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/no_debug_opaque.rs rename to bindgen-tests/tests/expectations/bindings/no_debug_opaque.rs diff --git a/bindgen-tests/tests/expectations/tests/no_default.rs b/bindgen-tests/tests/expectations/bindings/no_default.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/no_default.rs rename to bindgen-tests/tests/expectations/bindings/no_default.rs diff --git a/bindgen-tests/tests/expectations/tests/no_default_allowlisted.rs b/bindgen-tests/tests/expectations/bindings/no_default_allowlisted.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/no_default_allowlisted.rs rename to bindgen-tests/tests/expectations/bindings/no_default_allowlisted.rs diff --git a/bindgen-tests/tests/expectations/tests/no_default_bypass_derive_default.rs b/bindgen-tests/tests/expectations/bindings/no_default_bypass_derive_default.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/no_default_bypass_derive_default.rs rename to bindgen-tests/tests/expectations/bindings/no_default_bypass_derive_default.rs diff --git a/bindgen-tests/tests/expectations/tests/no_default_opaque.rs b/bindgen-tests/tests/expectations/bindings/no_default_opaque.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/no_default_opaque.rs rename to bindgen-tests/tests/expectations/bindings/no_default_opaque.rs diff --git a/bindgen-tests/tests/expectations/tests/no_size_t_is_usize.rs b/bindgen-tests/tests/expectations/bindings/no_size_t_is_usize.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/no_size_t_is_usize.rs rename to bindgen-tests/tests/expectations/bindings/no_size_t_is_usize.rs diff --git a/bindgen-tests/tests/expectations/tests/non-type-params.rs b/bindgen-tests/tests/expectations/bindings/non-type-params.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/non-type-params.rs rename to bindgen-tests/tests/expectations/bindings/non-type-params.rs diff --git a/bindgen-tests/tests/expectations/tests/noreturn.rs b/bindgen-tests/tests/expectations/bindings/noreturn.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/noreturn.rs rename to bindgen-tests/tests/expectations/bindings/noreturn.rs diff --git a/bindgen-tests/tests/expectations/tests/nsBaseHashtable.rs b/bindgen-tests/tests/expectations/bindings/nsBaseHashtable.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/nsBaseHashtable.rs rename to bindgen-tests/tests/expectations/bindings/nsBaseHashtable.rs diff --git a/bindgen-tests/tests/expectations/tests/nsStyleAutoArray.rs b/bindgen-tests/tests/expectations/bindings/nsStyleAutoArray.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/nsStyleAutoArray.rs rename to bindgen-tests/tests/expectations/bindings/nsStyleAutoArray.rs diff --git a/bindgen-tests/tests/expectations/tests/objc_allowlist.rs b/bindgen-tests/tests/expectations/bindings/objc_allowlist.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/objc_allowlist.rs rename to bindgen-tests/tests/expectations/bindings/objc_allowlist.rs diff --git a/bindgen-tests/tests/expectations/tests/objc_blocklist.rs b/bindgen-tests/tests/expectations/bindings/objc_blocklist.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/objc_blocklist.rs rename to bindgen-tests/tests/expectations/bindings/objc_blocklist.rs diff --git a/bindgen-tests/tests/expectations/tests/objc_category.rs b/bindgen-tests/tests/expectations/bindings/objc_category.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/objc_category.rs rename to bindgen-tests/tests/expectations/bindings/objc_category.rs diff --git a/bindgen-tests/tests/expectations/tests/objc_class.rs b/bindgen-tests/tests/expectations/bindings/objc_class.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/objc_class.rs rename to bindgen-tests/tests/expectations/bindings/objc_class.rs diff --git a/bindgen-tests/tests/expectations/tests/objc_class_method.rs b/bindgen-tests/tests/expectations/bindings/objc_class_method.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/objc_class_method.rs rename to bindgen-tests/tests/expectations/bindings/objc_class_method.rs diff --git a/bindgen-tests/tests/expectations/tests/objc_interface.rs b/bindgen-tests/tests/expectations/bindings/objc_interface.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/objc_interface.rs rename to bindgen-tests/tests/expectations/bindings/objc_interface.rs diff --git a/bindgen-tests/tests/expectations/tests/objc_interface_type.rs b/bindgen-tests/tests/expectations/bindings/objc_interface_type.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/objc_interface_type.rs rename to bindgen-tests/tests/expectations/bindings/objc_interface_type.rs diff --git a/bindgen-tests/tests/expectations/tests/objc_method.rs b/bindgen-tests/tests/expectations/bindings/objc_method.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/objc_method.rs rename to bindgen-tests/tests/expectations/bindings/objc_method.rs diff --git a/bindgen-tests/tests/expectations/tests/objc_method_clash.rs b/bindgen-tests/tests/expectations/bindings/objc_method_clash.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/objc_method_clash.rs rename to bindgen-tests/tests/expectations/bindings/objc_method_clash.rs diff --git a/bindgen-tests/tests/expectations/tests/objc_pointer_return_types.rs b/bindgen-tests/tests/expectations/bindings/objc_pointer_return_types.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/objc_pointer_return_types.rs rename to bindgen-tests/tests/expectations/bindings/objc_pointer_return_types.rs diff --git a/bindgen-tests/tests/expectations/tests/objc_property_fnptr.rs b/bindgen-tests/tests/expectations/bindings/objc_property_fnptr.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/objc_property_fnptr.rs rename to bindgen-tests/tests/expectations/bindings/objc_property_fnptr.rs diff --git a/bindgen-tests/tests/expectations/tests/objc_protocol.rs b/bindgen-tests/tests/expectations/bindings/objc_protocol.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/objc_protocol.rs rename to bindgen-tests/tests/expectations/bindings/objc_protocol.rs diff --git a/bindgen-tests/tests/expectations/tests/objc_protocol_inheritance.rs b/bindgen-tests/tests/expectations/bindings/objc_protocol_inheritance.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/objc_protocol_inheritance.rs rename to bindgen-tests/tests/expectations/bindings/objc_protocol_inheritance.rs diff --git a/bindgen-tests/tests/expectations/tests/objc_sel_and_id.rs b/bindgen-tests/tests/expectations/bindings/objc_sel_and_id.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/objc_sel_and_id.rs rename to bindgen-tests/tests/expectations/bindings/objc_sel_and_id.rs diff --git a/bindgen-tests/tests/expectations/tests/only_bitfields.rs b/bindgen-tests/tests/expectations/bindings/only_bitfields.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/only_bitfields.rs rename to bindgen-tests/tests/expectations/bindings/only_bitfields.rs diff --git a/bindgen-tests/tests/expectations/tests/opaque-template-inst-member-2.rs b/bindgen-tests/tests/expectations/bindings/opaque-template-inst-member-2.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/opaque-template-inst-member-2.rs rename to bindgen-tests/tests/expectations/bindings/opaque-template-inst-member-2.rs diff --git a/bindgen-tests/tests/expectations/tests/opaque-template-inst-member.rs b/bindgen-tests/tests/expectations/bindings/opaque-template-inst-member.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/opaque-template-inst-member.rs rename to bindgen-tests/tests/expectations/bindings/opaque-template-inst-member.rs diff --git a/bindgen-tests/tests/expectations/tests/opaque-template-instantiation-namespaced.rs b/bindgen-tests/tests/expectations/bindings/opaque-template-instantiation-namespaced.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/opaque-template-instantiation-namespaced.rs rename to bindgen-tests/tests/expectations/bindings/opaque-template-instantiation-namespaced.rs diff --git a/bindgen-tests/tests/expectations/tests/opaque-template-instantiation.rs b/bindgen-tests/tests/expectations/bindings/opaque-template-instantiation.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/opaque-template-instantiation.rs rename to bindgen-tests/tests/expectations/bindings/opaque-template-instantiation.rs diff --git a/bindgen-tests/tests/expectations/tests/opaque-tracing.rs b/bindgen-tests/tests/expectations/bindings/opaque-tracing.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/opaque-tracing.rs rename to bindgen-tests/tests/expectations/bindings/opaque-tracing.rs diff --git a/bindgen-tests/tests/expectations/tests/opaque_in_struct.rs b/bindgen-tests/tests/expectations/bindings/opaque_in_struct.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/opaque_in_struct.rs rename to bindgen-tests/tests/expectations/bindings/opaque_in_struct.rs diff --git a/bindgen-tests/tests/expectations/tests/opaque_pointer.rs b/bindgen-tests/tests/expectations/bindings/opaque_pointer.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/opaque_pointer.rs rename to bindgen-tests/tests/expectations/bindings/opaque_pointer.rs diff --git a/bindgen-tests/tests/expectations/tests/opaque_typedef.rs b/bindgen-tests/tests/expectations/bindings/opaque_typedef.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/opaque_typedef.rs rename to bindgen-tests/tests/expectations/bindings/opaque_typedef.rs diff --git a/bindgen-tests/tests/expectations/tests/operator.rs b/bindgen-tests/tests/expectations/bindings/operator.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/operator.rs rename to bindgen-tests/tests/expectations/bindings/operator.rs diff --git a/bindgen-tests/tests/expectations/tests/ord-enum.rs b/bindgen-tests/tests/expectations/bindings/ord-enum.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/ord-enum.rs rename to bindgen-tests/tests/expectations/bindings/ord-enum.rs diff --git a/bindgen-tests/tests/expectations/tests/overflowed_enum.rs b/bindgen-tests/tests/expectations/bindings/overflowed_enum.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/overflowed_enum.rs rename to bindgen-tests/tests/expectations/bindings/overflowed_enum.rs diff --git a/bindgen-tests/tests/expectations/tests/overloading.rs b/bindgen-tests/tests/expectations/bindings/overloading.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/overloading.rs rename to bindgen-tests/tests/expectations/bindings/overloading.rs diff --git a/bindgen-tests/tests/expectations/tests/packed-bitfield.rs b/bindgen-tests/tests/expectations/bindings/packed-bitfield.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/packed-bitfield.rs rename to bindgen-tests/tests/expectations/bindings/packed-bitfield.rs diff --git a/bindgen-tests/tests/expectations/tests/packed-n-with-padding.rs b/bindgen-tests/tests/expectations/bindings/packed-n-with-padding.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/packed-n-with-padding.rs rename to bindgen-tests/tests/expectations/bindings/packed-n-with-padding.rs diff --git a/bindgen-tests/tests/expectations/tests/packed-vtable.rs b/bindgen-tests/tests/expectations/bindings/packed-vtable.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/packed-vtable.rs rename to bindgen-tests/tests/expectations/bindings/packed-vtable.rs diff --git a/bindgen-tests/tests/expectations/tests/parm-union.rs b/bindgen-tests/tests/expectations/bindings/parm-union.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/parm-union.rs rename to bindgen-tests/tests/expectations/bindings/parm-union.rs diff --git a/bindgen-tests/tests/expectations/tests/parsecb-anonymous-enum-variant-rename.rs b/bindgen-tests/tests/expectations/bindings/parsecb-anonymous-enum-variant-rename.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/parsecb-anonymous-enum-variant-rename.rs rename to bindgen-tests/tests/expectations/bindings/parsecb-anonymous-enum-variant-rename.rs diff --git a/bindgen-tests/tests/expectations/tests/pointer-attr.rs b/bindgen-tests/tests/expectations/bindings/pointer-attr.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/pointer-attr.rs rename to bindgen-tests/tests/expectations/bindings/pointer-attr.rs diff --git a/bindgen-tests/tests/expectations/tests/prepend-enum-constified-variant.rs b/bindgen-tests/tests/expectations/bindings/prepend-enum-constified-variant.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/prepend-enum-constified-variant.rs rename to bindgen-tests/tests/expectations/bindings/prepend-enum-constified-variant.rs diff --git a/bindgen-tests/tests/expectations/tests/prepend_enum_name.rs b/bindgen-tests/tests/expectations/bindings/prepend_enum_name.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/prepend_enum_name.rs rename to bindgen-tests/tests/expectations/bindings/prepend_enum_name.rs diff --git a/bindgen-tests/tests/expectations/tests/private.rs b/bindgen-tests/tests/expectations/bindings/private.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/private.rs rename to bindgen-tests/tests/expectations/bindings/private.rs diff --git a/bindgen-tests/tests/expectations/tests/private_fields.rs b/bindgen-tests/tests/expectations/bindings/private_fields.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/private_fields.rs rename to bindgen-tests/tests/expectations/bindings/private_fields.rs diff --git a/bindgen-tests/tests/expectations/tests/public-dtor.rs b/bindgen-tests/tests/expectations/bindings/public-dtor.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/public-dtor.rs rename to bindgen-tests/tests/expectations/bindings/public-dtor.rs diff --git a/bindgen-tests/tests/expectations/tests/qualified-dependent-types.rs b/bindgen-tests/tests/expectations/bindings/qualified-dependent-types.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/qualified-dependent-types.rs rename to bindgen-tests/tests/expectations/bindings/qualified-dependent-types.rs diff --git a/bindgen-tests/tests/expectations/tests/redeclaration.rs b/bindgen-tests/tests/expectations/bindings/redeclaration.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/redeclaration.rs rename to bindgen-tests/tests/expectations/bindings/redeclaration.rs diff --git a/bindgen-tests/tests/expectations/tests/ref_argument_array.rs b/bindgen-tests/tests/expectations/bindings/ref_argument_array.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/ref_argument_array.rs rename to bindgen-tests/tests/expectations/bindings/ref_argument_array.rs diff --git a/bindgen-tests/tests/expectations/tests/reparented_replacement.rs b/bindgen-tests/tests/expectations/bindings/reparented_replacement.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/reparented_replacement.rs rename to bindgen-tests/tests/expectations/bindings/reparented_replacement.rs diff --git a/bindgen-tests/tests/expectations/tests/replace_template_alias.rs b/bindgen-tests/tests/expectations/bindings/replace_template_alias.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/replace_template_alias.rs rename to bindgen-tests/tests/expectations/bindings/replace_template_alias.rs diff --git a/bindgen-tests/tests/expectations/tests/replace_use.rs b/bindgen-tests/tests/expectations/bindings/replace_use.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/replace_use.rs rename to bindgen-tests/tests/expectations/bindings/replace_use.rs diff --git a/bindgen-tests/tests/expectations/tests/replaces_double.rs b/bindgen-tests/tests/expectations/bindings/replaces_double.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/replaces_double.rs rename to bindgen-tests/tests/expectations/bindings/replaces_double.rs diff --git a/bindgen-tests/tests/expectations/tests/repr-align.rs b/bindgen-tests/tests/expectations/bindings/repr-align.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/repr-align.rs rename to bindgen-tests/tests/expectations/bindings/repr-align.rs diff --git a/bindgen-tests/tests/expectations/tests/resolved_type_def_function.rs b/bindgen-tests/tests/expectations/bindings/resolved_type_def_function.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/resolved_type_def_function.rs rename to bindgen-tests/tests/expectations/bindings/resolved_type_def_function.rs diff --git a/bindgen-tests/tests/expectations/tests/same_struct_name_in_different_namespaces.rs b/bindgen-tests/tests/expectations/bindings/same_struct_name_in_different_namespaces.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/same_struct_name_in_different_namespaces.rs rename to bindgen-tests/tests/expectations/bindings/same_struct_name_in_different_namespaces.rs diff --git a/bindgen-tests/tests/expectations/tests/sentry-defined-multiple-times.rs b/bindgen-tests/tests/expectations/bindings/sentry-defined-multiple-times.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/sentry-defined-multiple-times.rs rename to bindgen-tests/tests/expectations/bindings/sentry-defined-multiple-times.rs diff --git a/bindgen-tests/tests/expectations/tests/short-enums.rs b/bindgen-tests/tests/expectations/bindings/short-enums.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/short-enums.rs rename to bindgen-tests/tests/expectations/bindings/short-enums.rs diff --git a/bindgen-tests/tests/expectations/tests/size_t_template.rs b/bindgen-tests/tests/expectations/bindings/size_t_template.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/size_t_template.rs rename to bindgen-tests/tests/expectations/bindings/size_t_template.rs diff --git a/bindgen-tests/tests/expectations/tests/sort-items.rs b/bindgen-tests/tests/expectations/bindings/sort-items.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/sort-items.rs rename to bindgen-tests/tests/expectations/bindings/sort-items.rs diff --git a/bindgen-tests/tests/expectations/tests/sorted_items.rs b/bindgen-tests/tests/expectations/bindings/sorted_items.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/sorted_items.rs rename to bindgen-tests/tests/expectations/bindings/sorted_items.rs diff --git a/bindgen-tests/tests/expectations/tests/stdint_typedef.rs b/bindgen-tests/tests/expectations/bindings/stdint_typedef.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/stdint_typedef.rs rename to bindgen-tests/tests/expectations/bindings/stdint_typedef.rs diff --git a/bindgen-tests/tests/expectations/tests/struct_containing_forward_declared_struct.rs b/bindgen-tests/tests/expectations/bindings/struct_containing_forward_declared_struct.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/struct_containing_forward_declared_struct.rs rename to bindgen-tests/tests/expectations/bindings/struct_containing_forward_declared_struct.rs diff --git a/bindgen-tests/tests/expectations/tests/struct_typedef.rs b/bindgen-tests/tests/expectations/bindings/struct_typedef.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/struct_typedef.rs rename to bindgen-tests/tests/expectations/bindings/struct_typedef.rs diff --git a/bindgen-tests/tests/expectations/tests/struct_typedef_ns.rs b/bindgen-tests/tests/expectations/bindings/struct_typedef_ns.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/struct_typedef_ns.rs rename to bindgen-tests/tests/expectations/bindings/struct_typedef_ns.rs diff --git a/bindgen-tests/tests/expectations/tests/struct_with_anon_struct.rs b/bindgen-tests/tests/expectations/bindings/struct_with_anon_struct.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/struct_with_anon_struct.rs rename to bindgen-tests/tests/expectations/bindings/struct_with_anon_struct.rs diff --git a/bindgen-tests/tests/expectations/tests/struct_with_anon_struct_array.rs b/bindgen-tests/tests/expectations/bindings/struct_with_anon_struct_array.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/struct_with_anon_struct_array.rs rename to bindgen-tests/tests/expectations/bindings/struct_with_anon_struct_array.rs diff --git a/bindgen-tests/tests/expectations/tests/struct_with_anon_struct_pointer.rs b/bindgen-tests/tests/expectations/bindings/struct_with_anon_struct_pointer.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/struct_with_anon_struct_pointer.rs rename to bindgen-tests/tests/expectations/bindings/struct_with_anon_struct_pointer.rs diff --git a/bindgen-tests/tests/expectations/tests/struct_with_anon_union.rs b/bindgen-tests/tests/expectations/bindings/struct_with_anon_union.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/struct_with_anon_union.rs rename to bindgen-tests/tests/expectations/bindings/struct_with_anon_union.rs diff --git a/bindgen-tests/tests/expectations/tests/struct_with_anon_union_1_0.rs b/bindgen-tests/tests/expectations/bindings/struct_with_anon_union_1_0.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/struct_with_anon_union_1_0.rs rename to bindgen-tests/tests/expectations/bindings/struct_with_anon_union_1_0.rs diff --git a/bindgen-tests/tests/expectations/tests/struct_with_anon_unnamed_struct.rs b/bindgen-tests/tests/expectations/bindings/struct_with_anon_unnamed_struct.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/struct_with_anon_unnamed_struct.rs rename to bindgen-tests/tests/expectations/bindings/struct_with_anon_unnamed_struct.rs diff --git a/bindgen-tests/tests/expectations/tests/struct_with_anon_unnamed_union.rs b/bindgen-tests/tests/expectations/bindings/struct_with_anon_unnamed_union.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/struct_with_anon_unnamed_union.rs rename to bindgen-tests/tests/expectations/bindings/struct_with_anon_unnamed_union.rs diff --git a/bindgen-tests/tests/expectations/tests/struct_with_anon_unnamed_union_1_0.rs b/bindgen-tests/tests/expectations/bindings/struct_with_anon_unnamed_union_1_0.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/struct_with_anon_unnamed_union_1_0.rs rename to bindgen-tests/tests/expectations/bindings/struct_with_anon_unnamed_union_1_0.rs diff --git a/bindgen-tests/tests/expectations/tests/struct_with_bitfields.rs b/bindgen-tests/tests/expectations/bindings/struct_with_bitfields.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/struct_with_bitfields.rs rename to bindgen-tests/tests/expectations/bindings/struct_with_bitfields.rs diff --git a/bindgen-tests/tests/expectations/tests/struct_with_derive_debug.rs b/bindgen-tests/tests/expectations/bindings/struct_with_derive_debug.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/struct_with_derive_debug.rs rename to bindgen-tests/tests/expectations/bindings/struct_with_derive_debug.rs diff --git a/bindgen-tests/tests/expectations/tests/struct_with_large_array.rs b/bindgen-tests/tests/expectations/bindings/struct_with_large_array.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/struct_with_large_array.rs rename to bindgen-tests/tests/expectations/bindings/struct_with_large_array.rs diff --git a/bindgen-tests/tests/expectations/tests/struct_with_nesting.rs b/bindgen-tests/tests/expectations/bindings/struct_with_nesting.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/struct_with_nesting.rs rename to bindgen-tests/tests/expectations/bindings/struct_with_nesting.rs diff --git a/bindgen-tests/tests/expectations/tests/struct_with_nesting_1_0.rs b/bindgen-tests/tests/expectations/bindings/struct_with_nesting_1_0.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/struct_with_nesting_1_0.rs rename to bindgen-tests/tests/expectations/bindings/struct_with_nesting_1_0.rs diff --git a/bindgen-tests/tests/expectations/tests/struct_with_packing.rs b/bindgen-tests/tests/expectations/bindings/struct_with_packing.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/struct_with_packing.rs rename to bindgen-tests/tests/expectations/bindings/struct_with_packing.rs diff --git a/bindgen-tests/tests/expectations/tests/struct_with_struct.rs b/bindgen-tests/tests/expectations/bindings/struct_with_struct.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/struct_with_struct.rs rename to bindgen-tests/tests/expectations/bindings/struct_with_struct.rs diff --git a/bindgen-tests/tests/expectations/tests/struct_with_typedef_template_arg.rs b/bindgen-tests/tests/expectations/bindings/struct_with_typedef_template_arg.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/struct_with_typedef_template_arg.rs rename to bindgen-tests/tests/expectations/bindings/struct_with_typedef_template_arg.rs diff --git a/bindgen-tests/tests/expectations/tests/template-fun-ty.rs b/bindgen-tests/tests/expectations/bindings/template-fun-ty.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/template-fun-ty.rs rename to bindgen-tests/tests/expectations/bindings/template-fun-ty.rs diff --git a/bindgen-tests/tests/expectations/tests/template-param-usage-0.rs b/bindgen-tests/tests/expectations/bindings/template-param-usage-0.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/template-param-usage-0.rs rename to bindgen-tests/tests/expectations/bindings/template-param-usage-0.rs diff --git a/bindgen-tests/tests/expectations/tests/template-param-usage-1.rs b/bindgen-tests/tests/expectations/bindings/template-param-usage-1.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/template-param-usage-1.rs rename to bindgen-tests/tests/expectations/bindings/template-param-usage-1.rs diff --git a/bindgen-tests/tests/expectations/tests/template-param-usage-10.rs b/bindgen-tests/tests/expectations/bindings/template-param-usage-10.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/template-param-usage-10.rs rename to bindgen-tests/tests/expectations/bindings/template-param-usage-10.rs diff --git a/bindgen-tests/tests/expectations/tests/template-param-usage-11.rs b/bindgen-tests/tests/expectations/bindings/template-param-usage-11.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/template-param-usage-11.rs rename to bindgen-tests/tests/expectations/bindings/template-param-usage-11.rs diff --git a/bindgen-tests/tests/expectations/tests/template-param-usage-12.rs b/bindgen-tests/tests/expectations/bindings/template-param-usage-12.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/template-param-usage-12.rs rename to bindgen-tests/tests/expectations/bindings/template-param-usage-12.rs diff --git a/bindgen-tests/tests/expectations/tests/template-param-usage-13.rs b/bindgen-tests/tests/expectations/bindings/template-param-usage-13.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/template-param-usage-13.rs rename to bindgen-tests/tests/expectations/bindings/template-param-usage-13.rs diff --git a/bindgen-tests/tests/expectations/tests/template-param-usage-14.rs b/bindgen-tests/tests/expectations/bindings/template-param-usage-14.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/template-param-usage-14.rs rename to bindgen-tests/tests/expectations/bindings/template-param-usage-14.rs diff --git a/bindgen-tests/tests/expectations/tests/template-param-usage-15.rs b/bindgen-tests/tests/expectations/bindings/template-param-usage-15.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/template-param-usage-15.rs rename to bindgen-tests/tests/expectations/bindings/template-param-usage-15.rs diff --git a/bindgen-tests/tests/expectations/tests/template-param-usage-2.rs b/bindgen-tests/tests/expectations/bindings/template-param-usage-2.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/template-param-usage-2.rs rename to bindgen-tests/tests/expectations/bindings/template-param-usage-2.rs diff --git a/bindgen-tests/tests/expectations/tests/template-param-usage-3.rs b/bindgen-tests/tests/expectations/bindings/template-param-usage-3.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/template-param-usage-3.rs rename to bindgen-tests/tests/expectations/bindings/template-param-usage-3.rs diff --git a/bindgen-tests/tests/expectations/tests/template-param-usage-4.rs b/bindgen-tests/tests/expectations/bindings/template-param-usage-4.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/template-param-usage-4.rs rename to bindgen-tests/tests/expectations/bindings/template-param-usage-4.rs diff --git a/bindgen-tests/tests/expectations/tests/template-param-usage-5.rs b/bindgen-tests/tests/expectations/bindings/template-param-usage-5.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/template-param-usage-5.rs rename to bindgen-tests/tests/expectations/bindings/template-param-usage-5.rs diff --git a/bindgen-tests/tests/expectations/tests/template-param-usage-6.rs b/bindgen-tests/tests/expectations/bindings/template-param-usage-6.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/template-param-usage-6.rs rename to bindgen-tests/tests/expectations/bindings/template-param-usage-6.rs diff --git a/bindgen-tests/tests/expectations/tests/template-param-usage-7.rs b/bindgen-tests/tests/expectations/bindings/template-param-usage-7.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/template-param-usage-7.rs rename to bindgen-tests/tests/expectations/bindings/template-param-usage-7.rs diff --git a/bindgen-tests/tests/expectations/tests/template-param-usage-8.rs b/bindgen-tests/tests/expectations/bindings/template-param-usage-8.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/template-param-usage-8.rs rename to bindgen-tests/tests/expectations/bindings/template-param-usage-8.rs diff --git a/bindgen-tests/tests/expectations/tests/template-param-usage-9.rs b/bindgen-tests/tests/expectations/bindings/template-param-usage-9.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/template-param-usage-9.rs rename to bindgen-tests/tests/expectations/bindings/template-param-usage-9.rs diff --git a/bindgen-tests/tests/expectations/tests/template-with-var.rs b/bindgen-tests/tests/expectations/bindings/template-with-var.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/template-with-var.rs rename to bindgen-tests/tests/expectations/bindings/template-with-var.rs diff --git a/bindgen-tests/tests/expectations/tests/template.rs b/bindgen-tests/tests/expectations/bindings/template.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/template.rs rename to bindgen-tests/tests/expectations/bindings/template.rs diff --git a/bindgen-tests/tests/expectations/tests/template_alias.rs b/bindgen-tests/tests/expectations/bindings/template_alias.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/template_alias.rs rename to bindgen-tests/tests/expectations/bindings/template_alias.rs diff --git a/bindgen-tests/tests/expectations/tests/template_alias_basic.rs b/bindgen-tests/tests/expectations/bindings/template_alias_basic.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/template_alias_basic.rs rename to bindgen-tests/tests/expectations/bindings/template_alias_basic.rs diff --git a/bindgen-tests/tests/expectations/tests/template_alias_namespace.rs b/bindgen-tests/tests/expectations/bindings/template_alias_namespace.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/template_alias_namespace.rs rename to bindgen-tests/tests/expectations/bindings/template_alias_namespace.rs diff --git a/bindgen-tests/tests/expectations/tests/template_fun.rs b/bindgen-tests/tests/expectations/bindings/template_fun.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/template_fun.rs rename to bindgen-tests/tests/expectations/bindings/template_fun.rs diff --git a/bindgen-tests/tests/expectations/tests/template_instantiation_with_fn_local_type.rs b/bindgen-tests/tests/expectations/bindings/template_instantiation_with_fn_local_type.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/template_instantiation_with_fn_local_type.rs rename to bindgen-tests/tests/expectations/bindings/template_instantiation_with_fn_local_type.rs diff --git a/bindgen-tests/tests/expectations/tests/template_partial_specification.rs b/bindgen-tests/tests/expectations/bindings/template_partial_specification.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/template_partial_specification.rs rename to bindgen-tests/tests/expectations/bindings/template_partial_specification.rs diff --git a/bindgen-tests/tests/expectations/tests/template_typedef_transitive_param.rs b/bindgen-tests/tests/expectations/bindings/template_typedef_transitive_param.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/template_typedef_transitive_param.rs rename to bindgen-tests/tests/expectations/bindings/template_typedef_transitive_param.rs diff --git a/bindgen-tests/tests/expectations/tests/template_typedefs.rs b/bindgen-tests/tests/expectations/bindings/template_typedefs.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/template_typedefs.rs rename to bindgen-tests/tests/expectations/bindings/template_typedefs.rs diff --git a/bindgen-tests/tests/expectations/tests/templateref_opaque.rs b/bindgen-tests/tests/expectations/bindings/templateref_opaque.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/templateref_opaque.rs rename to bindgen-tests/tests/expectations/bindings/templateref_opaque.rs diff --git a/bindgen-tests/tests/expectations/tests/templatized-bitfield.rs b/bindgen-tests/tests/expectations/bindings/templatized-bitfield.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/templatized-bitfield.rs rename to bindgen-tests/tests/expectations/bindings/templatized-bitfield.rs diff --git a/bindgen-tests/tests/expectations/tests/test_mixed_header_and_header_contents.rs b/bindgen-tests/tests/expectations/bindings/test_mixed_header_and_header_contents.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/test_mixed_header_and_header_contents.rs rename to bindgen-tests/tests/expectations/bindings/test_mixed_header_and_header_contents.rs diff --git a/bindgen-tests/tests/expectations/tests/test_multiple_header_calls_in_builder.rs b/bindgen-tests/tests/expectations/bindings/test_multiple_header_calls_in_builder.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/test_multiple_header_calls_in_builder.rs rename to bindgen-tests/tests/expectations/bindings/test_multiple_header_calls_in_builder.rs diff --git a/bindgen-tests/tests/expectations/tests/timex.rs b/bindgen-tests/tests/expectations/bindings/timex.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/timex.rs rename to bindgen-tests/tests/expectations/bindings/timex.rs diff --git a/bindgen-tests/tests/expectations/tests/transform-op.rs b/bindgen-tests/tests/expectations/bindings/transform-op.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/transform-op.rs rename to bindgen-tests/tests/expectations/bindings/transform-op.rs diff --git a/bindgen-tests/tests/expectations/tests/type-referenced-by-allowlisted-function.rs b/bindgen-tests/tests/expectations/bindings/type-referenced-by-allowlisted-function.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/type-referenced-by-allowlisted-function.rs rename to bindgen-tests/tests/expectations/bindings/type-referenced-by-allowlisted-function.rs diff --git a/bindgen-tests/tests/expectations/tests/type_alias_empty.rs b/bindgen-tests/tests/expectations/bindings/type_alias_empty.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/type_alias_empty.rs rename to bindgen-tests/tests/expectations/bindings/type_alias_empty.rs diff --git a/bindgen-tests/tests/expectations/tests/type_alias_partial_template_especialization.rs b/bindgen-tests/tests/expectations/bindings/type_alias_partial_template_especialization.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/type_alias_partial_template_especialization.rs rename to bindgen-tests/tests/expectations/bindings/type_alias_partial_template_especialization.rs diff --git a/bindgen-tests/tests/expectations/tests/typedef-pointer-overlap.rs b/bindgen-tests/tests/expectations/bindings/typedef-pointer-overlap.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/typedef-pointer-overlap.rs rename to bindgen-tests/tests/expectations/bindings/typedef-pointer-overlap.rs diff --git a/bindgen-tests/tests/expectations/tests/typedefd-array-as-function-arg.rs b/bindgen-tests/tests/expectations/bindings/typedefd-array-as-function-arg.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/typedefd-array-as-function-arg.rs rename to bindgen-tests/tests/expectations/bindings/typedefd-array-as-function-arg.rs diff --git a/bindgen-tests/tests/expectations/tests/typeref.rs b/bindgen-tests/tests/expectations/bindings/typeref.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/typeref.rs rename to bindgen-tests/tests/expectations/bindings/typeref.rs diff --git a/bindgen-tests/tests/expectations/tests/typeref_1_0.rs b/bindgen-tests/tests/expectations/bindings/typeref_1_0.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/typeref_1_0.rs rename to bindgen-tests/tests/expectations/bindings/typeref_1_0.rs diff --git a/bindgen-tests/tests/expectations/tests/underscore.rs b/bindgen-tests/tests/expectations/bindings/underscore.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/underscore.rs rename to bindgen-tests/tests/expectations/bindings/underscore.rs diff --git a/bindgen-tests/tests/expectations/tests/union-align.rs b/bindgen-tests/tests/expectations/bindings/union-align.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/union-align.rs rename to bindgen-tests/tests/expectations/bindings/union-align.rs diff --git a/bindgen-tests/tests/expectations/tests/union-in-ns.rs b/bindgen-tests/tests/expectations/bindings/union-in-ns.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/union-in-ns.rs rename to bindgen-tests/tests/expectations/bindings/union-in-ns.rs diff --git a/bindgen-tests/tests/expectations/tests/union-in-ns_1_0.rs b/bindgen-tests/tests/expectations/bindings/union-in-ns_1_0.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/union-in-ns_1_0.rs rename to bindgen-tests/tests/expectations/bindings/union-in-ns_1_0.rs diff --git a/bindgen-tests/tests/expectations/tests/union_bitfield.rs b/bindgen-tests/tests/expectations/bindings/union_bitfield.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/union_bitfield.rs rename to bindgen-tests/tests/expectations/bindings/union_bitfield.rs diff --git a/bindgen-tests/tests/expectations/tests/union_bitfield_1_0.rs b/bindgen-tests/tests/expectations/bindings/union_bitfield_1_0.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/union_bitfield_1_0.rs rename to bindgen-tests/tests/expectations/bindings/union_bitfield_1_0.rs diff --git a/bindgen-tests/tests/expectations/tests/union_dtor.rs b/bindgen-tests/tests/expectations/bindings/union_dtor.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/union_dtor.rs rename to bindgen-tests/tests/expectations/bindings/union_dtor.rs diff --git a/bindgen-tests/tests/expectations/tests/union_dtor_1_0.rs b/bindgen-tests/tests/expectations/bindings/union_dtor_1_0.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/union_dtor_1_0.rs rename to bindgen-tests/tests/expectations/bindings/union_dtor_1_0.rs diff --git a/bindgen-tests/tests/expectations/tests/union_fields.rs b/bindgen-tests/tests/expectations/bindings/union_fields.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/union_fields.rs rename to bindgen-tests/tests/expectations/bindings/union_fields.rs diff --git a/bindgen-tests/tests/expectations/tests/union_fields_1_0.rs b/bindgen-tests/tests/expectations/bindings/union_fields_1_0.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/union_fields_1_0.rs rename to bindgen-tests/tests/expectations/bindings/union_fields_1_0.rs diff --git a/bindgen-tests/tests/expectations/tests/union_template.rs b/bindgen-tests/tests/expectations/bindings/union_template.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/union_template.rs rename to bindgen-tests/tests/expectations/bindings/union_template.rs diff --git a/bindgen-tests/tests/expectations/tests/union_template_1_0.rs b/bindgen-tests/tests/expectations/bindings/union_template_1_0.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/union_template_1_0.rs rename to bindgen-tests/tests/expectations/bindings/union_template_1_0.rs diff --git a/bindgen-tests/tests/expectations/tests/union_with_anon_struct.rs b/bindgen-tests/tests/expectations/bindings/union_with_anon_struct.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/union_with_anon_struct.rs rename to bindgen-tests/tests/expectations/bindings/union_with_anon_struct.rs diff --git a/bindgen-tests/tests/expectations/tests/union_with_anon_struct_1_0.rs b/bindgen-tests/tests/expectations/bindings/union_with_anon_struct_1_0.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/union_with_anon_struct_1_0.rs rename to bindgen-tests/tests/expectations/bindings/union_with_anon_struct_1_0.rs diff --git a/bindgen-tests/tests/expectations/tests/union_with_anon_struct_bitfield.rs b/bindgen-tests/tests/expectations/bindings/union_with_anon_struct_bitfield.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/union_with_anon_struct_bitfield.rs rename to bindgen-tests/tests/expectations/bindings/union_with_anon_struct_bitfield.rs diff --git a/bindgen-tests/tests/expectations/tests/union_with_anon_struct_bitfield_1_0.rs b/bindgen-tests/tests/expectations/bindings/union_with_anon_struct_bitfield_1_0.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/union_with_anon_struct_bitfield_1_0.rs rename to bindgen-tests/tests/expectations/bindings/union_with_anon_struct_bitfield_1_0.rs diff --git a/bindgen-tests/tests/expectations/tests/union_with_anon_union.rs b/bindgen-tests/tests/expectations/bindings/union_with_anon_union.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/union_with_anon_union.rs rename to bindgen-tests/tests/expectations/bindings/union_with_anon_union.rs diff --git a/bindgen-tests/tests/expectations/tests/union_with_anon_union_1_0.rs b/bindgen-tests/tests/expectations/bindings/union_with_anon_union_1_0.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/union_with_anon_union_1_0.rs rename to bindgen-tests/tests/expectations/bindings/union_with_anon_union_1_0.rs diff --git a/bindgen-tests/tests/expectations/tests/union_with_anon_unnamed_struct.rs b/bindgen-tests/tests/expectations/bindings/union_with_anon_unnamed_struct.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/union_with_anon_unnamed_struct.rs rename to bindgen-tests/tests/expectations/bindings/union_with_anon_unnamed_struct.rs diff --git a/bindgen-tests/tests/expectations/tests/union_with_anon_unnamed_struct_1_0.rs b/bindgen-tests/tests/expectations/bindings/union_with_anon_unnamed_struct_1_0.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/union_with_anon_unnamed_struct_1_0.rs rename to bindgen-tests/tests/expectations/bindings/union_with_anon_unnamed_struct_1_0.rs diff --git a/bindgen-tests/tests/expectations/tests/union_with_anon_unnamed_union.rs b/bindgen-tests/tests/expectations/bindings/union_with_anon_unnamed_union.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/union_with_anon_unnamed_union.rs rename to bindgen-tests/tests/expectations/bindings/union_with_anon_unnamed_union.rs diff --git a/bindgen-tests/tests/expectations/tests/union_with_anon_unnamed_union_1_0.rs b/bindgen-tests/tests/expectations/bindings/union_with_anon_unnamed_union_1_0.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/union_with_anon_unnamed_union_1_0.rs rename to bindgen-tests/tests/expectations/bindings/union_with_anon_unnamed_union_1_0.rs diff --git a/bindgen-tests/tests/expectations/tests/union_with_big_member.rs b/bindgen-tests/tests/expectations/bindings/union_with_big_member.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/union_with_big_member.rs rename to bindgen-tests/tests/expectations/bindings/union_with_big_member.rs diff --git a/bindgen-tests/tests/expectations/tests/union_with_big_member_1_0.rs b/bindgen-tests/tests/expectations/bindings/union_with_big_member_1_0.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/union_with_big_member_1_0.rs rename to bindgen-tests/tests/expectations/bindings/union_with_big_member_1_0.rs diff --git a/bindgen-tests/tests/expectations/tests/union_with_nesting.rs b/bindgen-tests/tests/expectations/bindings/union_with_nesting.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/union_with_nesting.rs rename to bindgen-tests/tests/expectations/bindings/union_with_nesting.rs diff --git a/bindgen-tests/tests/expectations/tests/union_with_nesting_1_0.rs b/bindgen-tests/tests/expectations/bindings/union_with_nesting_1_0.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/union_with_nesting_1_0.rs rename to bindgen-tests/tests/expectations/bindings/union_with_nesting_1_0.rs diff --git a/bindgen-tests/tests/expectations/tests/union_with_non_copy_member.rs b/bindgen-tests/tests/expectations/bindings/union_with_non_copy_member.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/union_with_non_copy_member.rs rename to bindgen-tests/tests/expectations/bindings/union_with_non_copy_member.rs diff --git a/bindgen-tests/tests/expectations/tests/unknown_attr.rs b/bindgen-tests/tests/expectations/bindings/unknown_attr.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/unknown_attr.rs rename to bindgen-tests/tests/expectations/bindings/unknown_attr.rs diff --git a/bindgen-tests/tests/expectations/tests/unsorted-items.rs b/bindgen-tests/tests/expectations/bindings/unsorted-items.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/unsorted-items.rs rename to bindgen-tests/tests/expectations/bindings/unsorted-items.rs diff --git a/bindgen-tests/tests/expectations/tests/use-core.rs b/bindgen-tests/tests/expectations/bindings/use-core.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/use-core.rs rename to bindgen-tests/tests/expectations/bindings/use-core.rs diff --git a/bindgen-tests/tests/expectations/tests/use-core_1_0.rs b/bindgen-tests/tests/expectations/bindings/use-core_1_0.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/use-core_1_0.rs rename to bindgen-tests/tests/expectations/bindings/use-core_1_0.rs diff --git a/bindgen-tests/tests/expectations/tests/using.rs b/bindgen-tests/tests/expectations/bindings/using.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/using.rs rename to bindgen-tests/tests/expectations/bindings/using.rs diff --git a/bindgen-tests/tests/expectations/tests/var-tracing.rs b/bindgen-tests/tests/expectations/bindings/var-tracing.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/var-tracing.rs rename to bindgen-tests/tests/expectations/bindings/var-tracing.rs diff --git a/bindgen-tests/tests/expectations/tests/variadic-method.rs b/bindgen-tests/tests/expectations/bindings/variadic-method.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/variadic-method.rs rename to bindgen-tests/tests/expectations/bindings/variadic-method.rs diff --git a/bindgen-tests/tests/expectations/tests/variadic_template_function.rs b/bindgen-tests/tests/expectations/bindings/variadic_template_function.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/variadic_template_function.rs rename to bindgen-tests/tests/expectations/bindings/variadic_template_function.rs diff --git a/bindgen-tests/tests/expectations/tests/vector.rs b/bindgen-tests/tests/expectations/bindings/vector.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/vector.rs rename to bindgen-tests/tests/expectations/bindings/vector.rs diff --git a/bindgen-tests/tests/expectations/tests/virtual_dtor.rs b/bindgen-tests/tests/expectations/bindings/virtual_dtor.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/virtual_dtor.rs rename to bindgen-tests/tests/expectations/bindings/virtual_dtor.rs diff --git a/bindgen-tests/tests/expectations/tests/virtual_inheritance.rs b/bindgen-tests/tests/expectations/bindings/virtual_inheritance.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/virtual_inheritance.rs rename to bindgen-tests/tests/expectations/bindings/virtual_inheritance.rs diff --git a/bindgen-tests/tests/expectations/tests/virtual_interface.rs b/bindgen-tests/tests/expectations/bindings/virtual_interface.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/virtual_interface.rs rename to bindgen-tests/tests/expectations/bindings/virtual_interface.rs diff --git a/bindgen-tests/tests/expectations/tests/virtual_overloaded.rs b/bindgen-tests/tests/expectations/bindings/virtual_overloaded.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/virtual_overloaded.rs rename to bindgen-tests/tests/expectations/bindings/virtual_overloaded.rs diff --git a/bindgen-tests/tests/expectations/tests/vtable_recursive_sig.rs b/bindgen-tests/tests/expectations/bindings/vtable_recursive_sig.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/vtable_recursive_sig.rs rename to bindgen-tests/tests/expectations/bindings/vtable_recursive_sig.rs diff --git a/bindgen-tests/tests/expectations/tests/wasm-constructor-returns.rs b/bindgen-tests/tests/expectations/bindings/wasm-constructor-returns.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/wasm-constructor-returns.rs rename to bindgen-tests/tests/expectations/bindings/wasm-constructor-returns.rs diff --git a/bindgen-tests/tests/expectations/tests/wasm-import-module.rs b/bindgen-tests/tests/expectations/bindings/wasm-import-module.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/wasm-import-module.rs rename to bindgen-tests/tests/expectations/bindings/wasm-import-module.rs diff --git a/bindgen-tests/tests/expectations/tests/weird_bitfields.rs b/bindgen-tests/tests/expectations/bindings/weird_bitfields.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/weird_bitfields.rs rename to bindgen-tests/tests/expectations/bindings/weird_bitfields.rs diff --git a/bindgen-tests/tests/expectations/tests/what_is_going_on.rs b/bindgen-tests/tests/expectations/bindings/what_is_going_on.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/what_is_going_on.rs rename to bindgen-tests/tests/expectations/bindings/what_is_going_on.rs diff --git a/bindgen-tests/tests/expectations/tests/win32-thiscall_1_0.rs b/bindgen-tests/tests/expectations/bindings/win32-thiscall_1_0.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/win32-thiscall_1_0.rs rename to bindgen-tests/tests/expectations/bindings/win32-thiscall_1_0.rs diff --git a/bindgen-tests/tests/expectations/tests/win32-thiscall_nightly.rs b/bindgen-tests/tests/expectations/bindings/win32-thiscall_nightly.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/win32-thiscall_nightly.rs rename to bindgen-tests/tests/expectations/bindings/win32-thiscall_nightly.rs diff --git a/bindgen-tests/tests/expectations/tests/win32-vectorcall-1_0.rs b/bindgen-tests/tests/expectations/bindings/win32-vectorcall-1_0.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/win32-vectorcall-1_0.rs rename to bindgen-tests/tests/expectations/bindings/win32-vectorcall-1_0.rs diff --git a/bindgen-tests/tests/expectations/tests/win32-vectorcall-nightly.rs b/bindgen-tests/tests/expectations/bindings/win32-vectorcall-nightly.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/win32-vectorcall-nightly.rs rename to bindgen-tests/tests/expectations/bindings/win32-vectorcall-nightly.rs diff --git a/bindgen-tests/tests/expectations/tests/with_array_pointers_arguments.rs b/bindgen-tests/tests/expectations/bindings/with_array_pointers_arguments.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/with_array_pointers_arguments.rs rename to bindgen-tests/tests/expectations/bindings/with_array_pointers_arguments.rs diff --git a/bindgen-tests/tests/expectations/tests/without_array_pointers_arguments.rs b/bindgen-tests/tests/expectations/bindings/without_array_pointers_arguments.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/without_array_pointers_arguments.rs rename to bindgen-tests/tests/expectations/bindings/without_array_pointers_arguments.rs diff --git a/bindgen-tests/tests/expectations/tests/zero-size-array-align.rs b/bindgen-tests/tests/expectations/bindings/zero-size-array-align.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/zero-size-array-align.rs rename to bindgen-tests/tests/expectations/bindings/zero-size-array-align.rs diff --git a/bindgen-tests/tests/expectations/tests/zero-sized-array.rs b/bindgen-tests/tests/expectations/bindings/zero-sized-array.rs similarity index 100% rename from bindgen-tests/tests/expectations/tests/zero-sized-array.rs rename to bindgen-tests/tests/expectations/bindings/zero-sized-array.rs diff --git a/bindgen-tests/tests/expectations/build.rs b/bindgen-tests/tests/expectations/build.rs index 2111185384..ac1ee47025 100644 --- a/bindgen-tests/tests/expectations/build.rs +++ b/bindgen-tests/tests/expectations/build.rs @@ -5,24 +5,84 @@ use std::env; use std::fs; +use std::fs::File; +use std::io::BufRead; +use std::io::BufReader; use std::io::Write; use std::path::Path; +use std::process::Command; -const LIBCLANG_VERSION_DIRS: &[&str] = &["libclang-5", "libclang-9"]; +const LIBCLANG_VERSION_DIRS: &[&str] = &["libclang-5", "libclang-9", ""]; + +#[derive(Clone)] +enum Version { + Nightly, + Stable([u8; 3]), +} + +impl Version { + fn new(s: &str) -> Self { + if s == "nightly" { + Version::Nightly + } else { + let mut version = [0; 3]; + + let mut parts = s.split('.').map(|s| s.parse::().unwrap_or_else(|_| panic!("{}", s))); + + for i in 0..3 { + version[i] = parts.next().unwrap_or_default(); + } + + Version::Stable(version) + } + } + + fn is_compatible_with(&self, other: &Version) -> bool { + match (self, other) { + (Version::Nightly, Version::Nightly) => true, + (Version::Nightly, Version::Stable(_)) => true, + (Version::Stable(_), Version::Nightly) => false, + (Version::Stable(v_self), Version::Stable(v_other)) => { + v_other <= v_self + } + } + } +} fn main() { println!("cargo:rerun-if-changed=build.rs"); + let rustc_version = { + let rustc = + env::var("RUSTC").expect("`RUSTC` environment variable is not set"); + let cmd_output = String::from_utf8(Command::new(rustc) + .arg("--version") + .output() + .expect("Couldn't run `rustc --version`") + .stdout).unwrap(); + Version::new( + if cmd_output.contains("nightly") { + "nightly" + } else { + cmd_output + .split(' ') + .skip(1) + .next() + .unwrap() + } + ) + }; + let mut test_string = String::new(); for dir in LIBCLANG_VERSION_DIRS { - let dir = Path::new(&env::var_os("CARGO_MANIFEST_DIR").unwrap()) - .join("tests") + let dir_path = Path::new(&env::var_os("CARGO_MANIFEST_DIR").unwrap()) + .join("bindings") .join(dir); - println!("cargo:rerun-if-changed={}", dir.display()); + println!("cargo:rerun-if-changed={}", dir_path.display()); - for entry in fs::read_dir(dir).unwrap() { + for entry in fs::read_dir(dir_path).unwrap() { let entry = entry.unwrap(); let path = entry.path(); let path = path.canonicalize().unwrap_or(path); @@ -34,24 +94,60 @@ fn main() { println!("cargo:rerun-if-changed={}", path.display()); - let module_name: String = path - .display() - .to_string() - .chars() - .map(|c| match c { - 'a'..='z' | 'A'..='Z' | '0'..='9' => c, - _ => '_', - }) - .collect(); - - test_string.push_str(&format!( - r###" + let stem = path.file_stem(); + + for entry in fs::read_dir("../headers/").unwrap() { + let entry = entry.unwrap(); + let headers_path = entry.path(); + let headers_path = + headers_path.canonicalize().unwrap_or(headers_path); + if headers_path.file_stem() == stem && headers_path.is_file() { + let mut target_version = None; + let file = + BufReader::new(File::open(&headers_path).unwrap()); + for line in file.lines() { + let line = line.unwrap(); + if line.starts_with("// bindgen-flags: ") { + target_version = line + .split("--rust-target") + .skip(1) + .next() + .and_then(|s| s[1..].split(' ').next()) + .map(Version::new); + break; + } + } + let target_version = + target_version.unwrap_or_else(|| rustc_version.clone()); + if rustc_version.is_compatible_with(&target_version) { + let mut module_name = headers_path + .file_stem() + .unwrap() + .to_string_lossy() + .to_string(); + module_name.push('_'); + module_name.push_str(dir); + module_name = module_name.replace( + |c| match c { + 'a'..='z' | 'A'..='Z' | '0'..='9' => false, + _ => true, + }, + "_", + ); + + test_string.push_str(&format!( + r###" #[path = "{}"] -mod {}; +mod header_{}; "###, - path.display().to_string().replace('\\', "\\\\"), - module_name, - )); + path.display().to_string().replace('\\', "\\\\"), + module_name.trim_matches('_'), + )); + } + + break; + } + } } }