Organize library tests (#3499)

microsoft · Feb 20, 2025 · a54646f · a54646f
1 parent ed36c28
commit a54646f
Show file tree

Hide file tree

Showing 218 changed files with 20 additions and 18 deletions.
diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml
@@ -135,8 +135,6 @@ jobs:
         run:  cargo clippy -p test_arch_feature
       - name: Clippy test_array
         run:  cargo clippy -p test_array
-      - name: Clippy test_async
-        run:  cargo clippy -p test_async
       - name: Clippy test_bcrypt
         run:  cargo clippy -p test_bcrypt
       - name: Clippy test_bindgen
@@ -193,6 +191,8 @@ jobs:
         run:  cargo clippy -p test_events_client
       - name: Clippy test_extensions
         run:  cargo clippy -p test_extensions
+      - name: Clippy test_future
+        run:  cargo clippy -p test_future
       - name: Clippy test_handles
         run:  cargo clippy -p test_handles
       - name: Clippy test_implement

diff --git a/.github/workflows/raw-dylib.yml b/.github/workflows/raw-dylib.yml
@@ -164,8 +164,6 @@ jobs:
         run:  cargo clean
       - name: Test test_array
         run:  cargo test -p test_array --target ${{ matrix.target }} ${{ matrix.etc }}
-      - name: Test test_async
-        run:  cargo test -p test_async --target ${{ matrix.target }} ${{ matrix.etc }}
       - name: Test test_bcrypt
         run:  cargo test -p test_bcrypt --target ${{ matrix.target }} ${{ matrix.etc }}
       - name: Test test_bindgen
@@ -222,6 +220,8 @@ jobs:
         run:  cargo test -p test_events_client --target ${{ matrix.target }} ${{ matrix.etc }}
       - name: Test test_extensions
         run:  cargo test -p test_extensions --target ${{ matrix.target }} ${{ matrix.etc }}
+      - name: Test test_future
+        run:  cargo test -p test_future --target ${{ matrix.target }} ${{ matrix.etc }}
       - name: Test test_handles
         run:  cargo test -p test_handles --target ${{ matrix.target }} ${{ matrix.etc }}
       - name: Test test_implement

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -161,8 +161,6 @@ jobs:
         run:  cargo clean
       - name: Test test_array
         run:  cargo test -p test_array --target ${{ matrix.target }} ${{ matrix.etc }}
-      - name: Test test_async
-        run:  cargo test -p test_async --target ${{ matrix.target }} ${{ matrix.etc }}
       - name: Test test_bcrypt
         run:  cargo test -p test_bcrypt --target ${{ matrix.target }} ${{ matrix.etc }}
       - name: Test test_bindgen
@@ -219,6 +217,8 @@ jobs:
         run:  cargo test -p test_events_client --target ${{ matrix.target }} ${{ matrix.etc }}
       - name: Test test_extensions
         run:  cargo test -p test_extensions --target ${{ matrix.target }} ${{ matrix.etc }}
+      - name: Test test_future
+        run:  cargo test -p test_future --target ${{ matrix.target }} ${{ matrix.etc }}
       - name: Test test_handles
         run:  cargo test -p test_handles --target ${{ matrix.target }} ${{ matrix.etc }}
       - name: Test test_implement

diff --git a/Cargo.toml b/Cargo.toml
@@ -6,9 +6,9 @@ members = [
     "crates/samples/windows/*",
     "crates/samples/components/*",
     "crates/targets/*",
-    "crates/tests/bindgen",
     "crates/tests/misc/*",
     "crates/tests/winrt/*",
+    "crates/tests/libs/*",
     "crates/tools/*",
 ]
 exclude = [

diff --git a/crates/tests/bindgen/Cargo.toml → crates/tests/libs/bindgen/Cargo.toml b/crates/tests/bindgen/Cargo.toml → crates/tests/libs/bindgen/Cargo.toml
diff --git a/crates/tests/bindgen/src/bool.rs → crates/tests/libs/bindgen/src/bool.rs b/crates/tests/bindgen/src/bool.rs → crates/tests/libs/bindgen/src/bool.rs
diff --git a/crates/tests/bindgen/src/bool_event.rs → crates/tests/libs/bindgen/src/bool_event.rs b/crates/tests/bindgen/src/bool_event.rs → crates/tests/libs/bindgen/src/bool_event.rs
diff --git a/.../bindgen/src/bool_event_sans_reference.rs → .../bindgen/src/bool_event_sans_reference.rs b/.../bindgen/src/bool_event_sans_reference.rs → .../bindgen/src/bool_event_sans_reference.rs
diff --git a/crates/tests/bindgen/src/bool_sys.rs → crates/tests/libs/bindgen/src/bool_sys.rs b/crates/tests/bindgen/src/bool_sys.rs → crates/tests/libs/bindgen/src/bool_sys.rs
diff --git a/crates/tests/bindgen/src/bool_sys_no_core.rs → ...ests/libs/bindgen/src/bool_sys_no_core.rs b/crates/tests/bindgen/src/bool_sys_no_core.rs → ...ests/libs/bindgen/src/bool_sys_no_core.rs
diff --git a/crates/tests/bindgen/src/class.rs → crates/tests/libs/bindgen/src/class.rs b/crates/tests/bindgen/src/class.rs → crates/tests/libs/bindgen/src/class.rs
diff --git a/crates/tests/bindgen/src/class_dep.rs → crates/tests/libs/bindgen/src/class_dep.rs b/crates/tests/bindgen/src/class_dep.rs → crates/tests/libs/bindgen/src/class_dep.rs
diff --git a/crates/tests/bindgen/src/class_static.rs → ...es/tests/libs/bindgen/src/class_static.rs b/crates/tests/bindgen/src/class_static.rs → ...es/tests/libs/bindgen/src/class_static.rs
diff --git a/...s/tests/bindgen/src/class_with_handler.rs → ...ts/libs/bindgen/src/class_with_handler.rs b/...s/tests/bindgen/src/class_with_handler.rs → ...ts/libs/bindgen/src/class_with_handler.rs
diff --git a/crates/tests/bindgen/src/comment.rs → crates/tests/libs/bindgen/src/comment.rs b/crates/tests/bindgen/src/comment.rs → crates/tests/libs/bindgen/src/comment.rs
diff --git a/crates/tests/bindgen/src/comment_no_allow.rs → ...ests/libs/bindgen/src/comment_no_allow.rs b/crates/tests/bindgen/src/comment_no_allow.rs → ...ests/libs/bindgen/src/comment_no_allow.rs
diff --git a/crates/tests/bindgen/src/core_sys.rs → crates/tests/libs/bindgen/src/core_sys.rs b/crates/tests/bindgen/src/core_sys.rs → crates/tests/libs/bindgen/src/core_sys.rs
diff --git a/crates/tests/bindgen/src/core_sys_flat.rs → ...s/tests/libs/bindgen/src/core_sys_flat.rs b/crates/tests/bindgen/src/core_sys_flat.rs → ...s/tests/libs/bindgen/src/core_sys_flat.rs
diff --git a/...ests/bindgen/src/core_sys_flat_no_core.rs → ...libs/bindgen/src/core_sys_flat_no_core.rs b/...ests/bindgen/src/core_sys_flat_no_core.rs → ...libs/bindgen/src/core_sys_flat_no_core.rs
diff --git a/crates/tests/bindgen/src/core_sys_no_core.rs → ...ests/libs/bindgen/src/core_sys_no_core.rs b/crates/tests/bindgen/src/core_sys_no_core.rs → ...ests/libs/bindgen/src/core_sys_no_core.rs
diff --git a/crates/tests/bindgen/src/core_win.rs → crates/tests/libs/bindgen/src/core_win.rs b/crates/tests/bindgen/src/core_win.rs → crates/tests/libs/bindgen/src/core_win.rs
diff --git a/crates/tests/bindgen/src/core_win_flat.rs → ...s/tests/libs/bindgen/src/core_win_flat.rs b/crates/tests/bindgen/src/core_win_flat.rs → ...s/tests/libs/bindgen/src/core_win_flat.rs
diff --git a/crates/tests/bindgen/src/default_assumed.rs → ...tests/libs/bindgen/src/default_assumed.rs b/crates/tests/bindgen/src/default_assumed.rs → ...tests/libs/bindgen/src/default_assumed.rs
diff --git a/crates/tests/bindgen/src/default_default.rs → ...tests/libs/bindgen/src/default_default.rs b/crates/tests/bindgen/src/default_default.rs → ...tests/libs/bindgen/src/default_default.rs
diff --git a/crates/tests/bindgen/src/delegate.rs → crates/tests/libs/bindgen/src/delegate.rs b/crates/tests/bindgen/src/delegate.rs → crates/tests/libs/bindgen/src/delegate.rs
diff --git a/crates/tests/bindgen/src/delegate_cpp.rs → ...es/tests/libs/bindgen/src/delegate_cpp.rs b/crates/tests/bindgen/src/delegate_cpp.rs → ...es/tests/libs/bindgen/src/delegate_cpp.rs
diff --git a/crates/tests/bindgen/src/delegate_cpp_ref.rs → ...ests/libs/bindgen/src/delegate_cpp_ref.rs b/crates/tests/bindgen/src/delegate_cpp_ref.rs → ...ests/libs/bindgen/src/delegate_cpp_ref.rs
diff --git a/crates/tests/bindgen/src/delegate_generic.rs → ...ests/libs/bindgen/src/delegate_generic.rs b/crates/tests/bindgen/src/delegate_generic.rs → ...ests/libs/bindgen/src/delegate_generic.rs
diff --git a/crates/tests/bindgen/src/delegate_param.rs → .../tests/libs/bindgen/src/delegate_param.rs b/crates/tests/bindgen/src/delegate_param.rs → .../tests/libs/bindgen/src/delegate_param.rs
diff --git a/crates/tests/bindgen/src/deps.rs → crates/tests/libs/bindgen/src/deps.rs b/crates/tests/bindgen/src/deps.rs → crates/tests/libs/bindgen/src/deps.rs
diff --git a/crates/tests/bindgen/src/derive_cpp_enum.rs → ...tests/libs/bindgen/src/derive_cpp_enum.rs b/crates/tests/bindgen/src/derive_cpp_enum.rs → ...tests/libs/bindgen/src/derive_cpp_enum.rs
diff --git a/...es/tests/bindgen/src/derive_cpp_struct.rs → ...sts/libs/bindgen/src/derive_cpp_struct.rs b/...es/tests/bindgen/src/derive_cpp_struct.rs → ...sts/libs/bindgen/src/derive_cpp_struct.rs
diff --git a/...ests/bindgen/src/derive_cpp_struct_sys.rs → ...libs/bindgen/src/derive_cpp_struct_sys.rs b/...ests/bindgen/src/derive_cpp_struct_sys.rs → ...libs/bindgen/src/derive_cpp_struct_sys.rs
diff --git a/crates/tests/bindgen/src/derive_edges.rs → ...es/tests/libs/bindgen/src/derive_edges.rs b/crates/tests/bindgen/src/derive_edges.rs → ...es/tests/libs/bindgen/src/derive_edges.rs
diff --git a/crates/tests/bindgen/src/derive_enum.rs → crates/tests/libs/bindgen/src/derive_enum.rs b/crates/tests/bindgen/src/derive_enum.rs → crates/tests/libs/bindgen/src/derive_enum.rs
diff --git a/crates/tests/bindgen/src/derive_struct.rs → ...s/tests/libs/bindgen/src/derive_struct.rs b/crates/tests/bindgen/src/derive_struct.rs → ...s/tests/libs/bindgen/src/derive_struct.rs
diff --git a/...s/tests/bindgen/src/enum_cpp_flags_sys.rs → ...ts/libs/bindgen/src/enum_cpp_flags_sys.rs b/...s/tests/bindgen/src/enum_cpp_flags_sys.rs → ...ts/libs/bindgen/src/enum_cpp_flags_sys.rs
diff --git a/...s/tests/bindgen/src/enum_cpp_flags_win.rs → ...ts/libs/bindgen/src/enum_cpp_flags_win.rs b/...s/tests/bindgen/src/enum_cpp_flags_win.rs → ...ts/libs/bindgen/src/enum_cpp_flags_win.rs
diff --git a/.../tests/bindgen/src/enum_cpp_scoped_sys.rs → ...s/libs/bindgen/src/enum_cpp_scoped_sys.rs b/.../tests/bindgen/src/enum_cpp_scoped_sys.rs → ...s/libs/bindgen/src/enum_cpp_scoped_sys.rs
diff --git a/.../tests/bindgen/src/enum_cpp_scoped_win.rs → ...s/libs/bindgen/src/enum_cpp_scoped_win.rs b/.../tests/bindgen/src/enum_cpp_scoped_win.rs → ...s/libs/bindgen/src/enum_cpp_scoped_win.rs
diff --git a/crates/tests/bindgen/src/enum_cpp_sys.rs → ...es/tests/libs/bindgen/src/enum_cpp_sys.rs b/crates/tests/bindgen/src/enum_cpp_sys.rs → ...es/tests/libs/bindgen/src/enum_cpp_sys.rs
diff --git a/crates/tests/bindgen/src/enum_cpp_win.rs → ...es/tests/libs/bindgen/src/enum_cpp_win.rs b/crates/tests/bindgen/src/enum_cpp_win.rs → ...es/tests/libs/bindgen/src/enum_cpp_win.rs
diff --git a/crates/tests/bindgen/src/enum_flags_sys.rs → .../tests/libs/bindgen/src/enum_flags_sys.rs b/crates/tests/bindgen/src/enum_flags_sys.rs → .../tests/libs/bindgen/src/enum_flags_sys.rs
diff --git a/crates/tests/bindgen/src/enum_flags_win.rs → .../tests/libs/bindgen/src/enum_flags_win.rs b/crates/tests/bindgen/src/enum_flags_win.rs → .../tests/libs/bindgen/src/enum_flags_win.rs
diff --git a/crates/tests/bindgen/src/enum_sys.rs → crates/tests/libs/bindgen/src/enum_sys.rs b/crates/tests/bindgen/src/enum_sys.rs → crates/tests/libs/bindgen/src/enum_sys.rs
diff --git a/crates/tests/bindgen/src/enum_win.rs → crates/tests/libs/bindgen/src/enum_win.rs b/crates/tests/bindgen/src/enum_win.rs → crates/tests/libs/bindgen/src/enum_win.rs
diff --git a/...sts/bindgen/src/fn_associated_enum_sys.rs → ...ibs/bindgen/src/fn_associated_enum_sys.rs b/...sts/bindgen/src/fn_associated_enum_sys.rs → ...ibs/bindgen/src/fn_associated_enum_sys.rs
diff --git a/...sts/bindgen/src/fn_associated_enum_win.rs → ...ibs/bindgen/src/fn_associated_enum_win.rs b/...sts/bindgen/src/fn_associated_enum_win.rs → ...ibs/bindgen/src/fn_associated_enum_win.rs
diff --git a/crates/tests/bindgen/src/fn_no_return_sys.rs → ...ests/libs/bindgen/src/fn_no_return_sys.rs b/crates/tests/bindgen/src/fn_no_return_sys.rs → ...ests/libs/bindgen/src/fn_no_return_sys.rs
diff --git a/crates/tests/bindgen/src/fn_no_return_win.rs → ...ests/libs/bindgen/src/fn_no_return_win.rs b/crates/tests/bindgen/src/fn_no_return_win.rs → ...ests/libs/bindgen/src/fn_no_return_win.rs
diff --git a/...s/tests/bindgen/src/fn_result_void_sys.rs → ...ts/libs/bindgen/src/fn_result_void_sys.rs b/...s/tests/bindgen/src/fn_result_void_sys.rs → ...ts/libs/bindgen/src/fn_result_void_sys.rs
diff --git a/...s/tests/bindgen/src/fn_return_void_sys.rs → ...ts/libs/bindgen/src/fn_return_void_sys.rs b/...s/tests/bindgen/src/fn_return_void_sys.rs → ...ts/libs/bindgen/src/fn_return_void_sys.rs
diff --git a/...s/tests/bindgen/src/fn_return_void_win.rs → ...ts/libs/bindgen/src/fn_return_void_win.rs b/...s/tests/bindgen/src/fn_return_void_win.rs → ...ts/libs/bindgen/src/fn_return_void_win.rs
diff --git a/crates/tests/bindgen/src/fn_sys.rs → crates/tests/libs/bindgen/src/fn_sys.rs b/crates/tests/bindgen/src/fn_sys.rs → crates/tests/libs/bindgen/src/fn_sys.rs
diff --git a/crates/tests/bindgen/src/fn_sys_targets.rs → .../tests/libs/bindgen/src/fn_sys_targets.rs b/crates/tests/bindgen/src/fn_sys_targets.rs → .../tests/libs/bindgen/src/fn_sys_targets.rs
diff --git a/crates/tests/bindgen/src/fn_win.rs → crates/tests/libs/bindgen/src/fn_win.rs b/crates/tests/bindgen/src/fn_win.rs → crates/tests/libs/bindgen/src/fn_win.rs
diff --git a/crates/tests/bindgen/src/interface.rs → crates/tests/libs/bindgen/src/interface.rs b/crates/tests/bindgen/src/interface.rs → crates/tests/libs/bindgen/src/interface.rs
diff --git a/...sts/bindgen/src/interface_array_return.rs → ...ibs/bindgen/src/interface_array_return.rs b/...sts/bindgen/src/interface_array_return.rs → ...ibs/bindgen/src/interface_array_return.rs
diff --git a/crates/tests/bindgen/src/interface_cpp.rs → ...s/tests/libs/bindgen/src/interface_cpp.rs b/crates/tests/bindgen/src/interface_cpp.rs → ...s/tests/libs/bindgen/src/interface_cpp.rs
diff --git a/...tests/bindgen/src/interface_cpp_derive.rs → .../libs/bindgen/src/interface_cpp_derive.rs b/...tests/bindgen/src/interface_cpp_derive.rs → .../libs/bindgen/src/interface_cpp_derive.rs
diff --git a/...s/bindgen/src/interface_cpp_derive_sys.rs → ...s/bindgen/src/interface_cpp_derive_sys.rs b/...s/bindgen/src/interface_cpp_derive_sys.rs → ...s/bindgen/src/interface_cpp_derive_sys.rs
diff --git a/...s/bindgen/src/interface_cpp_return_udt.rs → ...s/bindgen/src/interface_cpp_return_udt.rs b/...s/bindgen/src/interface_cpp_return_udt.rs → ...s/bindgen/src/interface_cpp_return_udt.rs
diff --git a/...es/tests/bindgen/src/interface_cpp_sys.rs → ...sts/libs/bindgen/src/interface_cpp_sys.rs b/...es/tests/bindgen/src/interface_cpp_sys.rs → ...sts/libs/bindgen/src/interface_cpp_sys.rs
diff --git a/.../bindgen/src/interface_cpp_sys_no_core.rs → .../bindgen/src/interface_cpp_sys_no_core.rs b/.../bindgen/src/interface_cpp_sys_no_core.rs → .../bindgen/src/interface_cpp_sys_no_core.rs
diff --git a/...es/tests/bindgen/src/interface_generic.rs → ...sts/libs/bindgen/src/interface_generic.rs b/...es/tests/bindgen/src/interface_generic.rs → ...sts/libs/bindgen/src/interface_generic.rs
diff --git a/...s/tests/bindgen/src/interface_iterable.rs → ...ts/libs/bindgen/src/interface_iterable.rs b/...s/tests/bindgen/src/interface_iterable.rs → ...ts/libs/bindgen/src/interface_iterable.rs
diff --git a/...s/tests/bindgen/src/interface_required.rs → ...ts/libs/bindgen/src/interface_required.rs b/...s/tests/bindgen/src/interface_required.rs → ...ts/libs/bindgen/src/interface_required.rs
diff --git a/...sts/bindgen/src/interface_required_sys.rs → ...ibs/bindgen/src/interface_required_sys.rs b/...sts/bindgen/src/interface_required_sys.rs → ...ibs/bindgen/src/interface_required_sys.rs
diff --git a/...gen/src/interface_required_with_method.rs → ...gen/src/interface_required_with_method.rs b/...gen/src/interface_required_with_method.rs → ...gen/src/interface_required_with_method.rs
diff --git a/...src/interface_required_with_method_sys.rs → ...src/interface_required_with_method_sys.rs b/...src/interface_required_with_method_sys.rs → ...src/interface_required_with_method_sys.rs
diff --git a/crates/tests/bindgen/src/interface_sys.rs → ...s/tests/libs/bindgen/src/interface_sys.rs b/crates/tests/bindgen/src/interface_sys.rs → ...s/tests/libs/bindgen/src/interface_sys.rs
diff --git a/...ests/bindgen/src/interface_sys_no_core.rs → ...libs/bindgen/src/interface_sys_no_core.rs b/...ests/bindgen/src/interface_sys_no_core.rs → ...libs/bindgen/src/interface_sys_no_core.rs
diff --git a/crates/tests/bindgen/src/lib.rs → crates/tests/libs/bindgen/src/lib.rs b/crates/tests/bindgen/src/lib.rs → crates/tests/libs/bindgen/src/lib.rs
diff --git a/crates/tests/bindgen/src/multi.rs → crates/tests/libs/bindgen/src/multi.rs b/crates/tests/bindgen/src/multi.rs → crates/tests/libs/bindgen/src/multi.rs
diff --git a/crates/tests/bindgen/src/multi_sys.rs → crates/tests/libs/bindgen/src/multi_sys.rs b/crates/tests/bindgen/src/multi_sys.rs → crates/tests/libs/bindgen/src/multi_sys.rs
diff --git a/crates/tests/bindgen/src/ref_params.rs → crates/tests/libs/bindgen/src/ref_params.rs b/crates/tests/bindgen/src/ref_params.rs → crates/tests/libs/bindgen/src/ref_params.rs
diff --git a/.../bindgen/src/reference_dependency_flat.rs → .../bindgen/src/reference_dependency_flat.rs b/.../bindgen/src/reference_dependency_flat.rs → .../bindgen/src/reference_dependency_flat.rs
diff --git a/.../bindgen/src/reference_dependency_full.rs → .../bindgen/src/reference_dependency_full.rs b/.../bindgen/src/reference_dependency_full.rs → .../bindgen/src/reference_dependency_full.rs
diff --git a/...gen/src/reference_dependency_skip_root.rs → ...gen/src/reference_dependency_skip_root.rs b/...gen/src/reference_dependency_skip_root.rs → ...gen/src/reference_dependency_skip_root.rs
diff --git a/...s/bindgen/src/reference_dependent_flat.rs → ...s/bindgen/src/reference_dependent_flat.rs b/...s/bindgen/src/reference_dependent_flat.rs → ...s/bindgen/src/reference_dependent_flat.rs
diff --git a/...s/bindgen/src/reference_dependent_full.rs → ...s/bindgen/src/reference_dependent_full.rs b/...s/bindgen/src/reference_dependent_full.rs → ...s/bindgen/src/reference_dependent_full.rs
diff --git a/...dgen/src/reference_dependent_skip_root.rs → ...dgen/src/reference_dependent_skip_root.rs b/...dgen/src/reference_dependent_skip_root.rs → ...dgen/src/reference_dependent_skip_root.rs
diff --git a/...ts/bindgen/src/reference_struct_filter.rs → ...bs/bindgen/src/reference_struct_filter.rs b/...ts/bindgen/src/reference_struct_filter.rs → ...bs/bindgen/src/reference_struct_filter.rs
diff --git a/...c/reference_struct_reference_namespace.rs → ...c/reference_struct_reference_namespace.rs b/...c/reference_struct_reference_namespace.rs → ...c/reference_struct_reference_namespace.rs
diff --git a/...en/src/reference_struct_reference_type.rs → ...en/src/reference_struct_reference_type.rs b/...en/src/reference_struct_reference_type.rs → ...en/src/reference_struct_reference_type.rs
diff --git a/...indgen/src/reference_struct_sys_filter.rs → ...indgen/src/reference_struct_sys_filter.rs b/...indgen/src/reference_struct_sys_filter.rs → ...indgen/src/reference_struct_sys_filter.rs
diff --git a/...ference_struct_sys_reference_namespace.rs → ...ference_struct_sys_reference_namespace.rs b/...ference_struct_sys_reference_namespace.rs → ...ference_struct_sys_reference_namespace.rs
diff --git a/...rc/reference_struct_sys_reference_type.rs → ...rc/reference_struct_sys_reference_type.rs b/...rc/reference_struct_sys_reference_type.rs → ...rc/reference_struct_sys_reference_type.rs
diff --git a/crates/tests/bindgen/src/sort.rs → crates/tests/libs/bindgen/src/sort.rs b/crates/tests/bindgen/src/sort.rs → crates/tests/libs/bindgen/src/sort.rs
diff --git a/crates/tests/bindgen/src/struct_cpp_sys.rs → .../tests/libs/bindgen/src/struct_cpp_sys.rs b/crates/tests/bindgen/src/struct_cpp_sys.rs → .../tests/libs/bindgen/src/struct_cpp_sys.rs
diff --git a/crates/tests/bindgen/src/struct_cpp_win.rs → .../tests/libs/bindgen/src/struct_cpp_win.rs b/crates/tests/bindgen/src/struct_cpp_win.rs → .../tests/libs/bindgen/src/struct_cpp_win.rs
diff --git a/.../tests/bindgen/src/struct_disambiguate.rs → ...s/libs/bindgen/src/struct_disambiguate.rs b/.../tests/bindgen/src/struct_disambiguate.rs → ...s/libs/bindgen/src/struct_disambiguate.rs
diff --git a/crates/tests/bindgen/src/struct_sys.rs → crates/tests/libs/bindgen/src/struct_sys.rs b/crates/tests/bindgen/src/struct_sys.rs → crates/tests/libs/bindgen/src/struct_sys.rs
diff --git a/crates/tests/bindgen/src/struct_win.rs → crates/tests/libs/bindgen/src/struct_win.rs b/crates/tests/bindgen/src/struct_win.rs → crates/tests/libs/bindgen/src/struct_win.rs
diff --git a/.../bindgen/src/struct_with_cpp_interface.rs → .../bindgen/src/struct_with_cpp_interface.rs b/.../bindgen/src/struct_with_cpp_interface.rs → .../bindgen/src/struct_with_cpp_interface.rs
diff --git a/...dgen/src/struct_with_cpp_interface_sys.rs → ...dgen/src/struct_with_cpp_interface_sys.rs b/...dgen/src/struct_with_cpp_interface_sys.rs → ...dgen/src/struct_with_cpp_interface_sys.rs
diff --git a/.../tests/bindgen/src/struct_with_generic.rs → ...s/libs/bindgen/src/struct_with_generic.rs b/.../tests/bindgen/src/struct_with_generic.rs → ...s/libs/bindgen/src/struct_with_generic.rs
diff --git a/...es/tests/bindgen/src/window_long_get_a.rs → ...sts/libs/bindgen/src/window_long_get_a.rs b/...es/tests/bindgen/src/window_long_get_a.rs → ...sts/libs/bindgen/src/window_long_get_a.rs
diff --git a/...ests/bindgen/src/window_long_get_a_sys.rs → ...libs/bindgen/src/window_long_get_a_sys.rs b/...ests/bindgen/src/window_long_get_a_sys.rs → ...libs/bindgen/src/window_long_get_a_sys.rs
diff --git a/...es/tests/bindgen/src/window_long_get_w.rs → ...sts/libs/bindgen/src/window_long_get_w.rs b/...es/tests/bindgen/src/window_long_get_w.rs → ...sts/libs/bindgen/src/window_long_get_w.rs
diff --git a/...ests/bindgen/src/window_long_get_w_sys.rs → ...libs/bindgen/src/window_long_get_w_sys.rs b/...ests/bindgen/src/window_long_get_w_sys.rs → ...libs/bindgen/src/window_long_get_w_sys.rs
diff --git a/...es/tests/bindgen/src/window_long_set_a.rs → ...sts/libs/bindgen/src/window_long_set_a.rs b/...es/tests/bindgen/src/window_long_set_a.rs → ...sts/libs/bindgen/src/window_long_set_a.rs
diff --git a/...ests/bindgen/src/window_long_set_a_sys.rs → ...libs/bindgen/src/window_long_set_a_sys.rs b/...ests/bindgen/src/window_long_set_a_sys.rs → ...libs/bindgen/src/window_long_set_a_sys.rs
diff --git a/...es/tests/bindgen/src/window_long_set_w.rs → ...sts/libs/bindgen/src/window_long_set_w.rs b/...es/tests/bindgen/src/window_long_set_w.rs → ...sts/libs/bindgen/src/window_long_set_w.rs
diff --git a/...ests/bindgen/src/window_long_set_w_sys.rs → ...libs/bindgen/src/window_long_set_w_sys.rs b/...ests/bindgen/src/window_long_set_w_sys.rs → ...libs/bindgen/src/window_long_set_w_sys.rs
diff --git a/crates/tests/bindgen/tests/bool.rs → crates/tests/libs/bindgen/tests/bool.rs b/crates/tests/bindgen/tests/bool.rs → crates/tests/libs/bindgen/tests/bool.rs
diff --git a/...s/tests/bindgen/tests/delegate_cpp_ref.rs → ...ts/libs/bindgen/tests/delegate_cpp_ref.rs b/...s/tests/bindgen/tests/delegate_cpp_ref.rs → ...ts/libs/bindgen/tests/delegate_cpp_ref.rs
diff --git a/crates/tests/bindgen/tests/delegate_param.rs → ...ests/libs/bindgen/tests/delegate_param.rs b/crates/tests/bindgen/tests/delegate_param.rs → ...ests/libs/bindgen/tests/delegate_param.rs
diff --git a/crates/tests/bindgen/tests/deps.rs → crates/tests/libs/bindgen/tests/deps.rs b/crates/tests/bindgen/tests/deps.rs → crates/tests/libs/bindgen/tests/deps.rs
diff --git a/crates/tests/bindgen/tests/panic.rs → crates/tests/libs/bindgen/tests/panic.rs b/crates/tests/bindgen/tests/panic.rs → crates/tests/libs/bindgen/tests/panic.rs
@@ -28,9 +28,11 @@ fn file_not_found() {
 }
 
 #[test]
-#[should_panic(expected = "failed to read file lines `../../libs/bindgen/default/Windows.winmd`")]
+#[should_panic(
+    expected = "failed to read file lines `../../../libs/bindgen/default/Windows.winmd`"
+)]
 fn not_text_file() {
-    bindgen("--etc ../../libs/bindgen/default/Windows.winmd");
+    bindgen("--etc ../../../libs/bindgen/default/Windows.winmd");
 }
 
 #[test]
@@ -106,15 +108,15 @@ fn input_directory_empty() {
 }
 
 #[test]
-#[should_panic(expected = "failed to read .winmd format `../../libs/bindgen/default/readme.md`")]
+#[should_panic(expected = "failed to read .winmd format `../../../libs/bindgen/default/readme.md`")]
 fn invalid_input_format() {
-    bindgen("--in ../../libs/bindgen/default/readme.md --out out.txt --filter POINT");
+    bindgen("--in ../../../libs/bindgen/default/readme.md --out out.txt --filter POINT");
 }
 
 #[test]
 #[should_panic(expected = "type not found: `POINT`")]
 fn no_default() {
-    bindgen("--in ../../libs/bindgen/default/Windows.winmd --out out.txt --filter POINT");
+    bindgen("--in ../../../libs/bindgen/default/Windows.winmd --out out.txt --filter POINT");
 }
 
 #[test]

diff --git a/crates/tests/bindgen/tests/ref_params.rs → ...es/tests/libs/bindgen/tests/ref_params.rs b/crates/tests/bindgen/tests/ref_params.rs → ...es/tests/libs/bindgen/tests/ref_params.rs
diff --git a/crates/tests/winrt/collections/Cargo.toml → crates/tests/libs/collections/Cargo.toml b/crates/tests/winrt/collections/Cargo.toml → crates/tests/libs/collections/Cargo.toml
diff --git a/crates/tests/misc/async/src/lib.rs → crates/tests/libs/collections/src/lib.rs b/crates/tests/misc/async/src/lib.rs → crates/tests/libs/collections/src/lib.rs
diff --git a/...es/tests/winrt/collections/tests/empty.rs → crates/tests/libs/collections/tests/empty.rs b/...es/tests/winrt/collections/tests/empty.rs → crates/tests/libs/collections/tests/empty.rs
diff --git a/...winrt/collections/tests/stock_iterable.rs → .../libs/collections/tests/stock_iterable.rs b/...winrt/collections/tests/stock_iterable.rs → .../libs/collections/tests/stock_iterable.rs
diff --git a/...winrt/collections/tests/stock_map_view.rs → .../libs/collections/tests/stock_map_view.rs b/...winrt/collections/tests/stock_map_view.rs → .../libs/collections/tests/stock_map_view.rs
diff --git a/...rt/collections/tests/stock_vector_view.rs → ...bs/collections/tests/stock_vector_view.rs b/...rt/collections/tests/stock_vector_view.rs → ...bs/collections/tests/stock_vector_view.rs
diff --git a/...sts/winrt/collections/tests/string_map.rs → ...ests/libs/collections/tests/string_map.rs b/...sts/winrt/collections/tests/string_map.rs → ...ests/libs/collections/tests/string_map.rs
diff --git a/crates/tests/misc/core/Cargo.toml → crates/tests/libs/core/Cargo.toml b/crates/tests/misc/core/Cargo.toml → crates/tests/libs/core/Cargo.toml
diff --git a/crates/tests/misc/core/src/lib.rs → crates/tests/libs/core/src/lib.rs b/crates/tests/misc/core/src/lib.rs → crates/tests/libs/core/src/lib.rs
diff --git a/crates/tests/misc/core/tests/array.rs → crates/tests/libs/core/tests/array.rs b/crates/tests/misc/core/tests/array.rs → crates/tests/libs/core/tests/array.rs
diff --git a/crates/tests/misc/core/tests/error.rs → crates/tests/libs/core/tests/error.rs b/crates/tests/misc/core/tests/error.rs → crates/tests/libs/core/tests/error.rs
diff --git a/crates/tests/misc/core/tests/guid.rs → crates/tests/libs/core/tests/guid.rs b/crates/tests/misc/core/tests/guid.rs → crates/tests/libs/core/tests/guid.rs
diff --git a/crates/tests/misc/core/tests/hresult.rs → crates/tests/libs/core/tests/hresult.rs b/crates/tests/misc/core/tests/hresult.rs → crates/tests/libs/core/tests/hresult.rs
diff --git a/crates/tests/misc/core/tests/unknown.rs → crates/tests/libs/core/tests/unknown.rs b/crates/tests/misc/core/tests/unknown.rs → crates/tests/libs/core/tests/unknown.rs
diff --git a/crates/tests/misc/async/Cargo.toml → crates/tests/libs/future/Cargo.toml b/crates/tests/misc/async/Cargo.toml → crates/tests/libs/future/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "test_async"
+name = "test_future"
 version = "0.0.0"
 edition = "2021"
 publish = false

diff --git a/crates/tests/misc/implement/src/lib.rs → crates/tests/libs/future/src/lib.rs b/crates/tests/misc/implement/src/lib.rs → crates/tests/libs/future/src/lib.rs
diff --git a/crates/tests/misc/async/tests/agile.rs → crates/tests/libs/future/tests/agile.rs b/crates/tests/misc/async/tests/agile.rs → crates/tests/libs/future/tests/agile.rs
diff --git a/crates/tests/misc/async/tests/async_info.rs → crates/tests/libs/future/tests/async_info.rs b/crates/tests/misc/async/tests/async_info.rs → crates/tests/libs/future/tests/async_info.rs
diff --git a/...ts/misc/async/tests/completed_finished.rs → ...s/libs/future/tests/completed_finished.rs b/...ts/misc/async/tests/completed_finished.rs → ...s/libs/future/tests/completed_finished.rs
diff --git a/...s/tests/misc/async/tests/completed_get.rs → .../tests/libs/future/tests/completed_get.rs b/...s/tests/misc/async/tests/completed_get.rs → .../tests/libs/future/tests/completed_get.rs
diff --git a/.../tests/misc/async/tests/completed_once.rs → ...tests/libs/future/tests/completed_once.rs b/.../tests/misc/async/tests/completed_once.rs → ...tests/libs/future/tests/completed_once.rs
diff --git a/...sts/misc/async/tests/completed_started.rs → ...ts/libs/future/tests/completed_started.rs b/...sts/misc/async/tests/completed_started.rs → ...ts/libs/future/tests/completed_started.rs
diff --git a/crates/tests/misc/async/tests/dropped.rs → crates/tests/libs/future/tests/dropped.rs b/crates/tests/misc/async/tests/dropped.rs → crates/tests/libs/future/tests/dropped.rs
diff --git a/crates/tests/misc/async/tests/error.rs → crates/tests/libs/future/tests/error.rs b/crates/tests/misc/async/tests/error.rs → crates/tests/libs/future/tests/error.rs
diff --git a/crates/tests/misc/async/tests/futures.rs → crates/tests/libs/future/tests/futures.rs b/crates/tests/misc/async/tests/futures.rs → crates/tests/libs/future/tests/futures.rs
diff --git a/crates/tests/misc/async/tests/progress.rs → crates/tests/libs/future/tests/progress.rs b/crates/tests/misc/async/tests/progress.rs → crates/tests/libs/future/tests/progress.rs
diff --git a/crates/tests/misc/async/tests/started.rs → crates/tests/libs/future/tests/started.rs b/crates/tests/misc/async/tests/started.rs → crates/tests/libs/future/tests/started.rs
diff --git a/crates/tests/misc/implement/Cargo.toml → crates/tests/libs/implement/Cargo.toml b/crates/tests/misc/implement/Cargo.toml → crates/tests/libs/implement/Cargo.toml
diff --git a/crates/tests/misc/interface/src/lib.rs → crates/tests/libs/implement/src/lib.rs b/crates/tests/misc/interface/src/lib.rs → crates/tests/libs/implement/src/lib.rs
diff --git a/...isc/implement/tests/as_interface_param.rs → ...ibs/implement/tests/as_interface_param.rs b/...isc/implement/tests/as_interface_param.rs → ...ibs/implement/tests/as_interface_param.rs
diff --git a/crates/tests/misc/implement/tests/buffer.rs → crates/tests/libs/implement/tests/buffer.rs b/crates/tests/misc/implement/tests/buffer.rs → crates/tests/libs/implement/tests/buffer.rs
diff --git a/...sts/misc/implement/tests/class_factory.rs → ...sts/libs/implement/tests/class_factory.rs b/...sts/misc/implement/tests/class_factory.rs → ...sts/libs/implement/tests/class_factory.rs
diff --git a/crates/tests/misc/implement/tests/com.rs → crates/tests/libs/implement/tests/com.rs b/crates/tests/misc/implement/tests/com.rs → crates/tests/libs/implement/tests/com.rs
diff --git a/...s/tests/misc/implement/tests/com_chain.rs → ...s/tests/libs/implement/tests/com_chain.rs b/...s/tests/misc/implement/tests/com_chain.rs → ...s/tests/libs/implement/tests/com_chain.rs
diff --git a/...tests/misc/implement/tests/data_object.rs → ...tests/libs/implement/tests/data_object.rs b/...tests/misc/implement/tests/data_object.rs → ...tests/libs/implement/tests/data_object.rs
diff --git a/...tests/misc/implement/tests/drop_target.rs → ...tests/libs/implement/tests/drop_target.rs b/...tests/misc/implement/tests/drop_target.rs → ...tests/libs/implement/tests/drop_target.rs
diff --git a/crates/tests/misc/implement/tests/dual.rs → crates/tests/libs/implement/tests/dual.rs b/crates/tests/misc/implement/tests/dual.rs → crates/tests/libs/implement/tests/dual.rs
diff --git a/crates/tests/misc/implement/tests/error.rs → crates/tests/libs/implement/tests/error.rs b/crates/tests/misc/implement/tests/error.rs → crates/tests/libs/implement/tests/error.rs
diff --git a/...misc/implement/tests/from_raw_borrowed.rs → ...libs/implement/tests/from_raw_borrowed.rs b/...misc/implement/tests/from_raw_borrowed.rs → ...libs/implement/tests/from_raw_borrowed.rs
diff --git a/...mplement/tests/from_raw_borrowed_winrt.rs → ...mplement/tests/from_raw_borrowed_winrt.rs b/...mplement/tests/from_raw_borrowed_winrt.rs → ...mplement/tests/from_raw_borrowed_winrt.rs
diff --git a/...s/misc/implement/tests/generic_default.rs → ...s/libs/implement/tests/generic_default.rs b/...s/misc/implement/tests/generic_default.rs → ...s/libs/implement/tests/generic_default.rs
diff --git a/...s/misc/implement/tests/generic_generic.rs → ...s/libs/implement/tests/generic_generic.rs b/...s/misc/implement/tests/generic_generic.rs → ...s/libs/implement/tests/generic_generic.rs
diff --git a/...misc/implement/tests/generic_primitive.rs → ...libs/implement/tests/generic_primitive.rs b/...misc/implement/tests/generic_primitive.rs → ...libs/implement/tests/generic_primitive.rs
diff --git a/...isc/implement/tests/generic_stringable.rs → ...ibs/implement/tests/generic_stringable.rs b/...isc/implement/tests/generic_stringable.rs → ...ibs/implement/tests/generic_stringable.rs
diff --git a/...es/tests/misc/implement/tests/identity.rs → ...es/tests/libs/implement/tests/identity.rs b/...es/tests/misc/implement/tests/identity.rs → ...es/tests/libs/implement/tests/identity.rs
diff --git a/...sts/misc/implement/tests/identity_from.rs → ...sts/libs/implement/tests/identity_from.rs b/...sts/misc/implement/tests/identity_from.rs → ...sts/libs/implement/tests/identity_from.rs
diff --git a/...s/tests/misc/implement/tests/into_impl.rs → ...s/tests/libs/implement/tests/into_impl.rs b/...s/tests/misc/implement/tests/into_impl.rs → ...s/tests/libs/implement/tests/into_impl.rs
diff --git a/crates/tests/misc/implement/tests/map.rs → crates/tests/libs/implement/tests/map.rs b/crates/tests/misc/implement/tests/map.rs → crates/tests/libs/implement/tests/map.rs
diff --git a/crates/tests/misc/implement/tests/no_std.rs → crates/tests/libs/implement/tests/no_std.rs b/crates/tests/misc/implement/tests/no_std.rs → crates/tests/libs/implement/tests/no_std.rs
diff --git a/.../tests/misc/implement/tests/properties.rs → .../tests/libs/implement/tests/properties.rs b/.../tests/misc/implement/tests/properties.rs → .../tests/libs/implement/tests/properties.rs
diff --git a/crates/tests/misc/implement/tests/query.rs → crates/tests/libs/implement/tests/query.rs b/crates/tests/misc/implement/tests/query.rs → crates/tests/libs/implement/tests/query.rs
diff --git a/...tests/misc/implement/tests/trust_level.rs → ...tests/libs/implement/tests/trust_level.rs b/...tests/misc/implement/tests/trust_level.rs → ...tests/libs/implement/tests/trust_level.rs
diff --git a/crates/tests/misc/implement/tests/vector.rs → crates/tests/libs/implement/tests/vector.rs b/crates/tests/misc/implement/tests/vector.rs → crates/tests/libs/implement/tests/vector.rs
diff --git a/crates/tests/misc/implement_core/Cargo.toml → crates/tests/libs/implement_core/Cargo.toml b/crates/tests/misc/implement_core/Cargo.toml → crates/tests/libs/implement_core/Cargo.toml
diff --git a/...ests/misc/implement_core/src/com_chain.rs → ...ests/libs/implement_core/src/com_chain.rs b/...ests/misc/implement_core/src/com_chain.rs → ...ests/libs/implement_core/src/com_chain.rs
diff --git a/...sts/misc/implement_core/src/com_object.rs → ...sts/libs/implement_core/src/com_object.rs b/...sts/misc/implement_core/src/com_object.rs → ...sts/libs/implement_core/src/com_object.rs
diff --git a/crates/tests/misc/implement_core/src/lib.rs → crates/tests/libs/implement_core/src/lib.rs b/crates/tests/misc/implement_core/src/lib.rs → crates/tests/libs/implement_core/src/lib.rs
diff --git a/...c/implement_core/src/static_com_object.rs → ...s/implement_core/src/static_com_object.rs b/...c/implement_core/src/static_com_object.rs → ...s/implement_core/src/static_com_object.rs
diff --git a/crates/tests/misc/interface/Cargo.toml → crates/tests/libs/interface/Cargo.toml b/crates/tests/misc/interface/Cargo.toml → crates/tests/libs/interface/Cargo.toml
diff --git a/crates/tests/misc/interface_core/src/lib.rs → crates/tests/libs/interface/src/lib.rs b/crates/tests/misc/interface_core/src/lib.rs → crates/tests/libs/interface/src/lib.rs
diff --git a/crates/tests/misc/interface/tests/com.rs → crates/tests/libs/interface/tests/com.rs b/crates/tests/misc/interface/tests/com.rs → crates/tests/libs/interface/tests/com.rs
diff --git a/...misc/interface/tests/com_from_existing.rs → ...libs/interface/tests/com_from_existing.rs b/...misc/interface/tests/com_from_existing.rs → ...libs/interface/tests/com_from_existing.rs
diff --git a/crates/tests/misc/interface/tests/no_std.rs → crates/tests/libs/interface/tests/no_std.rs b/crates/tests/misc/interface/tests/no_std.rs → crates/tests/libs/interface/tests/no_std.rs
diff --git a/crates/tests/misc/interface/tests/no_use.rs → crates/tests/libs/interface/tests/no_use.rs b/crates/tests/misc/interface/tests/no_use.rs → crates/tests/libs/interface/tests/no_use.rs
diff --git a/.../misc/interface/tests/non_com_existing.rs → .../libs/interface/tests/non_com_existing.rs b/.../misc/interface/tests/non_com_existing.rs → .../libs/interface/tests/non_com_existing.rs
diff --git a/...tests/misc/interface/tests/non_com_new.rs → ...tests/libs/interface/tests/non_com_new.rs b/...tests/misc/interface/tests/non_com_new.rs → ...tests/libs/interface/tests/non_com_new.rs
diff --git a/crates/tests/misc/interface_core/Cargo.toml → crates/tests/libs/interface_core/Cargo.toml b/crates/tests/misc/interface_core/Cargo.toml → crates/tests/libs/interface_core/Cargo.toml
diff --git a/crates/tests/misc/registry/src/lib.rs → crates/tests/libs/interface_core/src/lib.rs b/crates/tests/misc/registry/src/lib.rs → crates/tests/libs/interface_core/src/lib.rs
diff --git a/...misc/interface_core/tests/asterisk_use.rs → ...libs/interface_core/tests/asterisk_use.rs b/...misc/interface_core/tests/asterisk_use.rs → ...libs/interface_core/tests/asterisk_use.rs
diff --git a/.../tests/misc/interface_core/tests/deref.rs → .../tests/libs/interface_core/tests/deref.rs b/.../tests/misc/interface_core/tests/deref.rs → .../tests/libs/interface_core/tests/deref.rs
diff --git a/...tests/misc/interface_core/tests/no_use.rs → ...tests/libs/interface_core/tests/no_use.rs b/...tests/misc/interface_core/tests/no_use.rs → ...tests/libs/interface_core/tests/no_use.rs
diff --git a/...es/tests/misc/interface_core/tests/ref.rs → ...es/tests/libs/interface_core/tests/ref.rs b/...es/tests/misc/interface_core/tests/ref.rs → ...es/tests/libs/interface_core/tests/ref.rs
diff --git a/...tests/misc/interface_core/tests/ref_ok.rs → ...tests/libs/interface_core/tests/ref_ok.rs b/...tests/misc/interface_core/tests/ref_ok.rs → ...tests/libs/interface_core/tests/ref_ok.rs
diff --git a/...tests/misc/interface_core/tests/result.rs → ...tests/libs/interface_core/tests/result.rs b/...tests/misc/interface_core/tests/result.rs → ...tests/libs/interface_core/tests/result.rs
diff --git a/crates/tests/misc/registry/Cargo.toml → crates/tests/libs/registry/Cargo.toml b/crates/tests/misc/registry/Cargo.toml → crates/tests/libs/registry/Cargo.toml
diff --git a/crates/tests/misc/result/src/lib.rs → crates/tests/libs/registry/src/lib.rs b/crates/tests/misc/result/src/lib.rs → crates/tests/libs/registry/src/lib.rs
diff --git a/crates/tests/misc/registry/tests/access.rs → crates/tests/libs/registry/tests/access.rs b/crates/tests/misc/registry/tests/access.rs → crates/tests/libs/registry/tests/access.rs
diff --git a/...s/tests/misc/registry/tests/bad_string.rs → ...s/tests/libs/registry/tests/bad_string.rs b/...s/tests/misc/registry/tests/bad_string.rs → ...s/tests/libs/registry/tests/bad_string.rs
diff --git a/crates/tests/misc/registry/tests/bytes.rs → crates/tests/libs/registry/tests/bytes.rs b/crates/tests/misc/registry/tests/bytes.rs → crates/tests/libs/registry/tests/bytes.rs
diff --git a/crates/tests/misc/registry/tests/hstring.rs → crates/tests/libs/registry/tests/hstring.rs b/crates/tests/misc/registry/tests/hstring.rs → crates/tests/libs/registry/tests/hstring.rs
diff --git a/crates/tests/misc/registry/tests/interop.rs → crates/tests/libs/registry/tests/interop.rs b/crates/tests/misc/registry/tests/interop.rs → crates/tests/libs/registry/tests/interop.rs
diff --git a/crates/tests/misc/registry/tests/keys.rs → crates/tests/libs/registry/tests/keys.rs b/crates/tests/misc/registry/tests/keys.rs → crates/tests/libs/registry/tests/keys.rs
diff --git a/crates/tests/misc/registry/tests/raw.rs → crates/tests/libs/registry/tests/raw.rs b/crates/tests/misc/registry/tests/raw.rs → crates/tests/libs/registry/tests/raw.rs
diff --git a/...s/tests/misc/registry/tests/read_write.rs → ...s/tests/libs/registry/tests/read_write.rs b/...s/tests/misc/registry/tests/read_write.rs → ...s/tests/libs/registry/tests/read_write.rs
diff --git a/crates/tests/misc/registry/tests/string.rs → crates/tests/libs/registry/tests/string.rs b/crates/tests/misc/registry/tests/string.rs → crates/tests/libs/registry/tests/string.rs
diff --git a/.../tests/misc/registry/tests/transaction.rs → .../tests/libs/registry/tests/transaction.rs b/.../tests/misc/registry/tests/transaction.rs → .../tests/libs/registry/tests/transaction.rs
diff --git a/crates/tests/misc/registry/tests/u32.rs → crates/tests/libs/registry/tests/u32.rs b/crates/tests/misc/registry/tests/u32.rs → crates/tests/libs/registry/tests/u32.rs
diff --git a/crates/tests/misc/registry/tests/u64.rs → crates/tests/libs/registry/tests/u64.rs b/crates/tests/misc/registry/tests/u64.rs → crates/tests/libs/registry/tests/u64.rs
diff --git a/crates/tests/misc/registry/tests/value.rs → crates/tests/libs/registry/tests/value.rs b/crates/tests/misc/registry/tests/value.rs → crates/tests/libs/registry/tests/value.rs
diff --git a/crates/tests/misc/registry/tests/values.rs → crates/tests/libs/registry/tests/values.rs b/crates/tests/misc/registry/tests/values.rs → crates/tests/libs/registry/tests/values.rs
diff --git a/crates/tests/misc/result/Cargo.toml → crates/tests/libs/result/Cargo.toml b/crates/tests/misc/result/Cargo.toml → crates/tests/libs/result/Cargo.toml
diff --git a/crates/tests/misc/strings/src/lib.rs → crates/tests/libs/result/src/lib.rs b/crates/tests/misc/strings/src/lib.rs → crates/tests/libs/result/src/lib.rs
diff --git a/crates/tests/misc/result/tests/error.rs → crates/tests/libs/result/tests/error.rs b/crates/tests/misc/result/tests/error.rs → crates/tests/libs/result/tests/error.rs
diff --git a/crates/tests/misc/result/tests/hresult.rs → crates/tests/libs/result/tests/hresult.rs b/crates/tests/misc/result/tests/hresult.rs → crates/tests/libs/result/tests/hresult.rs
diff --git a/crates/tests/misc/result/tests/ntstatus.rs → crates/tests/libs/result/tests/ntstatus.rs b/crates/tests/misc/result/tests/ntstatus.rs → crates/tests/libs/result/tests/ntstatus.rs
diff --git a/...es/tests/misc/result/tests/slim_errors.rs → ...es/tests/libs/result/tests/slim_errors.rs b/...es/tests/misc/result/tests/slim_errors.rs → ...es/tests/libs/result/tests/slim_errors.rs
diff --git a/crates/tests/misc/strings/Cargo.toml → crates/tests/libs/strings/Cargo.toml b/crates/tests/misc/strings/Cargo.toml → crates/tests/libs/strings/Cargo.toml
diff --git a/crates/tests/winrt/collections/src/lib.rs → crates/tests/libs/strings/src/lib.rs b/crates/tests/winrt/collections/src/lib.rs → crates/tests/libs/strings/src/lib.rs
diff --git a/crates/tests/misc/strings/tests/bstr.rs → crates/tests/libs/strings/tests/bstr.rs b/crates/tests/misc/strings/tests/bstr.rs → crates/tests/libs/strings/tests/bstr.rs
diff --git a/crates/tests/misc/strings/tests/hstring.rs → crates/tests/libs/strings/tests/hstring.rs b/crates/tests/misc/strings/tests/hstring.rs → crates/tests/libs/strings/tests/hstring.rs
diff --git a/...sts/misc/strings/tests/hstring_builder.rs → ...sts/libs/strings/tests/hstring_builder.rs b/...sts/misc/strings/tests/hstring_builder.rs → ...sts/libs/strings/tests/hstring_builder.rs
diff --git a/crates/tests/misc/strings/tests/literals.rs → crates/tests/libs/strings/tests/literals.rs b/crates/tests/misc/strings/tests/literals.rs → crates/tests/libs/strings/tests/literals.rs
diff --git a/crates/tests/misc/strings/tests/pcstr.rs → crates/tests/libs/strings/tests/pcstr.rs b/crates/tests/misc/strings/tests/pcstr.rs → crates/tests/libs/strings/tests/pcstr.rs
diff --git a/crates/tests/misc/strings/tests/pcwstr.rs → crates/tests/libs/strings/tests/pcwstr.rs b/crates/tests/misc/strings/tests/pcwstr.rs → crates/tests/libs/strings/tests/pcwstr.rs
diff --git a/crates/tests/misc/strings/tests/pstr.rs → crates/tests/libs/strings/tests/pstr.rs b/crates/tests/misc/strings/tests/pstr.rs → crates/tests/libs/strings/tests/pstr.rs
diff --git a/crates/tests/misc/strings/tests/pwstr.rs → crates/tests/libs/strings/tests/pwstr.rs b/crates/tests/misc/strings/tests/pwstr.rs → crates/tests/libs/strings/tests/pwstr.rs
diff --git a/crates/tools/bindgen/src/main.rs b/crates/tools/bindgen/src/main.rs
@@ -1,4 +1,4 @@
-//! Regenerates bindings sources for `crates/tests/bindgen`
+//! Regenerates bindings sources for `crates/tests/libs/bindgen`
 
 use std::path::Path;
 use windows_bindgen::bindgen;
@@ -16,14 +16,14 @@ fn test_raw(args: &str) {
 fn main() {
     let time = std::time::Instant::now();
 
-    if !Path::new("crates/tests/bindgen/Cargo.toml").exists() {
+    if !Path::new("crates/tests/libs/bindgen/Cargo.toml").exists() {
         println!("This tool must be run from the root of the repo.");
         std::process::exit(1);
     }
 
-    std::fs::remove_dir_all("crates/tests/bindgen/src").unwrap();
-    std::fs::create_dir_all("crates/tests/bindgen/src").unwrap();
-    std::env::set_current_dir("crates/tests/bindgen/src").unwrap();
+    std::fs::remove_dir_all("crates/tests/libs/bindgen/src").unwrap();
+    std::fs::create_dir_all("crates/tests/libs/bindgen/src").unwrap();
+    std::env::set_current_dir("crates/tests/libs/bindgen/src").unwrap();
     std::fs::write("lib.rs", "").unwrap();
 
     // Test interactions with core types and namespaces