From 2d750e8e01180ef03e566ef12cdf4513b52d4ae1 Mon Sep 17 00:00:00 2001 From: Kenny Kerr Date: Wed, 28 Feb 2024 10:08:40 -0600 Subject: [PATCH 1/3] 0.52.4 --- crates/libs/targets/Cargo.toml | 4 ++-- crates/targets/aarch64_gnullvm/Cargo.toml | 4 ++-- crates/targets/aarch64_msvc/Cargo.toml | 4 ++-- crates/targets/i686_gnu/Cargo.toml | 4 ++-- crates/targets/i686_msvc/Cargo.toml | 4 ++-- crates/targets/x86_64_gnu/Cargo.toml | 4 ++-- crates/targets/x86_64_gnullvm/Cargo.toml | 4 ++-- crates/targets/x86_64_msvc/Cargo.toml | 4 ++-- crates/tests/targets/tests/files.rs | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/crates/libs/targets/Cargo.toml b/crates/libs/targets/Cargo.toml index 7b70bba86d..781ae4b5d1 100644 --- a/crates/libs/targets/Cargo.toml +++ b/crates/libs/targets/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "windows-targets" -version = "0.52.3" +version = "0.52.4" authors = ["Microsoft"] edition = "2021" -rust-version = "1.60" +rust-version = "1.56" license = "MIT OR Apache-2.0" description = "Import libs for Windows" repository = "https://github.com/microsoft/windows-rs" diff --git a/crates/targets/aarch64_gnullvm/Cargo.toml b/crates/targets/aarch64_gnullvm/Cargo.toml index 6df824f1ea..fd08629a5b 100644 --- a/crates/targets/aarch64_gnullvm/Cargo.toml +++ b/crates/targets/aarch64_gnullvm/Cargo.toml @@ -1,9 +1,9 @@ [package] name = "windows_aarch64_gnullvm" -version = "0.52.3" +version = "0.52.4" authors = ["Microsoft"] edition = "2021" -rust-version = "1.60" +rust-version = "1.56" license = "MIT OR Apache-2.0" description = "Import lib for Windows" repository = "https://github.com/microsoft/windows-rs" diff --git a/crates/targets/aarch64_msvc/Cargo.toml b/crates/targets/aarch64_msvc/Cargo.toml index 10eeabbd1d..0c24fc79f7 100644 --- a/crates/targets/aarch64_msvc/Cargo.toml +++ b/crates/targets/aarch64_msvc/Cargo.toml @@ -1,9 +1,9 @@ [package] name = "windows_aarch64_msvc" -version = "0.52.3" +version = "0.52.4" authors = ["Microsoft"] edition = "2021" -rust-version = "1.60" +rust-version = "1.56" license = "MIT OR Apache-2.0" description = "Import lib for Windows" repository = "https://github.com/microsoft/windows-rs" diff --git a/crates/targets/i686_gnu/Cargo.toml b/crates/targets/i686_gnu/Cargo.toml index 17be461613..a2c0eb92f4 100644 --- a/crates/targets/i686_gnu/Cargo.toml +++ b/crates/targets/i686_gnu/Cargo.toml @@ -1,9 +1,9 @@ [package] name = "windows_i686_gnu" -version = "0.52.3" +version = "0.52.4" authors = ["Microsoft"] edition = "2021" -rust-version = "1.60" +rust-version = "1.56" license = "MIT OR Apache-2.0" description = "Import lib for Windows" repository = "https://github.com/microsoft/windows-rs" diff --git a/crates/targets/i686_msvc/Cargo.toml b/crates/targets/i686_msvc/Cargo.toml index 5dd363280e..29c908b245 100644 --- a/crates/targets/i686_msvc/Cargo.toml +++ b/crates/targets/i686_msvc/Cargo.toml @@ -1,9 +1,9 @@ [package] name = "windows_i686_msvc" -version = "0.52.3" +version = "0.52.4" authors = ["Microsoft"] edition = "2021" -rust-version = "1.60" +rust-version = "1.56" license = "MIT OR Apache-2.0" description = "Import lib for Windows" 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 fa9dfcceaf..e051aeda54 100644 --- a/crates/targets/x86_64_gnu/Cargo.toml +++ b/crates/targets/x86_64_gnu/Cargo.toml @@ -1,9 +1,9 @@ [package] name = "windows_x86_64_gnu" -version = "0.52.3" +version = "0.52.4" authors = ["Microsoft"] edition = "2021" -rust-version = "1.60" +rust-version = "1.56" license = "MIT OR Apache-2.0" description = "Import lib for Windows" repository = "https://github.com/microsoft/windows-rs" diff --git a/crates/targets/x86_64_gnullvm/Cargo.toml b/crates/targets/x86_64_gnullvm/Cargo.toml index d5687940c7..ec34be93d4 100644 --- a/crates/targets/x86_64_gnullvm/Cargo.toml +++ b/crates/targets/x86_64_gnullvm/Cargo.toml @@ -1,9 +1,9 @@ [package] name = "windows_x86_64_gnullvm" -version = "0.52.3" +version = "0.52.4" authors = ["Microsoft"] edition = "2021" -rust-version = "1.60" +rust-version = "1.56" license = "MIT OR Apache-2.0" description = "Import lib for Windows" 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 8201105eb1..84dcfe8954 100644 --- a/crates/targets/x86_64_msvc/Cargo.toml +++ b/crates/targets/x86_64_msvc/Cargo.toml @@ -1,9 +1,9 @@ [package] name = "windows_x86_64_msvc" -version = "0.52.3" +version = "0.52.4" authors = ["Microsoft"] edition = "2021" -rust-version = "1.60" +rust-version = "1.56" license = "MIT OR Apache-2.0" description = "Import lib for Windows" repository = "https://github.com/microsoft/windows-rs" diff --git a/crates/tests/targets/tests/files.rs b/crates/tests/targets/tests/files.rs index c3e1c16cbe..cb88087d51 100644 --- a/crates/tests/targets/tests/files.rs +++ b/crates/tests/targets/tests/files.rs @@ -5,7 +5,7 @@ fn test() { let targets = tool_lib::crates("../../targets"); assert_eq!(7, targets.len()); - assert!(targets.iter().all(|(_, version)| version == "0.52.3")); + assert!(targets.iter().all(|(_, version)| version == "0.52.4")); // The lib names can't change for minor (semver) updates as that breaks linker search. // https://github.com/microsoft/windows-rs/issues/2869 From c560eee9f14b73aac2ea018e18d6532ed6f50bfd Mon Sep 17 00:00:00 2001 From: Kenny Kerr Date: Wed, 28 Feb 2024 10:10:58 -0600 Subject: [PATCH 2/3] internal --- crates/libs/bindgen/readme.md | 2 +- crates/libs/core/Cargo.toml | 2 +- crates/libs/registry/Cargo.toml | 2 +- crates/libs/result/Cargo.toml | 2 +- crates/libs/sys/Cargo.toml | 2 +- crates/libs/targets/Cargo.toml | 14 +++++++------- crates/libs/targets/readme.md | 2 +- crates/libs/version/Cargo.toml | 2 +- crates/libs/windows/Cargo.toml | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/crates/libs/bindgen/readme.md b/crates/libs/bindgen/readme.md index 9882fcdb19..07d916d458 100644 --- a/crates/libs/bindgen/readme.md +++ b/crates/libs/bindgen/readme.md @@ -10,7 +10,7 @@ Start by adding the following to your Cargo.toml file: ```toml [dependencies.windows-targets] -version = "0.52.3" +version = "0.52.4" [dev-dependencies.windows-bindgen] version = "0.53.0" diff --git a/crates/libs/core/Cargo.toml b/crates/libs/core/Cargo.toml index 1bc8d9771d..781fd8e8a2 100644 --- a/crates/libs/core/Cargo.toml +++ b/crates/libs/core/Cargo.toml @@ -18,7 +18,7 @@ default-target = "x86_64-pc-windows-msvc" targets = [] [dependencies.windows-targets] -version = "0.52.3" +version = "0.52.4" path = "../targets" [dependencies.windows-result] diff --git a/crates/libs/registry/Cargo.toml b/crates/libs/registry/Cargo.toml index 4910e1a5f5..8da2293456 100644 --- a/crates/libs/registry/Cargo.toml +++ b/crates/libs/registry/Cargo.toml @@ -19,7 +19,7 @@ default-target = "x86_64-pc-windows-msvc" targets = [] [dependencies.windows-targets] -version = "0.52.3" +version = "0.52.4" path = "../targets" [dependencies.windows-result] diff --git a/crates/libs/result/Cargo.toml b/crates/libs/result/Cargo.toml index eaa645b053..28b3e7b9a0 100644 --- a/crates/libs/result/Cargo.toml +++ b/crates/libs/result/Cargo.toml @@ -19,7 +19,7 @@ default-target = "x86_64-pc-windows-msvc" targets = [] [dependencies.windows-targets] -version = "0.52.3" +version = "0.52.4" path = "../targets" [dev-dependencies.windows-bindgen] diff --git a/crates/libs/sys/Cargo.toml b/crates/libs/sys/Cargo.toml index 50b7c70fc3..5034b29b7c 100644 --- a/crates/libs/sys/Cargo.toml +++ b/crates/libs/sys/Cargo.toml @@ -20,7 +20,7 @@ targets = [] all-features = true [dependencies.windows-targets] -version = "0.52.3" +version = "0.52.4" path = "../targets" [features] diff --git a/crates/libs/targets/Cargo.toml b/crates/libs/targets/Cargo.toml index 781ae4b5d1..7613e72dbb 100644 --- a/crates/libs/targets/Cargo.toml +++ b/crates/libs/targets/Cargo.toml @@ -14,22 +14,22 @@ readme = "readme.md" workspace = true [target.'cfg(all(target_arch = "x86", target_env = "msvc", not(windows_raw_dylib)))'.dependencies] -windows_i686_msvc = { path = "../../targets/i686_msvc", version = "0.52.3" } +windows_i686_msvc = { path = "../../targets/i686_msvc", version = "0.52.4" } [target.'cfg(all(target_arch = "x86_64", target_env = "msvc", not(windows_raw_dylib)))'.dependencies] -windows_x86_64_msvc = { path = "../../targets/x86_64_msvc", version = "0.52.3" } +windows_x86_64_msvc = { path = "../../targets/x86_64_msvc", version = "0.52.4" } [target.'cfg(all(target_arch = "aarch64", target_env = "msvc", not(windows_raw_dylib)))'.dependencies] -windows_aarch64_msvc = { path = "../../targets/aarch64_msvc", version = "0.52.3" } +windows_aarch64_msvc = { path = "../../targets/aarch64_msvc", version = "0.52.4" } [target.'cfg(all(target_arch = "x86", target_env = "gnu", not(windows_raw_dylib)))'.dependencies] -windows_i686_gnu = { path = "../../targets/i686_gnu", version = "0.52.3" } +windows_i686_gnu = { path = "../../targets/i686_gnu", version = "0.52.4" } [target.'cfg(all(target_arch = "x86_64", target_env = "gnu", not(target_abi = "llvm"), not(windows_raw_dylib)))'.dependencies] -windows_x86_64_gnu = { path = "../../targets/x86_64_gnu", version = "0.52.3" } +windows_x86_64_gnu = { path = "../../targets/x86_64_gnu", version = "0.52.4" } [target.x86_64-pc-windows-gnullvm.dependencies] -windows_x86_64_gnullvm = { path = "../../targets/x86_64_gnullvm", version = "0.52.3" } +windows_x86_64_gnullvm = { path = "../../targets/x86_64_gnullvm", version = "0.52.4" } [target.aarch64-pc-windows-gnullvm.dependencies] -windows_aarch64_gnullvm = { path = "../../targets/aarch64_gnullvm", version = "0.52.3" } +windows_aarch64_gnullvm = { path = "../../targets/aarch64_gnullvm", version = "0.52.4" } diff --git a/crates/libs/targets/readme.md b/crates/libs/targets/readme.md index 7ea47550bd..05032220ef 100644 --- a/crates/libs/targets/readme.md +++ b/crates/libs/targets/readme.md @@ -10,7 +10,7 @@ Start by adding the following to your Cargo.toml file: ```toml [dependencies.windows-targets] -version = "0.52.3" +version = "0.52.4" ``` Use the `link`` macro to define the external functions you wish to call: diff --git a/crates/libs/version/Cargo.toml b/crates/libs/version/Cargo.toml index ffe60ac0d7..c504362148 100644 --- a/crates/libs/version/Cargo.toml +++ b/crates/libs/version/Cargo.toml @@ -18,7 +18,7 @@ default-target = "x86_64-pc-windows-msvc" targets = [] [dependencies.windows-targets] -version = "0.52.3" +version = "0.52.4" path = "../targets" [dev-dependencies.windows-bindgen] diff --git a/crates/libs/windows/Cargo.toml b/crates/libs/windows/Cargo.toml index 484259f573..96792c3802 100644 --- a/crates/libs/windows/Cargo.toml +++ b/crates/libs/windows/Cargo.toml @@ -23,7 +23,7 @@ rustdoc-args = ["--cfg", "docsrs"] [dependencies] windows-core = { path = "../core", version = "0.54.0" } -windows-targets = { path = "../targets", version = "0.52.3" } +windows-targets = { path = "../targets", version = "0.52.4" } windows-implement = { path = "../implement", version = "0.53.0", optional = true } windows-interface = { path = "../interface", version = "0.53.0", optional = true } From 51842acb888559f2923d398e3e93f137a5017536 Mon Sep 17 00:00:00 2001 From: Kenny Kerr Date: Wed, 28 Feb 2024 10:19:37 -0600 Subject: [PATCH 3/3] new nightly clippy suggestion --- crates/libs/core/src/imp/factory_cache.rs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/crates/libs/core/src/imp/factory_cache.rs b/crates/libs/core/src/imp/factory_cache.rs index eb4b2dac0e..62085a1b73 100644 --- a/crates/libs/core/src/imp/factory_cache.rs +++ b/crates/libs/core/src/imp/factory_cache.rs @@ -16,6 +16,12 @@ impl FactoryCache { } } +impl Default for FactoryCache { + fn default() -> Self { + Self::new() + } +} + impl FactoryCache { pub fn call crate::Result>(&self, callback: F) -> crate::Result { loop {