diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9be8e7f3c9..aecbbceda5 100644
--- 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
index 7d22562a1b..3eea4d7ee8 100644
--- 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
index f475a99ea5..274c06b6eb 100644
--- 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
index 1baa4f871c..bdb2239b8c 100644
--- 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
index d058445454..d6bdd49968 100644
--- 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
index 09711e35f7..2eb5d72579 100644
--- 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
index c4dcff9d09..5641bb5156 100644
--- 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
index 3463bebddc..ea343e93ad 100644
--- 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
index 29e8caaabb..fbed887a49 100644
--- 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
index 7aa8553280..355338e47a 100644
--- 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
index 11e98a9613..9fad9de8e3 100644
--- 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
index 9efd14303d..098357560c 100644
--- 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
index e54574a2b8..ca89a6b4e3 100644
--- 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
index 0bb1fb3262..668c2660b9 100644
--- 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
index 40acfa6ca0..3ca497ada2 100644
--- 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
index 1d35d0b8d1..f38509fd55 100644
--- 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
index e100f4efc6..408005cd03 100644
--- 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
index e1340667ab..adcd2a3107 100644
--- 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
index 386cc79fa0..6c1600eaf1 100644
--- 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
index 794f0c84cd..2207889875 100644
--- 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
index a4a97625ec..747e55945d 100644
--- 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
index 88f319eda2..257ce26e16 100644
--- 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
index 799f42b72a..2ec0e4f0ce 100644
--- 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
index efea3b0343..745fec3403 100644
--- 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
index e7a99ecc91..c8ea8717bc 100644
--- 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
index 619be727f3..426ed71300 100644
--- 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
index b0ead27883..f41c646def 100644
--- 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
index 56b15c0017..e46cfe35b6 100644
--- 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
index 07ad604369..1c0b055694 100644
--- 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
index 035eff6043..d92aa6c4dc 100644
--- 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
index 306f4f88c5..9452789d14 100644
--- 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
index 3374781858..7401bda77a 100644
--- 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
index 977a06c06f..ba8d684226 100644
--- 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
index 2bcb5b55f8..7364e02a28 100644
--- 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
index e279eef00a..404c07e134 100644
--- 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
index b4b20525fa..3877b7b2e4 100644
--- 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
index cbed3efda8..f2833ea1c9 100644
--- 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
index a97c34b283..d59a4eccc3 100644
--- 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
index f1b2a8116c..8e675b577d 100644
--- 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
index 2b1d58361d..60deb6de40 100644
--- 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"
diff --git a/crates/tests/bstr/Cargo.toml b/crates/tests/bstr/Cargo.toml
index d0d7b6d459..a86fb6ac5e 100644
--- a/crates/tests/bstr/Cargo.toml
+++ b/crates/tests/bstr/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_bstr"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"
diff --git a/crates/tests/const_fields/Cargo.toml b/crates/tests/const_fields/Cargo.toml
index 024a3894d4..4f58a000f4 100644
--- a/crates/tests/const_fields/Cargo.toml
+++ b/crates/tests/const_fields/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_const_fields"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"
diff --git a/crates/tests/core/Cargo.toml b/crates/tests/core/Cargo.toml
index 9a783d6a56..df010c6abf 100644
--- a/crates/tests/core/Cargo.toml
+++ b/crates/tests/core/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_core"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 windows = { path = "../../libs/windows" }
diff --git a/crates/tests/debug/Cargo.toml b/crates/tests/debug/Cargo.toml
index 098da4efa4..8a89d3db9f 100644
--- a/crates/tests/debug/Cargo.toml
+++ b/crates/tests/debug/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_debug"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"
diff --git a/crates/tests/deprecated/Cargo.toml b/crates/tests/deprecated/Cargo.toml
index b0c7170417..5490d52697 100644
--- a/crates/tests/deprecated/Cargo.toml
+++ b/crates/tests/deprecated/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_deprecated"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"
diff --git a/crates/tests/does_not_return/Cargo.toml b/crates/tests/does_not_return/Cargo.toml
index 6b2dbeb2c0..901b3d52ed 100644
--- a/crates/tests/does_not_return/Cargo.toml
+++ b/crates/tests/does_not_return/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_does_not_return"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"
diff --git a/crates/tests/enums/Cargo.toml b/crates/tests/enums/Cargo.toml
index 462632d3ff..848c649611 100644
--- a/crates/tests/enums/Cargo.toml
+++ b/crates/tests/enums/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_enums"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"
diff --git a/crates/tests/error/Cargo.toml b/crates/tests/error/Cargo.toml
index adcdcf4ea4..de7aabb774 100644
--- a/crates/tests/error/Cargo.toml
+++ b/crates/tests/error/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_error"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"
diff --git a/crates/tests/handles/Cargo.toml b/crates/tests/handles/Cargo.toml
index 2cd0168a69..2bcfe80e11 100644
--- a/crates/tests/handles/Cargo.toml
+++ b/crates/tests/handles/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_handles"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"
diff --git a/crates/tests/helpers/Cargo.toml b/crates/tests/helpers/Cargo.toml
index 2db293d3b4..8c045c973c 100644
--- a/crates/tests/helpers/Cargo.toml
+++ b/crates/tests/helpers/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "test_helpers"
 version = "0.0.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies.windows]
diff --git a/crates/tests/interop/Cargo.toml b/crates/tests/interop/Cargo.toml
index 1a2ea3faaa..0d753ad8fe 100644
--- a/crates/tests/interop/Cargo.toml
+++ b/crates/tests/interop/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_interop"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"
diff --git a/crates/tests/lib/Cargo.toml b/crates/tests/lib/Cargo.toml
index 7619246cd6..7e5fb92771 100644
--- a/crates/tests/lib/Cargo.toml
+++ b/crates/tests/lib/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_lib"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"
diff --git a/crates/tests/matrix3x2/Cargo.toml b/crates/tests/matrix3x2/Cargo.toml
index 5107af84e6..ea5ad9183d 100644
--- a/crates/tests/matrix3x2/Cargo.toml
+++ b/crates/tests/matrix3x2/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_matrix3x2"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"
diff --git a/crates/tests/mshtml/Cargo.toml b/crates/tests/mshtml/Cargo.toml
index 1304339e47..8d32e93a65 100644
--- a/crates/tests/mshtml/Cargo.toml
+++ b/crates/tests/mshtml/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_mshtml"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"
diff --git a/crates/tests/nightly_class_factory/Cargo.toml b/crates/tests/nightly_class_factory/Cargo.toml
index f1bc06b8e2..e30237e293 100644
--- a/crates/tests/nightly_class_factory/Cargo.toml
+++ b/crates/tests/nightly_class_factory/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_nightly_class_factory"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"
diff --git a/crates/tests/nightly_data_object/Cargo.toml b/crates/tests/nightly_data_object/Cargo.toml
index 5f141d8265..a456ef0de3 100644
--- a/crates/tests/nightly_data_object/Cargo.toml
+++ b/crates/tests/nightly_data_object/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_nightly_data_object"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"
diff --git a/crates/tests/nightly_drop_target/Cargo.toml b/crates/tests/nightly_drop_target/Cargo.toml
index 0180699ed2..5298a9bb7c 100644
--- a/crates/tests/nightly_drop_target/Cargo.toml
+++ b/crates/tests/nightly_drop_target/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_nightly_drop_target"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"
diff --git a/crates/tests/nightly_identity/Cargo.toml b/crates/tests/nightly_identity/Cargo.toml
index d5918c9c95..1b57c858c9 100644
--- a/crates/tests/nightly_identity/Cargo.toml
+++ b/crates/tests/nightly_identity/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_nightly_identity"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"
diff --git a/crates/tests/nightly_implement/Cargo.toml b/crates/tests/nightly_implement/Cargo.toml
index 97bc1ccb27..9ee41efdcd 100644
--- a/crates/tests/nightly_implement/Cargo.toml
+++ b/crates/tests/nightly_implement/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_nightly_implement"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"
diff --git a/crates/tests/nightly_interface/Cargo.toml b/crates/tests/nightly_interface/Cargo.toml
index 12077eecbc..dd18b30493 100644
--- a/crates/tests/nightly_interface/Cargo.toml
+++ b/crates/tests/nightly_interface/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_nightly_interface"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"
diff --git a/crates/tests/nightly_map/Cargo.toml b/crates/tests/nightly_map/Cargo.toml
index df712b1b79..e6cfe06b24 100644
--- a/crates/tests/nightly_map/Cargo.toml
+++ b/crates/tests/nightly_map/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_nightly_map"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"
diff --git a/crates/tests/nightly_no_use/Cargo.toml b/crates/tests/nightly_no_use/Cargo.toml
index b664c4dfad..ff04ce9284 100644
--- a/crates/tests/nightly_no_use/Cargo.toml
+++ b/crates/tests/nightly_no_use/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_nightly_no_use"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"
diff --git a/crates/tests/nightly_null_result/Cargo.toml b/crates/tests/nightly_null_result/Cargo.toml
index 4c1c4b47a7..bbb8f15fb6 100644
--- a/crates/tests/nightly_null_result/Cargo.toml
+++ b/crates/tests/nightly_null_result/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_nightly_null_result"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"
diff --git a/crates/tests/nightly_properties/Cargo.toml b/crates/tests/nightly_properties/Cargo.toml
index 2c10f08f9d..5241f7bc87 100644
--- a/crates/tests/nightly_properties/Cargo.toml
+++ b/crates/tests/nightly_properties/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_nightly_properties"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"
diff --git a/crates/tests/nightly_vector/Cargo.toml b/crates/tests/nightly_vector/Cargo.toml
index ee55e05656..a2d2bd35f4 100644
--- a/crates/tests/nightly_vector/Cargo.toml
+++ b/crates/tests/nightly_vector/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_nightly_vector"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"
diff --git a/crates/tests/nightly_winrt/Cargo.toml b/crates/tests/nightly_winrt/Cargo.toml
index be5c5caed4..b35ca2e0b3 100644
--- a/crates/tests/nightly_winrt/Cargo.toml
+++ b/crates/tests/nightly_winrt/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_nightly_winrt"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"
diff --git a/crates/tests/not_dll/Cargo.toml b/crates/tests/not_dll/Cargo.toml
index ff293550df..658a284416 100644
--- a/crates/tests/not_dll/Cargo.toml
+++ b/crates/tests/not_dll/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_not_dll"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"
diff --git a/crates/tests/ntstatus/Cargo.toml b/crates/tests/ntstatus/Cargo.toml
index b2432f8477..ec87f4d3d0 100644
--- a/crates/tests/ntstatus/Cargo.toml
+++ b/crates/tests/ntstatus/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_ntstatus"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"
diff --git a/crates/tests/pwstr/Cargo.toml b/crates/tests/pwstr/Cargo.toml
index b48a47f4e7..8ac9fbe768 100644
--- a/crates/tests/pwstr/Cargo.toml
+++ b/crates/tests/pwstr/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_pwstr"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"
diff --git a/crates/tests/return_struct/Cargo.toml b/crates/tests/return_struct/Cargo.toml
index d4c28a1479..2c47d15599 100644
--- a/crates/tests/return_struct/Cargo.toml
+++ b/crates/tests/return_struct/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_return_struct"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"
diff --git a/crates/tests/structs/Cargo.toml b/crates/tests/structs/Cargo.toml
index b9cbe912a2..3f9db0ef7d 100644
--- a/crates/tests/structs/Cargo.toml
+++ b/crates/tests/structs/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_structs"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"
diff --git a/crates/tests/sys/Cargo.toml b/crates/tests/sys/Cargo.toml
index 992fce054d..27a913a8f5 100644
--- a/crates/tests/sys/Cargo.toml
+++ b/crates/tests/sys/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_sys"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows-sys]
 path = "../../libs/sys"
diff --git a/crates/tests/unions/Cargo.toml b/crates/tests/unions/Cargo.toml
index 15b72ab40d..0801181dfb 100644
--- a/crates/tests/unions/Cargo.toml
+++ b/crates/tests/unions/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_unions"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"
diff --git a/crates/tests/weak/Cargo.toml b/crates/tests/weak/Cargo.toml
index 4135dba1c1..2258b7f77d 100644
--- a/crates/tests/weak/Cargo.toml
+++ b/crates/tests/weak/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_weak"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"
diff --git a/crates/tests/weak_ref/Cargo.toml b/crates/tests/weak_ref/Cargo.toml
index 87d0cf8f0b..202072133e 100644
--- a/crates/tests/weak_ref/Cargo.toml
+++ b/crates/tests/weak_ref/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_weak_ref"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"
diff --git a/crates/tests/win32/Cargo.toml b/crates/tests/win32/Cargo.toml
index 00762e0c07..4ffc2a86b3 100644
--- a/crates/tests/win32/Cargo.toml
+++ b/crates/tests/win32/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_win32"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"
diff --git a/crates/tests/win32_arrays/Cargo.toml b/crates/tests/win32_arrays/Cargo.toml
index 202c3248b5..7b30d1b5c9 100644
--- a/crates/tests/win32_arrays/Cargo.toml
+++ b/crates/tests/win32_arrays/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_win32_arrays"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows]
 path = "../../libs/windows"
diff --git a/crates/tests/writer/Cargo.toml b/crates/tests/writer/Cargo.toml
index 06eff24f3b..920a0e9445 100644
--- a/crates/tests/writer/Cargo.toml
+++ b/crates/tests/writer/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test_writer"
 version = "0.0.0"
 authors = ["Microsoft"]
-edition = "2018"
+edition = "2021"
 
 [dependencies.windows-metadata]
 path = "../../libs/metadata"
diff --git a/crates/tools/bindings/Cargo.toml b/crates/tools/bindings/Cargo.toml
index a09c540c50..83a8a7230a 100644
--- a/crates/tools/bindings/Cargo.toml
+++ b/crates/tools/bindings/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "tool_bindings"
 version = "0.0.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/crates/tools/gnu/Cargo.toml b/crates/tools/gnu/Cargo.toml
index c3fa57517a..1f13370534 100644
--- a/crates/tools/gnu/Cargo.toml
+++ b/crates/tools/gnu/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "tool_gnu"
 version = "0.0.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/crates/tools/ilrs/Cargo.toml b/crates/tools/ilrs/Cargo.toml
index 38f1ce6cfa..3793c924ed 100644
--- a/crates/tools/ilrs/Cargo.toml
+++ b/crates/tools/ilrs/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "tool_ilrs"
 version = "0.0.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/crates/tools/msvc/Cargo.toml b/crates/tools/msvc/Cargo.toml
index e11db2a405..6a96ce5c60 100644
--- a/crates/tools/msvc/Cargo.toml
+++ b/crates/tools/msvc/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "tool_msvc"
 version = "0.0.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/crates/tools/sys/Cargo.toml b/crates/tools/sys/Cargo.toml
index 5f3be74032..9960ea7649 100644
--- a/crates/tools/sys/Cargo.toml
+++ b/crates/tools/sys/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "tool_sys"
 version = "0.0.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/crates/tools/sys/src/main.rs b/crates/tools/sys/src/main.rs
index 921ab7c77d..a923a43ad4 100644
--- a/crates/tools/sys/src/main.rs
+++ b/crates/tools/sys/src/main.rs
@@ -27,11 +27,12 @@ fn main() {
 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/tools/windows/Cargo.toml b/crates/tools/windows/Cargo.toml
index b32847b1df..b89531b4cb 100644
--- a/crates/tools/windows/Cargo.toml
+++ b/crates/tools/windows/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "tool_windows"
 version = "0.0.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/crates/tools/windows/src/main.rs b/crates/tools/windows/src/main.rs
index d7726a2738..5286a835fc 100644
--- a/crates/tools/windows/src/main.rs
+++ b/crates/tools/windows/src/main.rs
@@ -27,12 +27,13 @@ fn main() {
 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/tools/yml/Cargo.toml b/crates/tools/yml/Cargo.toml
index 57e5fd45a2..1b491b7d46 100644
--- a/crates/tools/yml/Cargo.toml
+++ b/crates/tools/yml/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "tool_yml"
 version = "0.0.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/crates/tools/yml/src/main.rs b/crates/tools/yml/src/main.rs
index 213b887721..b4f818a592 100644
--- a/crates/tools/yml/src/main.rs
+++ b/crates/tools/yml/src/main.rs
@@ -176,7 +176,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
@@ -185,6 +185,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