Improve crate naming and build validation (#1469)

.github/readme.md

@@ -43,7 +43,7 @@ fn main() -> Result<()> {
     assert!(root.InnerText()? == "hello world");
 
     unsafe {
-        let event = CreateEventW(std::ptr::null_mut(), true, false, None);
+        let event = CreateEventW(std::ptr::null(), true, false, None);
         SetEvent(event).ok()?;
         WaitForSingleObject(event, 0);
         CloseHandle(event).ok()?;

.github/workflows/build.yml

@@ -30,19 +30,19 @@ jobs:
       run: cargo doc --no-deps -p windows
 
   generation:
-    name: Check generation of `windows_${{ matrix.generator }}`
+    name: Check generation of `tool_${{ matrix.generator }}`
     runs-on: windows-latest
     strategy:
       matrix:
-        generator: [bindings, api, sys, yml]
+        generator: [bindings, windows, sys, yml]
     steps:
     - name: Checkout
       uses: actions/checkout@v2
-    - name: Run windows_${{ matrix.generator }}
-      run: cargo run -p windows_${{ matrix.generator }}
+    - name: Run tool_${{ matrix.generator }}
+      run: cargo run -p tool_${{ matrix.generator }}
     - name: Compare
       shell: bash
-      run: git diff --exit-code || (echo '::error::Generated `windows_${{ matrix.generator }}` are out-of-date. Please run `cargo run -p windows_${{ matrix.generator }}`'; exit 1)
+      run: git diff --exit-code || (echo '::error::Generated `tool_${{ matrix.generator }}` are out-of-date. Please run `cargo run -p tool_${{ matrix.generator }}`'; exit 1)
 
   cargo_sys:
     name: Check windows-sys

.github/workflows/test.yml

@@ -5,122 +5,204 @@ on:
   push:
     branches:
       - master
+
 env:
   RUSTFLAGS: -Dwarnings
 
 jobs:
   test:
     name: Test
-    runs-on: ${{ matrix.os }}
+    runs-on: windows-latest
+
     strategy:
       matrix:
         include:
-        - os: windows-latest
-          rust: stable
-          other: x86_64-pc-windows-msvc
-          platform: x64
-        - os: windows-latest
-          rust: nightly
-          other: i686-pc-windows-msvc
-          platform: x86
-        - os: windows-latest
-          rust: nightly
-          other: x86_64-pc-windows-gnu
-          platform: x64
-        - os: windows-latest
-          rust: stable
-          other: i686-pc-windows-gnu
-          platform: x86
+        - version: stable
+          target: x86_64-pc-windows-msvc
+        - version: nightly
+          target: i686-pc-windows-msvc
+        - version: nightly
+          target: x86_64-pc-windows-gnu
+        - version: stable
+          target: i686-pc-windows-gnu
+
     steps:
     - name: Checkout
       uses: actions/checkout@v2
-
     - name: Update toolchain
-      run: rustup update --no-self-update ${{ matrix.rust }} && rustup default ${{ matrix.rust }}
-
+      run: rustup update --no-self-update ${{ matrix.version }} && rustup default ${{ matrix.version }}
     - name: Add toolchain target
-      run: rustup target add ${{ matrix.other }}
-
+      run: rustup target add ${{ matrix.target }}
+    - name: Install clippy
+      run: rustup component add clippy      
     - name: Configure Cargo for GNU toolchain
       shell: pwsh
       run: |
         Add-Content $env:USERPROFILE\.cargo\config @"
-          [target.x86_64-pc-windows-gnu]
-          linker = `"C:\\msys64\\mingw64\\bin\\x86_64-w64-mingw32-gcc.exe`"
-          ar = `"C:\\msys64\\mingw64\\bin\\ar.exe`"
-          [target.i686-pc-windows-gnu]
-          linker = `"C:\\msys64\\mingw32\\bin\\i686-w64-mingw32-gcc.exe`"
-          ar = `"C:\\msys64\\mingw32\\bin\\ar.exe`"
+            [target.x86_64-pc-windows-gnu]
+            linker = `"C:\\msys64\\mingw64\\bin\\x86_64-w64-mingw32-gcc.exe`"
+            ar = `"C:\\msys64\\mingw64\\bin\\ar.exe`"
+            [target.i686-pc-windows-gnu]
+            linker = `"C:\\msys64\\mingw32\\bin\\i686-w64-mingw32-gcc.exe`"
+            ar = `"C:\\msys64\\mingw32\\bin\\ar.exe`"
         "@
-      if: contains(matrix.other, 'windows-gnu')
-
+      if: contains(matrix.target, 'windows-gnu')
     - name: Configure environment for GNU toolchain
       shell: pwsh
       run: |
-        if("${{ matrix.other }}" -eq "i686-pc-windows-gnu") {
-          $MingwPath = "C:\msys64\mingw32\bin"
+        if("${{ matrix.target }}" -eq "i686-pc-windows-gnu") {
+            $MingwPath = "C:\msys64\mingw32\bin"
         } else {
-          $MingwPath = "C:\msys64\mingw64\bin"
+            $MingwPath = "C:\msys64\mingw64\bin"
         }
         $MingwPath | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-      if: contains(matrix.other, 'windows-gnu')
+      if: contains(matrix.target, 'windows-gnu')
+    - name: Test stable
+      run: |
+        cargo test --target ${{ matrix.target }} -p windows-bindgen &&
+        cargo test --target ${{ matrix.target }} -p windows-metadata &&
+        cargo test --target ${{ matrix.target }} -p windows-sys &&
+        cargo test --target ${{ matrix.target }} -p windows-tokens &&
+        cargo test --target ${{ matrix.target }} -p windows &&
+        cargo test --target ${{ matrix.target }} -p windows_aarch64_msvc &&
+        cargo test --target ${{ matrix.target }} -p windows_i686_gnu &&
+        cargo test --target ${{ matrix.target }} -p windows_i686_msvc &&
+        cargo test --target ${{ matrix.target }} -p windows_x86_64_gnu &&
+        cargo test --target ${{ matrix.target }} -p windows_x86_64_msvc &&
+        cargo test --target ${{ matrix.target }} -p test_agile &&
+        cargo test --target ${{ matrix.target }} -p test_alternate_success_code &&
+        cargo test --target ${{ matrix.target }} -p test_arch &&
+        cargo test --target ${{ matrix.target }} -p test_arch_feature &&
+        cargo test --target ${{ matrix.target }} -p test_bstr &&
+        cargo test --target ${{ matrix.target }} -p test_core &&
+        cargo test --target ${{ matrix.target }} -p test_debug &&
+        cargo test --target ${{ matrix.target }} -p test_deprecated &&
+        cargo test --target ${{ matrix.target }} -p test_enums &&
+        cargo test --target ${{ matrix.target }} -p test_handles &&
+        cargo test --target ${{ matrix.target }} -p test_helpers &&
+        cargo test --target ${{ matrix.target }} -p test_interop &&
+        cargo test --target ${{ matrix.target }} -p test_lib &&
+        cargo test --target ${{ matrix.target }} -p test_matrix3x2 &&
+        cargo test --target ${{ matrix.target }} -p test_mshtml &&
+        cargo test --target ${{ matrix.target }} -p test_ntstatus &&
+        cargo test --target ${{ matrix.target }} -p test_pwstr &&
+        cargo test --target ${{ matrix.target }} -p test_return_struct &&
+        cargo test --target ${{ matrix.target }} -p test_structs &&
+        cargo test --target ${{ matrix.target }} -p test_sys &&
+        cargo test --target ${{ matrix.target }} -p test_unions &&
+        cargo test --target ${{ matrix.target }} -p test_weak &&
+        cargo test --target ${{ matrix.target }} -p test_win32 &&
+        cargo test --target ${{ matrix.target }} -p test_win32_arrays &&
+        cargo test --target ${{ matrix.target }} -p tool_bindings &&
+        cargo test --target ${{ matrix.target }} -p tool_gnu &&
+        cargo test --target ${{ matrix.target }} -p tool_msvc &&
+        cargo test --target ${{ matrix.target }} -p tool_sys &&
+        cargo test --target ${{ matrix.target }} -p tool_windows &&
+        cargo test --target ${{ matrix.target }} -p tool_yml 
+      if: matrix.version == 'stable'
 
-    - name: Test stable (${{ matrix.os }})
+    - name: Test nightly
       run: |
-        cargo test --target ${{ matrix.other }} -p test_agile &&
-        cargo test --target ${{ matrix.other }} -p test_alternate_success_code &&
-        cargo test --target ${{ matrix.other }} -p test_arch &&
-        cargo test --target ${{ matrix.other }} -p test_arch_feature &&
-        cargo test --target ${{ matrix.other }} -p test_bstr &&
-        cargo test --target ${{ matrix.other }} -p test_core &&
-        cargo test --target ${{ matrix.other }} -p test_debug &&
-        cargo test --target ${{ matrix.other }} -p test_deprecated &&
-        cargo test --target ${{ matrix.other }} -p test_enums &&
-        cargo test --target ${{ matrix.other }} -p test_handles &&
-        cargo test --target ${{ matrix.other }} -p test_helpers &&
-        cargo test --target ${{ matrix.other }} -p test_interop &&
-        cargo test --target ${{ matrix.other }} -p test_lib &&
-        cargo test --target ${{ matrix.other }} -p test_matrix3x2 &&
-        cargo test --target ${{ matrix.other }} -p test_mshtml &&
-        cargo test --target ${{ matrix.other }} -p test_ntstatus &&
-        cargo test --target ${{ matrix.other }} -p test_pwstr &&
-        cargo test --target ${{ matrix.other }} -p test_return_struct &&
-        cargo test --target ${{ matrix.other }} -p test_structs &&
-        cargo test --target ${{ matrix.other }} -p test_sys &&
-        cargo test --target ${{ matrix.other }} -p test_unions &&
-        cargo test --target ${{ matrix.other }} -p test_weak &&
-        cargo test --target ${{ matrix.other }} -p test_win32 &&
-        cargo test --target ${{ matrix.other }} -p test_win32_arrays 
-      if: contains(matrix.rust, 'stable')
+        cargo test --target ${{ matrix.target }} -p windows-implement &&
+        cargo test --target ${{ matrix.target }} -p sample_com_uri &&
+        cargo test --target ${{ matrix.target }} -p sample_core_app &&
+        cargo test --target ${{ matrix.target }} -p sample_create_window &&
+        cargo test --target ${{ matrix.target }} -p sample_create_window_sys &&
+        cargo test --target ${{ matrix.target }} -p sample_direct2d &&
+        cargo test --target ${{ matrix.target }} -p sample_direct3d12 &&
+        cargo test --target ${{ matrix.target }} -p sample_enum_windows &&
+        cargo test --target ${{ matrix.target }} -p sample_enum_windows_sys &&
+        cargo test --target ${{ matrix.target }} -p sample_kernel_event &&
+        cargo test --target ${{ matrix.target }} -p sample_memory_buffer &&
+        cargo test --target ${{ matrix.target }} -p sample_message_box &&
+        cargo test --target ${{ matrix.target }} -p sample_ocr &&
+        cargo test --target ${{ matrix.target }} -p sample_overlapped &&
+        cargo test --target ${{ matrix.target }} -p sample_rss &&
+        cargo test --target ${{ matrix.target }} -p sample_simple &&
+        cargo test --target ${{ matrix.target }} -p sample_spellchecker &&
+        cargo test --target ${{ matrix.target }} -p sample_uiautomation &&
+        cargo test --target ${{ matrix.target }} -p sample_xaml_app &&
+        cargo test --target ${{ matrix.target }} -p sample_xml &&
+        cargo test --target ${{ matrix.target }} -p test_implement &&
+        cargo test --target ${{ matrix.target }} -p test_implement_class_factory &&
+        cargo test --target ${{ matrix.target }} -p test_implement_data_object &&
+        cargo test --target ${{ matrix.target }} -p test_implement_identity &&
+        cargo test --target ${{ matrix.target }} -p test_implement_map &&
+        cargo test --target ${{ matrix.target }} -p test_implement_no_use &&
+        cargo test --target ${{ matrix.target }} -p test_implement_null_result &&
+        cargo test --target ${{ matrix.target }} -p test_implement_properties &&
+        cargo test --target ${{ matrix.target }} -p test_implement_winrt 
+      if: matrix.version == 'nightly'
 
-    - name: Test nightly (${{ matrix.os }})
+    - name: Test clippy
       run: |
-        cargo test --target ${{ matrix.other }} -p test_implement &&
-        cargo test --target ${{ matrix.other }} -p test_implement_class_factory &&
-        cargo test --target ${{ matrix.other }} -p test_implement_data_object &&
-        cargo test --target ${{ matrix.other }} -p test_implement_identity &&
-        cargo test --target ${{ matrix.other }} -p test_implement_map &&
-        cargo test --target ${{ matrix.other }} -p test_implement_no_use &&
-        cargo test --target ${{ matrix.other }} -p test_implement_null_result &&
-        cargo test --target ${{ matrix.other }} -p test_implement_properties &&
-        cargo test --target ${{ matrix.other }} -p test_implement_winrt &&
-        cargo test --target ${{ matrix.other }} -p com_uri &&
-        cargo test --target ${{ matrix.other }} -p core_app &&
-        cargo test --target ${{ matrix.other }} -p create_window &&
-        cargo test --target ${{ matrix.other }} -p create_window_sys &&
-        cargo test --target ${{ matrix.other }} -p direct2d &&
-        cargo test --target ${{ matrix.other }} -p direct3d12 &&
-        cargo test --target ${{ matrix.other }} -p enum_windows &&
-        cargo test --target ${{ matrix.other }} -p enum_windows_sys &&
-        cargo test --target ${{ matrix.other }} -p kernel_event &&
-        cargo test --target ${{ matrix.other }} -p memory_buffer &&
-        cargo test --target ${{ matrix.other }} -p message_box &&
-        cargo test --target ${{ matrix.other }} -p ocr &&
-        cargo test --target ${{ matrix.other }} -p overlapped &&
-        cargo test --target ${{ matrix.other }} -p rss &&
-        cargo test --target ${{ matrix.other }} -p simple &&
-        cargo test --target ${{ matrix.other }} -p spellchecker &&
-        cargo test --target ${{ matrix.other }} -p uiautomation &&
-        cargo test --target ${{ matrix.other }} -p xaml_app &&
-        cargo test --target ${{ matrix.other }} -p xml 
-      if: contains(matrix.rust, 'nightly')
+        cargo clippy -p windows-bindgen &&
+        cargo clippy -p windows-implement &&
+        cargo clippy -p windows-metadata &&
+        cargo clippy -p windows-sys &&
+        cargo clippy -p windows-tokens &&
+        cargo clippy -p windows &&
+        cargo clippy -p sample_com_uri &&
+        cargo clippy -p sample_core_app &&
+        cargo clippy -p sample_create_window &&
+        cargo clippy -p sample_create_window_sys &&
+        cargo clippy -p sample_direct2d &&
+        cargo clippy -p sample_direct3d12 &&
+        cargo clippy -p sample_enum_windows &&
+        cargo clippy -p sample_enum_windows_sys &&
+        cargo clippy -p sample_kernel_event &&
+        cargo clippy -p sample_memory_buffer &&
+        cargo clippy -p sample_message_box &&
+        cargo clippy -p sample_ocr &&
+        cargo clippy -p sample_overlapped &&
+        cargo clippy -p sample_rss &&
+        cargo clippy -p sample_simple &&
+        cargo clippy -p sample_spellchecker &&
+        cargo clippy -p sample_uiautomation &&
+        cargo clippy -p sample_xaml_app &&
+        cargo clippy -p sample_xml &&
+        cargo clippy -p windows_aarch64_msvc &&
+        cargo clippy -p windows_i686_gnu &&
+        cargo clippy -p windows_i686_msvc &&
+        cargo clippy -p windows_x86_64_gnu &&
+        cargo clippy -p windows_x86_64_msvc &&
+        cargo clippy -p test_agile &&
+        cargo clippy -p test_alternate_success_code &&
+        cargo clippy -p test_arch &&
+        cargo clippy -p test_arch_feature &&
+        cargo clippy -p test_bstr &&
+        cargo clippy -p test_core &&
+        cargo clippy -p test_debug &&
+        cargo clippy -p test_deprecated &&
+        cargo clippy -p test_enums &&
+        cargo clippy -p test_handles &&
+        cargo clippy -p test_helpers &&
+        cargo clippy -p test_implement &&
+        cargo clippy -p test_implement_class_factory &&
+        cargo clippy -p test_implement_data_object &&
+        cargo clippy -p test_implement_identity &&
+        cargo clippy -p test_implement_map &&
+        cargo clippy -p test_implement_no_use &&
+        cargo clippy -p test_implement_null_result &&
+        cargo clippy -p test_implement_properties &&
+        cargo clippy -p test_implement_winrt &&
+        cargo clippy -p test_interop &&
+        cargo clippy -p test_lib &&
+        cargo clippy -p test_matrix3x2 &&
+        cargo clippy -p test_mshtml &&
+        cargo clippy -p test_ntstatus &&
+        cargo clippy -p test_pwstr &&
+        cargo clippy -p test_return_struct &&
+        cargo clippy -p test_structs &&
+        cargo clippy -p test_sys &&
+        cargo clippy -p test_unions &&
+        cargo clippy -p test_weak &&
+        cargo clippy -p test_win32 &&
+        cargo clippy -p test_win32_arrays &&
+        cargo clippy -p tool_bindings &&
+        cargo clippy -p tool_gnu &&
+        cargo clippy -p tool_msvc &&
+        cargo clippy -p tool_sys &&
+        cargo clippy -p tool_windows &&
+        cargo clippy -p tool_yml 
+      if: matrix.version == 'nightly' && matrix.target == 'x86_64-pc-windows-gnu'

crates/libs/bindgen/Cargo.toml

@@ -8,5 +8,5 @@ description = "Code gen support for the windows crate"
 repository = "https://github.com/microsoft/windows-rs"
 
 [dependencies]
-quote = { package = "windows_quote", path = "../quote", version = "0.30.0" }
-reader = { package = "windows_reader", path = "../reader", version = "0.30.0" }
+tokens = { package = "windows-tokens", path = "../tokens", version = "0.30.0" }
+metadata = { package = "windows-metadata", path = "../metadata", version = "0.30.0" }

crates/libs/bindgen/src/lib.rs

@@ -25,13 +25,13 @@ use functions::*;
 pub use gen::*;
 use helpers::*;
 use iterator::*;
+use metadata::*;
 use method_names::*;
 use methods::*;
 use names::*;
-use quote::*;
 use r#async::*;
-use reader::*;
 use signatures::*;
+use tokens::*;
 
 pub fn gen_type(name: &str, gen: &Gen) -> String {
     let reader = TypeReader::get();

crates/libs/macros/Cargo.toml → crates/libs/implement/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "windows_macros"
+name = "windows-implement"
 version = "0.30.0"
 authors = ["Microsoft"]
 edition = "2018"
@@ -12,4 +12,4 @@ proc-macro = true
 
 [dependencies]
 syn = { version = "1.0", default-features = false, features = ["parsing", "proc-macro", "printing", "full", "derive"] }
-quote = { package = "windows_quote", path = "../quote", version = "0.30.0" }
+tokens = { package = "windows-tokens", path = "../tokens", version = "0.30.0" }

crates/libs/macros/src/implement.rs → crates/libs/implement/src/implement.rs

@@ -1,8 +1,8 @@
-use quote::*;
 use std::collections::*;
 use syn::parse::*;
 use syn::Ident;
 use syn::*;
+use tokens::*;
 
 // New traits-based implement macro that doesn't rely on metadata
 // Also no support for overrides (Xaml) but developers can still implement overrides directly by implementning the necessary override interface

crates/libs/reader/Cargo.toml → crates/libs/metadata/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "windows_reader"
+name = "windows-metadata"
 version = "0.30.0"
 authors = ["Microsoft"]
 edition = "2018"

crates/libs/quote/Cargo.toml → crates/libs/tokens/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "windows_quote"
+name = "windows-tokens"
 version = "0.30.0"
 authors = ["Microsoft"]
 edition = "2018"