Skip to content

Commit 5da7513

Browse files
WIP: build: allow windows-core 0.59, windows-targets 0.53
1 parent ceb88f2 commit 5da7513

File tree

4 files changed

+45
-101
lines changed

4 files changed

+45
-101
lines changed

Cargo.lock

Lines changed: 32 additions & 88 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ static_assertions = { version = "1.1", default-features = false }
2727

2828
[target.'cfg(windows)'.dependencies]
2929
# Don't increase beyond what Firefox is currently using: https://searchfox.org/mozilla-central/source/Cargo.lock
30-
windows-core = { version = "0.58", default-features = false }
31-
windows-targets = { version = "0.52", default-features = false }
30+
windows-core = { version = "0.59", default-features = false }
31+
windows-targets = { version = "0.53", default-features = false }
3232

3333
[build-dependencies]
3434
cfg_aliases = { version = "0.2", default-features = false }
@@ -39,7 +39,7 @@ mozbuild = { version = "0.1", default-features = false, optional = true }
3939
bindgen = { version = "0.69", default-features = false, features = ["runtime"] }
4040

4141
[target.'cfg(windows)'.build-dependencies]
42-
windows-bindgen = { version = "0.58", default-features = false, features = ["metadata"] }
42+
windows-bindgen = { version = "0.59", default-features = false }
4343

4444
[features]
4545
gecko = ["dep:mozbuild"]
@@ -48,3 +48,6 @@ gecko = ["dep:mozbuild"]
4848
cargo = { level = "warn", priority = -1 }
4949
nursery = { level = "warn", priority = -1 }
5050
pedantic = { level = "warn", priority = -1 }
51+
52+
[patch.crates-io]
53+
libloading = { git = "https://github.com/erichdongubler-contrib/rust_libloading", branch = "windows-0.59" }

build.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,9 @@ fn bindgen() {
8383
windows_bindgen::bindgen([
8484
"--out",
8585
out_path.to_str().unwrap(),
86-
"--config",
87-
"flatten",
88-
"no-inner-attributes",
89-
"minimal",
86+
"--flat",
87+
"--no-comment",
88+
"--no-allow",
9089
"--filter",
9190
"Windows.Win32.Foundation.NO_ERROR",
9291
"Windows.Win32.Networking.WinSock.AF_INET",
@@ -99,8 +98,7 @@ fn bindgen() {
9998
"Windows.Win32.NetworkManagement.IpHelper.if_indextoname",
10099
"Windows.Win32.NetworkManagement.IpHelper.MIB_IPINTERFACE_ROW",
101100
"Windows.Win32.NetworkManagement.Ndis.IF_MAX_STRING_SIZE",
102-
])
103-
.expect("Couldn't write bindings!");
101+
]);
104102
println!("cargo:rustc-env=BINDINGS={}", out_path.display());
105103
}
106104

src/windows.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@ use crate::default_err;
1616
#[allow(
1717
non_camel_case_types,
1818
non_snake_case,
19-
clippy::semicolon_if_nothing_returned,
20-
clippy::missing_transmute_annotations,
21-
clippy::upper_case_acronyms,
22-
clippy::struct_field_names
19+
clippy::all,
20+
clippy::nursery,
21+
clippy::pedantic
2322
)]
2423
mod bindings {
2524
include!(env!("BINDINGS"));

0 commit comments

Comments
 (0)