Merge branch 'main' into derives-library

Author: leon-xd

AGENTS.md

@@ -87,7 +87,7 @@ cargo make wdk-pre-commit-flow
 - **FFI naming:** Bindings in `wdk-sys` retain their original C names and style (e.g., PascalCase functions). Safe Rust wrappers in `wdk` follow [Rust naming conventions (RFC 430)](https://rust-lang.github.io/api-guidelines/naming.html).
 - **Formatting:** `rustfmt` uses nightly-only unstable options (see `rustfmt.toml`). Import grouping is `StdExternalCrate`, granularity is `Crate`.
 - **Lints:** Clippy `all` is deny, `pedantic`/`nursery`/`cargo` are warn. Most workspace members inherit `[lints] workspace = true`; `wdk-sys`, `wdk-build`, `wdk-macros`, and `cargo-wdk` define their own `[lints]` tables instead (Cargo currently does not support both inheriting workspace lints and selectively overriding them per crate).
-- **Edition:** 2024, MSRV 1.85.0, resolver v3.
+- **Edition:** 2024, MSRV 1.91.0, resolver v3.
 - **Static CRT:** Enabled globally via `.cargo/config.toml` (`-C target-feature=+crt-static`).
 - **Spelling:** `typos` is configured in `.typos.toml`; Windows API identifiers are allowlisted rather than using file-level excludes.
 - **TOML:** `taplo` uses CRLF line endings (see `taplo.toml`).

Cargo.toml

@@ -19,7 +19,7 @@ edition = "2024"
 license = "MIT OR Apache-2.0"
 readme = "README.md"
 repository = "https://github.com/microsoft/windows-drivers-rs"
-rust-version = "1.85.0"
+rust-version = "1.91.0"
 
 [workspace.dependencies]
 # Workspace Crates

README.md

@@ -178,6 +178,8 @@ Minimal examples of `WDM`, `KMDF`, and `UMDF` drivers can be found in the [examp
 
 ## Cargo Make
 
+> **Preview:** We are developing a new Cargo extension [`cargo-wdk`](https://crates.io/crates/cargo-wdk) that will replace `cargo-make` as the recommended tool for building Rust drivers. Please try it out and share your feedback.
+
 [`cargo-make`](https://github.com/sagiegurari/cargo-make) is used to facilitate builds using `windows-drivers-rs`, including for executing post-build driver packaging steps.
 
 To execute the default action (build and package driver):

crates/wdk-build/build.rs

@@ -14,11 +14,13 @@ fn main() {
 // Custom attributes cannot be applied to expressions yet, so separate functions
 // are required for `rustversion` conditional compilation: https://github.com/rust-lang/rust/issues/15701
 // TODO: Remove the `setup_assert_matches_stabilized_cfg` feature and related
-// code once the minimum supported Rust version is 1.95.0 or later.
-#[rustversion::since(1.95.0)]
+// code once the minimum supported Rust version includes stable
+// `assert_matches`. Tracking issue:
+// https://github.com/rust-lang/rust/issues/82775
+#[rustversion::since(1.96.0)]
 fn setup_assert_matches_stabilized_cfg() {
     println!("cargo::rustc-cfg=assert_matches_stabilized");
 }
 
-#[rustversion::before(1.95.0)]
+#[rustversion::before(1.96.0)]
 const fn setup_assert_matches_stabilized_cfg() {}

crates/wdk-build/src/bindgen.rs

@@ -162,17 +162,15 @@ impl BuilderExt for Builder {
 impl ParseCallbacks for WdkCallbacks {
     fn generated_name_override(&self, item_info: ItemInfo) -> Option<String> {
         // Override the generated name for the WDF function table symbol, since bindgen is unable to currently translate the #define automatically: https://github.com/rust-lang/rust-bindgen/issues/2544
-        if let Some(wdf_function_table_symbol_name) = &self.wdf_function_table_symbol_name {
-            if let ItemInfo {
+        if let Some(wdf_function_table_symbol_name) = &self.wdf_function_table_symbol_name
+            && let ItemInfo {
                 name: item_name,
                 kind: ItemKind::Var,
                 ..
             } = item_info
-            {
-                if item_name == wdf_function_table_symbol_name {
-                    return Some("WdfFunctions".to_string());
-                }
-            }
+            && item_name == wdf_function_table_symbol_name
+        {
+            return Some("WdfFunctions".to_string());
         }
         None
     }

crates/wdk-build/src/cargo_make.rs

@@ -337,14 +337,14 @@ impl ParseCargoArgs for CompilationOptions {
         {
             "release" => {
                 // cargo-make release profile sets the `--profile release` flag
-                if let Some(profile) = &profile {
-                    if profile != "release" {
-                        eprintln!(
-                            "Specifying `--profile release` for cargo-make conflicts with the \
-                             setting `--profile {profile}` to forward to tasks"
-                        );
-                        std::process::exit(CLAP_USAGE_EXIT_CODE);
-                    }
+                if let Some(profile) = &profile
+                    && profile != "release"
+                {
+                    eprintln!(
+                        "Specifying `--profile release` for cargo-make conflicts with the setting \
+                         `--profile {profile}` to forward to tasks"
+                    );
+                    std::process::exit(CLAP_USAGE_EXIT_CODE);
                 }
 
                 append_to_space_delimited_env_var(

crates/wdk/Cargo.toml

@@ -17,8 +17,8 @@ readme.workspace = true
 repository.workspace = true
 
 [features]
+# Deprecated: no longer required. Kept as a no-op for backward compatibility.
 alloc = []
-default = ["alloc"]
 nightly = ["wdk-sys/nightly"]
 
 [dependencies]