Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restore MSRV for windows-targets to 1.56 #2898

Merged
merged 3 commits into from
Feb 28, 2024
Merged

Restore MSRV for windows-targets to 1.56 #2898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d750e8
0.52.4
kennykerr Feb 28, 2024
c560eee
internal
kennykerr Feb 28, 2024
51842ac
new nightly clippy suggestion
kennykerr Feb 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/libs/bindgen/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion crates/libs/core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
6 changes: 6 additions & 0 deletions crates/libs/core/src/imp/factory_cache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ impl<C, I> FactoryCache<C, I> {
}
}

impl<C, I> Default for FactoryCache<C, I> {
fn default() -> Self {
Self::new()
}
}

riverar marked this conversation as resolved.
Show resolved Hide resolved
impl<C: crate::RuntimeName, I: Interface> FactoryCache<C, I> {
pub fn call<R, F: FnOnce(&I) -> crate::Result<R>>(&self, callback: F) -> crate::Result<R> {
loop {
Expand Down
2 changes: 1 addition & 1 deletion crates/libs/registry/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion crates/libs/result/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion crates/libs/sys/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ targets = []
all-features = true

[dependencies.windows-targets]
version = "0.52.3"
version = "0.52.4"
path = "../targets"

[features]
Expand Down
18 changes: 9 additions & 9 deletions crates/libs/targets/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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" }
2 changes: 1 addition & 1 deletion crates/libs/targets/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion crates/libs/version/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion crates/libs/windows/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }

Expand Down
4 changes: 2 additions & 2 deletions crates/targets/aarch64_gnullvm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions crates/targets/aarch64_msvc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions crates/targets/i686_gnu/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions crates/targets/i686_msvc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions crates/targets/x86_64_gnu/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions crates/targets/x86_64_gnullvm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions crates/targets/x86_64_msvc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion crates/tests/targets/tests/files.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down