reverted changes made by cargo fmt

microsoft · Dec 4, 2024 · 214e5cb · 214e5cb
1 parent 76b6805
commit 214e5cb
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 20 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -27,8 +27,12 @@ readme = "README.md"
 license = "MIT OR Apache-2.0"
 
 [workspace.dependencies]
+# Workspace Crates
+wdk = { path = "crates/wdk", version = "0.3.0" }
+wdk-alloc = { path = "crates/wdk-alloc", version = "0.3.0" }
 wdk-build = { path = "crates/wdk-build", version = "0.3.0" }
 wdk-macros = { path = "crates/wdk-macros", version = "0.3.0" }
+wdk-panic = { path = "crates/wdk-panic", version = "0.3.0" }
 wdk-sys = { path = "crates/wdk-sys", version = "0.3.0" }
 
 # External Crates

diff --git a/crates/wdk-alloc/src/lib.rs b/crates/wdk-alloc/src/lib.rs
@@ -29,10 +29,12 @@ pub use kernel_mode::*;
 mod kernel_mode {
 
     use core::alloc::{GlobalAlloc, Layout};
-
+    
     use wdk_sys::{
         ntddk::{ExAllocatePool2, ExFreePool},
-        POOL_FLAG_NON_PAGED, SIZE_T, ULONG,
+        POOL_FLAG_NON_PAGED,
+        SIZE_T,
+        ULONG,
     };
 
     /// Allocator implementation to use with `#[global_allocator]` to allow use

diff --git a/crates/wdk-build/src/cargo_make.rs b/crates/wdk-build/src/cargo_make.rs
@@ -26,9 +26,13 @@ use tracing::{instrument, trace};
 use crate::{
     metadata,
     utils::{
-        detect_wdk_content_root, get_latest_windows_sdk_version, get_wdk_version_number, PathExt,
+        detect_wdk_content_root,
+        get_latest_windows_sdk_version,
+        get_wdk_version_number,
+        PathExt,
     },
-    ConfigError, CpuArchitecture,
+    ConfigError,
+    CpuArchitecture,
 };
 
 /// The filename of the main makefile for Rust Windows drivers.

diff --git a/crates/wdk-build/src/utils.rs b/crates/wdk-build/src/utils.rs
@@ -14,7 +14,13 @@ use thiserror::Error;
 use windows::{
     core::{s, PCSTR},
     Win32::System::Registry::{
-        RegCloseKey, RegGetValueA, RegOpenKeyExA, HKEY, HKEY_LOCAL_MACHINE, KEY_READ, RRF_RT_REG_SZ,
+        RegCloseKey,
+        RegGetValueA,
+        RegOpenKeyExA,
+        HKEY,
+        HKEY_LOCAL_MACHINE,
+        KEY_READ,
+        RRF_RT_REG_SZ,
     },
 };
 
@@ -416,7 +422,9 @@ mod tests {
 
     mod read_registry_key_string_value {
         use windows::Win32::UI::Shell::{
-            FOLDERID_ProgramFiles, SHGetKnownFolderPath, KF_FLAG_DEFAULT,
+            FOLDERID_ProgramFiles,
+            SHGetKnownFolderPath,
+            KF_FLAG_DEFAULT,
         };
 
         use super::*;

diff --git a/crates/wdk-macros/src/lib.rs b/crates/wdk-macros/src/lib.rs
@@ -12,13 +12,34 @@ use proc_macro2::{Span, TokenStream as TokenStream2};
 use quote::{format_ident, quote};
 use syn::{
     parse::{Parse, ParseStream},
-    parse2, parse_file, parse_quote,
+    parse2,
+    parse_file,
+    parse_quote,
     punctuated::Punctuated,
-    AngleBracketedGenericArguments, Attribute, BareFnArg, Error, Expr, ExprCall, File,
-    GenericArgument, Ident, Item, ItemType, LitStr, Path, PathArguments, PathSegment, Result,
-    ReturnType, Signature, Stmt, Token, Type, TypeBareFn, TypePath,
+    AngleBracketedGenericArguments,
+    Attribute,
+    BareFnArg,
+    Error,
+    Expr,
+    ExprCall,
+    File,
+    GenericArgument,
+    Ident,
+    Item,
+    ItemType,
+    LitStr,
+    Path,
+    PathArguments,
+    PathSegment,
+    Result,
+    ReturnType,
+    Signature,
+    Stmt,
+    Token,
+    Type,
+    TypeBareFn,
+    TypePath,
 };
-
 /// A procedural macro that allows WDF functions to be called by name.
 ///
 /// This macro is only intended to be used in the `wdk-sys` crate. Users wanting

diff --git a/crates/wdk-sys/build.rs b/crates/wdk-sys/build.rs
@@ -22,8 +22,13 @@ use tracing_subscriber::{
     EnvFilter,
 };
 use wdk_build::{
-    configure_wdk_library_build_and_then, BuilderExt, Config, ConfigError, DriverConfig,
-    KmdfConfig, UmdfConfig,
+    configure_wdk_library_build_and_then,
+    BuilderExt,
+    Config,
+    ConfigError,
+    DriverConfig,
+    KmdfConfig,
+    UmdfConfig,
 };
 
 const NUM_WDF_FUNCTIONS_PLACEHOLDER: &str =
@@ -94,7 +99,7 @@ impl FunctionTable {{
 /// Static instance of the function table to be used throughout generated code. 
 pub static WDF_FUNCTION_TABLE: FunctionTable = FunctionTable::new();
 "#
-)
+    )
 });
 
 static CALL_UNSAFE_WDF_BINDING_TEMPLATE: LazyLock<String> = LazyLock::new(|| {
@@ -154,12 +159,12 @@ macro_rules! call_unsafe_wdf_function_binding {{
 static TEST_STUBS_TEMPLATE: LazyLock<String> = LazyLock::new(|| {
     format!(
         r"
-    use crate::WDFFUNC;
+use crate::WDFFUNC;
 
-    /// Stubbed version of the symbol that [`WdfFunctions`] links to so that test targets will compile
-    #[no_mangle]
-    pub static mut {WDFFUNCTIONS_SYMBOL_NAME_PLACEHOLDER}: *const WDFFUNC = core::ptr::null();
-    ",
+/// Stubbed version of the symbol that [`WdfFunctions`] links to so that test targets will compile
+#[no_mangle]
+pub static mut {WDFFUNCTIONS_SYMBOL_NAME_PLACEHOLDER}: *const WDFFUNC = core::ptr::null();
+",
     )
 });
 type GenerateFn = fn(&Path, &Config) -> Result<(), ConfigError>;

diff --git a/crates/wdk/src/wdf/timer.rs b/crates/wdk/src/wdf/timer.rs
@@ -2,7 +2,11 @@
 // License: MIT OR Apache-2.0
 
 use wdk_sys::{
-    call_unsafe_wdf_function_binding, NTSTATUS, WDFTIMER, WDF_OBJECT_ATTRIBUTES, WDF_TIMER_CONFIG,
+    call_unsafe_wdf_function_binding,
+    NTSTATUS,
+    WDFTIMER,
+    WDF_OBJECT_ATTRIBUTES,
+    WDF_TIMER_CONFIG,
 };
 
 use crate::nt_success;