Support lower MSRV for the windows crate (#2318)

.github/workflows/clippy.yml

@@ -32,105 +32,106 @@ jobs:
             >> $env:GITHUB_ENV
       - name: Run cargo clippy
         run: |
-          cargo clippy -p sample_bits &&
-          cargo clippy -p sample_com_uri &&
-          cargo clippy -p sample_consent &&
-          cargo clippy -p sample_core_app &&
-          cargo clippy -p sample_counter &&
-          cargo clippy -p sample_counter_sys &&
-          cargo clippy -p sample_create_window &&
-          cargo clippy -p sample_create_window_sys &&
-          cargo clippy -p sample_data_protection &&
-          cargo clippy -p sample_dcomp &&
-          cargo clippy -p sample_device_watcher &&
-          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_message_box_sys &&
-          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_thread_pool_work &&
-          cargo clippy -p sample_thread_pool_work_sys &&
-          cargo clippy -p sample_uiautomation &&
-          cargo clippy -p sample_wmi &&
-          cargo clippy -p sample_xml &&
-          cargo clippy -p test_agile &&
-          cargo clippy -p test_agile_reference &&
-          cargo clippy -p test_alternate_success_code &&
-          cargo clippy -p test_arch &&
-          cargo clippy -p test_arch_feature &&
-          cargo clippy -p test_bcrypt &&
-          cargo clippy -p test_bstr &&
-          cargo clippy -p test_calling_convention &&
-          cargo clippy -p test_cfg_generic &&
-          cargo clippy -p test_component &&
-          cargo clippy -p test_component_client &&
-          cargo clippy -p test_const_fields &&
-          cargo clippy -p test_const_ptrs &&
-          cargo clippy -p test_core &&
-          cargo clippy -p test_debug &&
-          cargo clippy -p test_debugger_visualizer_x &&
-          cargo clippy -p test_deprecated &&
-          cargo clippy -p test_dispatch &&
-          cargo clippy -p test_does_not_return &&
-          cargo clippy -p test_enums &&
-          cargo clippy -p test_error &&
-          cargo clippy -p test_event &&
-          cargo clippy -p test_extensions &&
-          cargo clippy -p test_handles &&
-          cargo clippy -p test_helpers &&
-          cargo clippy -p test_implement &&
-          cargo clippy -p test_interface &&
-          cargo clippy -p test_interop &&
-          cargo clippy -p test_lib &&
-          cargo clippy -p test_literals &&
-          cargo clippy -p test_match &&
-          cargo clippy -p test_matrix3x2 &&
-          cargo clippy -p test_metadata &&
-          cargo clippy -p test_no_use &&
-          cargo clippy -p test_not_dll &&
-          cargo clippy -p test_query_signature &&
-          cargo clippy -p test_readme &&
-          cargo clippy -p test_reserved &&
-          cargo clippy -p test_resources &&
-          cargo clippy -p test_return_struct &&
-          cargo clippy -p test_simple_component &&
-          cargo clippy -p test_string_param &&
-          cargo clippy -p test_structs &&
-          cargo clippy -p test_sys &&
-          cargo clippy -p test_unions &&
-          cargo clippy -p test_weak &&
-          cargo clippy -p test_weak_ref &&
-          cargo clippy -p test_win32 &&
-          cargo clippy -p test_win32_arrays &&
-          cargo clippy -p test_window_long &&
-          cargo clippy -p test_winrt &&
-          cargo clippy -p tool_gnu &&
-          cargo clippy -p tool_lib &&
-          cargo clippy -p tool_license &&
-          cargo clippy -p tool_msvc &&
-          cargo clippy -p tool_sys &&
-          cargo clippy -p tool_windows &&
-          cargo clippy -p tool_yml &&
-          cargo clippy -p windows &&
-          cargo clippy -p windows-bindgen &&
-          cargo clippy -p windows-implement &&
-          cargo clippy -p windows-interface &&
-          cargo clippy -p windows-metadata &&
-          cargo clippy -p windows-sys &&
-          cargo clippy -p windows-targets &&
-          cargo clippy -p windows-tokens &&
-          cargo clippy -p windows_aarch64_gnullvm &&
-          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_gnullvm &&
-          cargo clippy -p windows_x86_64_msvc
+          cargo clippy -p sample_bits -- -A clippy::uninlined_format_args &&
+          cargo clippy -p sample_com_uri -- -A clippy::uninlined_format_args &&
+          cargo clippy -p sample_consent -- -A clippy::uninlined_format_args &&
+          cargo clippy -p sample_core_app -- -A clippy::uninlined_format_args &&
+          cargo clippy -p sample_counter -- -A clippy::uninlined_format_args &&
+          cargo clippy -p sample_counter_sys -- -A clippy::uninlined_format_args &&
+          cargo clippy -p sample_create_window -- -A clippy::uninlined_format_args &&
+          cargo clippy -p sample_create_window_sys -- -A clippy::uninlined_format_args &&
+          cargo clippy -p sample_data_protection -- -A clippy::uninlined_format_args &&
+          cargo clippy -p sample_dcomp -- -A clippy::uninlined_format_args &&
+          cargo clippy -p sample_device_watcher -- -A clippy::uninlined_format_args &&
+          cargo clippy -p sample_direct2d -- -A clippy::uninlined_format_args &&
+          cargo clippy -p sample_direct3d12 -- -A clippy::uninlined_format_args &&
+          cargo clippy -p sample_enum_windows -- -A clippy::uninlined_format_args &&
+          cargo clippy -p sample_enum_windows_sys -- -A clippy::uninlined_format_args &&
+          cargo clippy -p sample_kernel_event -- -A clippy::uninlined_format_args &&
+          cargo clippy -p sample_memory_buffer -- -A clippy::uninlined_format_args &&
+          cargo clippy -p sample_message_box -- -A clippy::uninlined_format_args &&
+          cargo clippy -p sample_message_box_sys -- -A clippy::uninlined_format_args &&
+          cargo clippy -p sample_ocr -- -A clippy::uninlined_format_args &&
+          cargo clippy -p sample_overlapped -- -A clippy::uninlined_format_args &&
+          cargo clippy -p sample_rss -- -A clippy::uninlined_format_args &&
+          cargo clippy -p sample_simple -- -A clippy::uninlined_format_args &&
+          cargo clippy -p sample_spellchecker -- -A clippy::uninlined_format_args &&
+          cargo clippy -p sample_thread_pool_work -- -A clippy::uninlined_format_args &&
+          cargo clippy -p sample_thread_pool_work_sys -- -A clippy::uninlined_format_args &&
+          cargo clippy -p sample_uiautomation -- -A clippy::uninlined_format_args &&
+          cargo clippy -p sample_wmi -- -A clippy::uninlined_format_args &&
+          cargo clippy -p sample_xml -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_agile -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_agile_reference -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_alternate_success_code -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_arch -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_arch_feature -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_bcrypt -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_bstr -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_calling_convention -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_cfg_generic -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_component -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_component_client -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_const_fields -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_const_ptrs -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_core -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_debug -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_debugger_visualizer_x -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_deprecated -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_dispatch -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_does_not_return -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_enums -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_error -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_event -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_extensions -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_handles -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_helpers -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_implement -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_interface -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_interop -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_lib -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_literals -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_match -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_matrix3x2 -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_metadata -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_msrv -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_no_use -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_not_dll -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_query_signature -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_readme -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_reserved -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_resources -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_return_struct -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_simple_component -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_string_param -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_structs -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_sys -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_unions -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_weak -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_weak_ref -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_win32 -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_win32_arrays -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_window_long -- -A clippy::uninlined_format_args &&
+          cargo clippy -p test_winrt -- -A clippy::uninlined_format_args &&
+          cargo clippy -p tool_gnu -- -A clippy::uninlined_format_args &&
+          cargo clippy -p tool_lib -- -A clippy::uninlined_format_args &&
+          cargo clippy -p tool_license -- -A clippy::uninlined_format_args &&
+          cargo clippy -p tool_msvc -- -A clippy::uninlined_format_args &&
+          cargo clippy -p tool_sys -- -A clippy::uninlined_format_args &&
+          cargo clippy -p tool_windows -- -A clippy::uninlined_format_args &&
+          cargo clippy -p tool_yml -- -A clippy::uninlined_format_args &&
+          cargo clippy -p windows -- -A clippy::uninlined_format_args &&
+          cargo clippy -p windows-bindgen -- -A clippy::uninlined_format_args &&
+          cargo clippy -p windows-implement -- -A clippy::uninlined_format_args &&
+          cargo clippy -p windows-interface -- -A clippy::uninlined_format_args &&
+          cargo clippy -p windows-metadata -- -A clippy::uninlined_format_args &&
+          cargo clippy -p windows-sys -- -A clippy::uninlined_format_args &&
+          cargo clippy -p windows-targets -- -A clippy::uninlined_format_args &&
+          cargo clippy -p windows-tokens -- -A clippy::uninlined_format_args &&
+          cargo clippy -p windows_aarch64_gnullvm -- -A clippy::uninlined_format_args &&
+          cargo clippy -p windows_aarch64_msvc -- -A clippy::uninlined_format_args &&
+          cargo clippy -p windows_i686_gnu -- -A clippy::uninlined_format_args &&
+          cargo clippy -p windows_i686_msvc -- -A clippy::uninlined_format_args &&
+          cargo clippy -p windows_x86_64_gnu -- -A clippy::uninlined_format_args &&
+          cargo clippy -p windows_x86_64_gnullvm -- -A clippy::uninlined_format_args &&
+          cargo clippy -p windows_x86_64_msvc -- -A clippy::uninlined_format_args

.github/workflows/test.yml

@@ -132,8 +132,8 @@ jobs:
           cargo test --target ${{ matrix.target }} -p test_enums &&
           cargo test --target ${{ matrix.target }} -p test_error &&
           cargo test --target ${{ matrix.target }} -p test_event &&
-          cargo clean &&
           cargo test --target ${{ matrix.target }} -p test_extensions &&
+          cargo clean &&
           cargo test --target ${{ matrix.target }} -p test_handles &&
           cargo test --target ${{ matrix.target }} -p test_helpers &&
           cargo test --target ${{ matrix.target }} -p test_implement &&
@@ -144,6 +144,7 @@ jobs:
           cargo test --target ${{ matrix.target }} -p test_match &&
           cargo test --target ${{ matrix.target }} -p test_matrix3x2 &&
           cargo test --target ${{ matrix.target }} -p test_metadata &&
+          cargo test --target ${{ matrix.target }} -p test_msrv &&
           cargo test --target ${{ matrix.target }} -p test_no_use &&
           cargo test --target ${{ matrix.target }} -p test_not_dll &&
           cargo test --target ${{ matrix.target }} -p test_query_signature &&

.github/workflows/windows.yml

@@ -14,7 +14,7 @@ jobs:
     name: Check
     strategy:
       matrix:
-        rust: [1.64.0, stable, nightly]
+        rust: [1.48.0, stable, nightly]
         runs-on:
           - windows-2019
           - ubuntu-latest
@@ -25,4 +25,4 @@ jobs:
       - name: Update toolchain
         run: rustup update --no-self-update ${{ matrix.rust }} && rustup default ${{ matrix.rust }}
       - name: Run cargo check
-        run: cargo check -p windows --features Foundation,Win32_Foundation,Win32_Graphics_Direct2D
+        run: cargo check -p test_msrv

crates/libs/bindgen/src/functions.rs

@@ -198,7 +198,7 @@ fn gen_win_function(gen: &Gen, def: MethodDef) -> TokenStream {
                     pub unsafe fn #name<#generics>(#params) -> ::windows::core::Result<#return_type> #where_clause {
                         #link
                         let result__ = #name(#args);
-                        (!result__.is_invalid()).then(||result__).ok_or_else(::windows::core::Error::from_win32)
+                        ::windows::core::then(!result__.is_invalid(), ||result__).ok_or_else(::windows::core::Error::from_win32)
                     }
                 }
             } else {

crates/libs/bindgen/src/winrt_methods.rs

@@ -30,7 +30,7 @@ pub fn gen(gen: &Gen, def: TypeDef, generic_types: &[Type], kind: InterfaceKind,
     let return_arg = if let Some(return_type) = &signature.return_type {
         if return_type.is_winrt_array() {
             let return_type = gen.type_name(return_type);
-            quote! { ::windows::core::Array::<#return_type>::set_abi_len(result__.assume_init_mut()), result__.as_mut_ptr() as *mut _ as _ }
+            quote! { ::windows::core::Array::<#return_type>::set_abi_len(::std::mem::transmute(&mut result__)), result__.as_mut_ptr() as *mut _ as _ }
         } else {
             quote! { result__.as_mut_ptr() }
         }

crates/libs/implement/src/lib.rs

@@ -287,7 +287,7 @@ impl UseTree2 {
                 let mut type_name = input.ident.to_string();
 
                 if !namespace.is_empty() {
-                    type_name = format!("{namespace}::{type_name}");
+                    type_name = format!("{}::{}", namespace, type_name);
                 }
 
                 let mut generics = vec![];

crates/libs/interface/src/lib.rs

@@ -280,7 +280,7 @@ impl Interface {
     /// Generates various conversions such as from and to `IUnknown`
     fn gen_conversions(&self) -> proc_macro2::TokenStream {
         let name = &self.name;
-        let name_string = format!("{name}");
+        let name_string = format!("{}", name);
         quote! {
             impl ::core::convert::From<#name> for ::windows::core::IUnknown {
                 fn from(value: #name) -> Self {
@@ -401,17 +401,17 @@ struct Guid(Option<syn::LitStr>);
 impl Guid {
     fn to_tokens(&self) -> syn::Result<proc_macro2::TokenStream> {
         fn hex_lit(num: &str) -> syn::LitInt {
-            syn::LitInt::new(&format!("0x{num}"), proc_macro2::Span::call_site())
+            syn::LitInt::new(&format!("0x{}", num), proc_macro2::Span::call_site())
         }
 
         fn ensure_length(part: Option<&str>, index: usize, length: usize, span: proc_macro2::Span) -> syn::Result<String> {
             let part = match part {
                 Some(p) => p,
-                None => return Err(syn::Error::new(span, format!("The IID missing part at index {index}",))),
+                None => return Err(syn::Error::new(span, format!("The IID missing part at index {}", index))),
             };
 
             if part.len() != length {
-                return Err(syn::Error::new(span, format!("The IID part at index {index} must be {length} characters long but was {} characters", part.len())));
+                return Err(syn::Error::new(span, format!("The IID part at index {} must be {} characters long but was {} characters", index, length, part.len())));
             }
 
             Ok(part.to_owned())

crates/libs/sys/Cargo.toml

@@ -8,7 +8,6 @@ license = "MIT OR Apache-2.0"
 description = "Rust for Windows"
 repository = "https://github.com/microsoft/windows-rs"
 readme = "../../../docs/readme.md"
-rust-version = "1.48"
 
 [package.metadata.docs.rs]
 default-target = "x86_64-pc-windows-msvc"

crates/libs/windows/Cargo.toml

@@ -9,7 +9,6 @@ description = "Rust for Windows"
 repository = "https://github.com/microsoft/windows-rs"
 documentation = "https://microsoft.github.io/windows-docs-rs/"
 readme = "../../../docs/readme.md"
-rust-version = "1.64"
 
 [package.metadata.docs.rs]
 default-target = "x86_64-pc-windows-msvc"

crates/libs/windows/src/Windows/ApplicationModel/mod.rs

@@ -1626,7 +1626,7 @@ impl AppInfo {
         let this = &::windows::core::Interface::cast::<IAppInfo4>(self)?;
         unsafe {
             let mut result__ = ::core::mem::MaybeUninit::zeroed();
-            (::windows::core::Vtable::vtable(this).SupportedFileExtensions)(::windows::core::Vtable::as_raw(this), ::windows::core::Array::<::windows::core::HSTRING>::set_abi_len(result__.assume_init_mut()), result__.as_mut_ptr() as *mut _ as _).and_then(|| result__.assume_init())
+            (::windows::core::Vtable::vtable(this).SupportedFileExtensions)(::windows::core::Vtable::as_raw(this), ::windows::core::Array::<::windows::core::HSTRING>::set_abi_len(::std::mem::transmute(&mut result__)), result__.as_mut_ptr() as *mut _ as _).and_then(|| result__.assume_init())
         }
     }
     pub fn Current() -> ::windows::core::Result<AppInfo> {

crates/libs/windows/src/Windows/Devices/Display/mod.rs

@@ -248,7 +248,7 @@ impl DisplayMonitor {
         let this = self;
         unsafe {
             let mut result__ = ::core::mem::MaybeUninit::zeroed();
-            (::windows::core::Vtable::vtable(this).GetDescriptor)(::windows::core::Vtable::as_raw(this), descriptorkind, ::windows::core::Array::<u8>::set_abi_len(result__.assume_init_mut()), result__.as_mut_ptr() as *mut _ as _).and_then(|| result__.assume_init())
+            (::windows::core::Vtable::vtable(this).GetDescriptor)(::windows::core::Vtable::as_raw(this), descriptorkind, ::windows::core::Array::<u8>::set_abi_len(::std::mem::transmute(&mut result__)), result__.as_mut_ptr() as *mut _ as _).and_then(|| result__.assume_init())
         }
     }
     pub fn IsDolbyVisionSupportedInHdrMode(&self) -> ::windows::core::Result<bool> {