diff --git a/crates/wdk-build/Cargo.toml b/crates/wdk-build/Cargo.toml index ad92f32f..ab8b4c53 100644 --- a/crates/wdk-build/Cargo.toml +++ b/crates/wdk-build/Cargo.toml @@ -22,7 +22,6 @@ clap = { workspace = true, features = ["derive"] } clap-cargo.workspace = true lazy_static.workspace = true paste.workspace = true -rustversion.workspace = true serde = { workspace = true, features = ["derive"] } serde_json.workspace = true thiserror.workspace = true diff --git a/crates/wdk-build/src/utils.rs b/crates/wdk-build/src/utils.rs index c8b6a3ee..b01fb8c8 100644 --- a/crates/wdk-build/src/utils.rs +++ b/crates/wdk-build/src/utils.rs @@ -222,21 +222,12 @@ pub fn detect_cpu_architecture_in_build_script() -> CpuArchitecture { /// Validates that a given string matches the WDK version format (10.xxx.yyy.zzz /// where xxx, yyy, and zzz are numeric and not necessarily 3 digits long). -#[rustversion::attr( - nightly, - allow( - clippy::nonminimal_bool, - reason = "is_some_or is not stable until 1.82.0 is released on 10/17/24" - ) -)] pub fn validate_wdk_version_format>(version_string: S) -> bool { let version = version_string.as_ref(); let version_parts: Vec<&str> = version.split('.').collect(); // First, check if we have "10" as our first value - if !version_parts.first().is_some_and(|first| *first == "10") { - // FIXME: Once is_some_or is stabilized, replace the above with: - // if version_parts.first().is_none_or(|first| *first != "10") { + if version_parts.first().is_none_or(|first| *first != "10") { return false; }