microsoft · kennykerr · Mar 25, 2022 · Mar 25, 2022 · Mar 25, 2022 · Mar 25, 2022
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -49,7 +49,7 @@ jobs:
     runs-on: windows-2019
     strategy:
       matrix:
-        rust: [1.46.0, stable, nightly]
+        rust: [1.56.0, stable, nightly]
     steps:
     - name: Checkout
       uses: actions/checkout@v2
@@ -58,6 +58,20 @@ jobs:
     - name: Run cargo check
       run: cargo check -p windows-sys --all-features
 
+  cargo_windows:
+    name: Check windows
+    runs-on: windows-2019
+    strategy:
+      matrix:
+        rust: [1.59.0, stable, nightly]
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Update toolchain
+      run: rustup update --no-self-update ${{ matrix.rust }} && rustup default ${{ matrix.rust }}
+    - name: Run cargo check
+      run: cargo check -p windows
+
   cargo_clippy:
     name: Check clippy
     runs-on: windows-2019

diff --git a/crates/libs/bindgen/Cargo.toml b/crates/libs/bindgen/Cargo.toml
@@ -2,7 +2,7 @@
 name = "windows-bindgen"
 version = "0.34.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 license = "MIT OR Apache-2.0"
 description = "Code gen support for the windows crate"
 repository = "https://github.com/microsoft/windows-rs"

diff --git a/crates/libs/bindgen/src/names.rs b/crates/libs/bindgen/src/names.rs
@@ -295,7 +295,7 @@ where
             };
 
             let generics = def.generics.iter().map(|g| gen_element_name(g, gen));
-            quote! { #namespace#name#colon_separated<#(#generics),*> }
+            quote! { #namespace #name #colon_separated<#(#generics),*> }
         }
     }
 }

diff --git a/crates/libs/implement/Cargo.toml b/crates/libs/implement/Cargo.toml
@@ -2,7 +2,7 @@
 name = "windows-implement"
 version = "0.34.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 license = "MIT OR Apache-2.0"
 description = "The implement macro for the windows crate"
 repository = "https://github.com/microsoft/windows-rs"

diff --git a/crates/libs/interface/Cargo.toml b/crates/libs/interface/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "windows-interface"
 version = "0.34.0"
-edition = "2018"
+edition = "2021"
 authors = ["Microsoft"]
 license = "MIT OR Apache-2.0"
 description = "The interface macro for the windows crate"

diff --git a/crates/libs/metadata/Cargo.toml b/crates/libs/metadata/Cargo.toml
@@ -2,7 +2,7 @@
 name = "windows-metadata"
 version = "0.34.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 license = "MIT OR Apache-2.0"
 description = "Code gen support for the windows crate"
 repository = "https://github.com/microsoft/windows-rs"
diff --git a/crates/libs/sys/Cargo.toml b/crates/libs/sys/Cargo.toml
@@ -3,11 +3,12 @@
 name = "windows-sys"
 version = "0.34.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 license = "MIT OR Apache-2.0"
 description = "Rust for Windows"
 repository = "https://github.com/microsoft/windows-rs"
 readme = "../../../.github/readme.md"
+rust-version = "1.56"
 
 [package.metadata.docs.rs]
 default-target = "x86_64-pc-windows-msvc"

diff --git a/crates/libs/tokens/Cargo.toml b/crates/libs/tokens/Cargo.toml
@@ -2,7 +2,7 @@
 name = "windows-tokens"
 version = "0.34.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 license = "MIT OR Apache-2.0"
 description = "Code gen support for the windows crate"
 repository = "https://github.com/microsoft/windows-rs"

diff --git a/crates/libs/windows/Cargo.toml b/crates/libs/windows/Cargo.toml
@@ -3,12 +3,13 @@
 name = "windows"
 version = "0.34.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 license = "MIT OR Apache-2.0"
 description = "Rust for Windows"
 repository = "https://github.com/microsoft/windows-rs"
 documentation = "https://microsoft.github.io/windows-docs-rs/"
 readme = "../../../.github/readme.md"
+rust-version = "1.59"
 
 [package.metadata.docs.rs]
 default-target = "x86_64-pc-windows-msvc"

diff --git a/crates/samples/com_uri/Cargo.toml b/crates/samples/com_uri/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "sample_com_uri"
 version = "0.0.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"

diff --git a/crates/samples/consent/Cargo.toml b/crates/samples/consent/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "sample_consent"
 version = "0.0.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"

diff --git a/crates/samples/core_app/Cargo.toml b/crates/samples/core_app/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "sample_core_app"
 version = "0.0.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"

diff --git a/crates/samples/create_window/Cargo.toml b/crates/samples/create_window/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "sample_create_window"
 version = "0.0.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"

diff --git a/crates/samples/create_window_sys/Cargo.toml b/crates/samples/create_window_sys/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "sample_create_window_sys"
 version = "0.0.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows-sys]
 path = "../../libs/sys"

diff --git a/crates/samples/data_protection/Cargo.toml b/crates/samples/data_protection/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "sample_data_protection"
 version = "0.0.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"

diff --git a/crates/samples/direct2d/Cargo.toml b/crates/samples/direct2d/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "sample_direct2d"
 version = "0.0.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"

diff --git a/crates/samples/direct3d12/Cargo.toml b/crates/samples/direct3d12/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "sample_direct3d12"
 version = "0.0.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 array-init = "2.0.0"

diff --git a/crates/samples/enum_windows/Cargo.toml b/crates/samples/enum_windows/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "sample_enum_windows"
 version = "0.0.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"

diff --git a/crates/samples/enum_windows_sys/Cargo.toml b/crates/samples/enum_windows_sys/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "sample_enum_windows_sys"
 version = "0.0.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows-sys]
 path = "../../libs/sys"

diff --git a/crates/samples/kernel_event/Cargo.toml b/crates/samples/kernel_event/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "sample_kernel_event"
 version = "0.0.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"

diff --git a/crates/samples/memory_buffer/Cargo.toml b/crates/samples/memory_buffer/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "sample_memory_buffer"
 version = "0.0.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"

diff --git a/crates/samples/message_box/Cargo.toml b/crates/samples/message_box/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "sample_message_box"
 version = "0.0.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"

diff --git a/crates/samples/ocr/Cargo.toml b/crates/samples/ocr/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "sample_ocr"
 version = "0.0.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 futures = "0.3.5"

diff --git a/crates/samples/overlapped/Cargo.toml b/crates/samples/overlapped/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "sample_overlapped"
 version = "0.0.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"

diff --git a/crates/samples/rss/Cargo.toml b/crates/samples/rss/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "sample_rss"
 version = "0.0.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"

diff --git a/crates/samples/simple/Cargo.toml b/crates/samples/simple/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "sample_simple"
 version = "0.0.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"

diff --git a/crates/samples/spellchecker/Cargo.toml b/crates/samples/spellchecker/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "sample_spellchecker"
 version = "0.0.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"

diff --git a/crates/samples/uiautomation/Cargo.toml b/crates/samples/uiautomation/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "sample_uiautomation"
 version = "0.0.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"

diff --git a/crates/samples/xaml_app/Cargo.toml b/crates/samples/xaml_app/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "sample_xaml_app"
 version = "0.0.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"

diff --git a/crates/samples/xml/Cargo.toml b/crates/samples/xml/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "sample_xml"
 version = "0.0.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"

diff --git a/crates/targets/aarch64_msvc/Cargo.toml b/crates/targets/aarch64_msvc/Cargo.toml
@@ -2,7 +2,7 @@
 name = "windows_aarch64_msvc"
 version = "0.34.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 license = "MIT OR Apache-2.0"
 description = "Code gen support for the windows crate"
 repository = "https://github.com/microsoft/windows-rs"

diff --git a/crates/targets/i686_gnu/Cargo.toml b/crates/targets/i686_gnu/Cargo.toml
@@ -2,7 +2,7 @@
 name = "windows_i686_gnu"
 version = "0.34.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 license = "MIT OR Apache-2.0"
 description = "Code gen support for the windows crate"
 repository = "https://github.com/microsoft/windows-rs"

diff --git a/crates/targets/i686_msvc/Cargo.toml b/crates/targets/i686_msvc/Cargo.toml
@@ -2,7 +2,7 @@
 name = "windows_i686_msvc"
 version = "0.34.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 license = "MIT OR Apache-2.0"
 description = "Code gen support for the windows crate"
 repository = "https://github.com/microsoft/windows-rs"

diff --git a/crates/targets/x86_64_gnu/Cargo.toml b/crates/targets/x86_64_gnu/Cargo.toml
@@ -2,7 +2,7 @@
 name = "windows_x86_64_gnu"
 version = "0.34.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 license = "MIT OR Apache-2.0"
 description = "Code gen support for the windows crate"
 repository = "https://github.com/microsoft/windows-rs"

diff --git a/crates/targets/x86_64_msvc/Cargo.toml b/crates/targets/x86_64_msvc/Cargo.toml
@@ -2,7 +2,7 @@
 name = "windows_x86_64_msvc"
 version = "0.34.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 license = "MIT OR Apache-2.0"
 description = "Code gen support for the windows crate"
 repository = "https://github.com/microsoft/windows-rs"

diff --git a/crates/tests/agile/Cargo.toml b/crates/tests/agile/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_agile"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"

diff --git a/crates/tests/agile_reference/Cargo.toml b/crates/tests/agile_reference/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_agile_reference"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"

diff --git a/crates/tests/alternate_success_code/Cargo.toml b/crates/tests/alternate_success_code/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_alternate_success_code"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"

diff --git a/crates/tests/arch/Cargo.toml b/crates/tests/arch/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_arch"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"

diff --git a/crates/tests/arch_feature/Cargo.toml b/crates/tests/arch_feature/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_arch_feature"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"