Skip to content

Commit 0c9db5e

Browse files
author
Ben Hillis
committed
cargo xtask fmt --fix
1 parent 5c5deb7 commit 0c9db5e

File tree

12 files changed

+46
-69
lines changed

12 files changed

+46
-69
lines changed

‎Cargo.lock

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5159,7 +5159,6 @@ dependencies = [
51595159
"thiserror 2.0.12",
51605160
"tracing",
51615161
"widestring",
5162-
"win_import_lib",
51635162
"windows 0.59.0",
51645163
]
51655164

‎support/guid/src/lib.rs

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -266,28 +266,6 @@ mod windows {
266266
#![cfg(windows)]
267267
use super::Guid;
268268

269-
impl From<windows::core::GUID> for Guid {
270-
fn from(guid: windows::core::GUID) -> Self {
271-
Self {
272-
data1: guid.data1,
273-
data2: guid.data2,
274-
data3: guid.data3,
275-
data4: guid.data4,
276-
}
277-
}
278-
}
279-
280-
impl From<Guid> for windows::core::GUID {
281-
fn from(guid: Guid) -> Self {
282-
Self {
283-
data1: guid.data1,
284-
data2: guid.data2,
285-
data3: guid.data3,
286-
data4: guid.data4,
287-
}
288-
}
289-
}
290-
291269
impl From<windows_sys::core::GUID> for Guid {
292270
fn from(guid: windows_sys::core::GUID) -> Self {
293271
Self {

‎support/pal/src/windows.rs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ pub mod security;
1717
pub mod tp;
1818

1919
use self::security::SecurityDescriptor;
20+
use ntapi::ntdef::ANSI_STRING;
21+
use ntapi::ntdef::UNICODE_STRING;
2022
use ntapi::ntioapi::FILE_COMPLETION_INFORMATION;
2123
use ntapi::ntioapi::FileReplaceCompletionInformation;
2224
use ntapi::ntioapi::IO_STATUS_BLOCK;
@@ -27,8 +29,6 @@ use ntapi::ntioapi::NtSetInformationFile;
2729
use ntapi::ntobapi::NtCreateDirectoryObject;
2830
use ntapi::ntobapi::NtOpenDirectoryObject;
2931
use ntapi::ntrtl;
30-
use ntdef::ANSI_STRING;
31-
use ntdef::UNICODE_STRING;
3232
use ntrtl::RtlAllocateHeap;
3333
use ntrtl::RtlDosPathNameToNtPathName_U_WithStatus;
3434
use ntrtl::RtlFreeUnicodeString;
@@ -54,32 +54,32 @@ use std::time::Duration;
5454
use widestring::U16CString;
5555
use widestring::Utf16Str;
5656
use windows::Win32::Foundation::CloseHandle;
57-
use windows::Win32::Foundation::DuplicateHandle;
5857
use windows::Win32::Foundation::DUPLICATE_SAME_ACCESS;
58+
use windows::Win32::Foundation::DuplicateHandle;
5959
use windows::Win32::Foundation::ERROR_BAD_PATHNAME;
6060
use windows::Win32::Foundation::INVALID_HANDLE_VALUE;
6161
use windows::Win32::Foundation::NTSTATUS;
6262
use windows::Win32::Foundation::STATUS_PENDING;
63-
use windows::Win32::Foundation::INFINITE;
64-
use windows::Win32::System::ErrorReporting::GetErrorMode;
65-
use windows::Win32::System::ErrorReporting::SetErrorMode;
66-
use windows::Win32::System::ErrorReporting::SEM_FAILCRITICALERRORS;
63+
use windows::Win32::Networking::WinSock::IOC_IN;
64+
use windows::Win32::Networking::WinSock::IOC_VENDOR;
65+
use windows::Win32::Storage::FileSystem::SetFileCompletionNotificationModes;
66+
use windows::Win32::System::Console::STD_OUTPUT_HANDLE;
67+
use windows::Win32::System::Console::SetStdHandle;
6768
use windows::Win32::System::IO::CreateIoCompletionPort;
6869
use windows::Win32::System::IO::GetQueuedCompletionStatusEx;
69-
use windows::Win32::System::IO::PostQueuedCompletionStatus;
7070
use windows::Win32::System::IO::OVERLAPPED;
7171
use windows::Win32::System::IO::OVERLAPPED_ENTRY;
72+
use windows::Win32::System::IO::PostQueuedCompletionStatus;
7273
use windows::Win32::System::Memory::GetProcessHeap;
74+
use windows::Win32::System::SystemServices::GetErrorMode;
75+
use windows::Win32::System::SystemServices::SEM_FAILCRITICALERRORS;
76+
use windows::Win32::System::SystemServices::SetErrorMode;
7377
use windows::Win32::System::Threading::GetCurrentProcess;
7478
use windows::Win32::System::Threading::GetExitCodeProcess;
7579
use windows::Win32::System::Threading::GetProcessId;
76-
use windows::Win32::System::Threading::SetStdHandle;
80+
use windows::Win32::System::Threading::INFINITE;
7781
use windows::Win32::System::Threading::TerminateProcess;
78-
use windows::Win32::System::Threading::STD_OUTPUT_HANDLE;
7982
use windows::Win32::System::Threading::WaitForSingleObject;
80-
use windows::Win32::Storage::FileSystem::SetFileCompletionNotificationModes;
81-
use windows::Win32::Networking::WinSock::IOC_IN;
82-
use windows::Win32::Networking::WinSock::IOC_VENDOR;
8383

8484
#[repr(transparent)]
8585
#[derive(Debug, Copy, Clone, PartialEq, Eq)]
@@ -98,7 +98,7 @@ impl BorrowedHandleExt for BorrowedHandle<'_> {
9898
let options = if access.is_some() {
9999
0
100100
} else {
101-
DUPLICATE_SAME_ACCESS
101+
DUPLICATE_SAME_ACCESS.0
102102
};
103103
unsafe {
104104
let process = GetCurrentProcess();

‎support/pal/src/windows/afd.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
use super::SendSyncRawHandle;
99
use super::UnicodeString;
1010
use super::chk_status;
11-
use ioapiset::DeviceIoControl;
12-
use minwinbase::OVERLAPPED;
11+
use ntapi::ntdef::OBJECT_ATTRIBUTES;
1312
use ntapi::ntioapi::NtOpenFile;
14-
use ntdef::OBJECT_ATTRIBUTES;
1513
use std::fs::File;
1614
use std::mem::zeroed;
1715
use std::os::windows::prelude::*;
1816
use std::ptr::null_mut;
1917
use windows::Win32::Foundation::ERROR_IO_PENDING;
18+
use windows::Win32::System::IO::DeviceIoControl;
19+
use windows::Win32::System::IO::OVERLAPPED;
2020

2121
#[repr(C)]
2222
#[derive(Debug, Copy, Clone, Default)]

‎support/pal/src/windows/fs.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ pub fn is_unix_socket(path: &Path) -> io::Result<bool> {
8686

8787
let data = find_first_file_data(path)?;
8888
Ok(
89-
data.dwFileAttributes & windows::Win32::Storage::FileSystem::FILE_ATTRIBUTE_REPARSE_POINT != 0
89+
data.dwFileAttributes & windows::Win32::Storage::FileSystem::FILE_ATTRIBUTE_REPARSE_POINT
90+
!= 0
9091
&& data.dwReserved0 == IO_REPARSE_TAG_AF_UNIX,
9192
)
9293
}

‎support/pal/src/windows/job.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,12 @@ impl Job {
3535
// SAFETY: It is safe to initialize this C structure using `zeroed`.
3636
let mut info = unsafe {
3737
windows::Win32::System::JobObjects::JOBOBJECT_EXTENDED_LIMIT_INFORMATION {
38-
BasicLimitInformation: windows::Win32::System::JobObjects::JOBOBJECT_BASIC_LIMIT_INFORMATION {
39-
LimitFlags: windows::Win32::System::JobObjects::JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE,
40-
..zeroed()
41-
},
38+
BasicLimitInformation:
39+
windows::Win32::System::JobObjects::JOBOBJECT_BASIC_LIMIT_INFORMATION {
40+
LimitFlags:
41+
windows::Win32::System::JobObjects::JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE,
42+
..zeroed()
43+
},
4244
..zeroed()
4345
}
4446
};

‎support/pal/src/windows/pipe.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ use super::dos_to_nt_path;
77
use super::status_to_error;
88
use namedpipeapi::GetNamedPipeHandleStateW;
99
use namedpipeapi::SetNamedPipeHandleState;
10+
use ntapi::ntdef::LARGE_INTEGER;
11+
use ntapi::ntdef::OBJ_CASE_INSENSITIVE;
12+
use ntapi::ntdef::OBJECT_ATTRIBUTES;
1013
use ntapi::ntioapi;
1114
use ntapi::ntioapi::FILE_OPEN;
1215
use ntapi::ntioapi::FILE_PIPE_CLOSING_STATE;
@@ -16,9 +19,6 @@ use ntapi::ntioapi::FILE_PIPE_LISTENING_STATE;
1619
use ntapi::ntioapi::FILE_PIPE_LOCAL_INFORMATION;
1720
use ntapi::ntioapi::FilePipeLocalInformation;
1821
use ntapi::ntioapi::NtQueryInformationFile;
19-
use ntdef::LARGE_INTEGER;
20-
use ntdef::OBJ_CASE_INSENSITIVE;
21-
use ntdef::OBJECT_ATTRIBUTES;
2222
use ntioapi::FILE_CREATE;
2323
use ntioapi::FILE_NON_DIRECTORY_FILE;
2424
use ntioapi::FILE_PIPE_BYTE_STREAM_MODE;

‎support/pal/src/windows/process.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,24 @@ use std::ptr::null;
1515
use std::ptr::null_mut;
1616
use widestring::U16CString;
1717
use windows::Win32::Foundation::ERROR_INVALID_PARAMETER;
18-
use windows::Win32::Foundation::SetHandleInformation;
1918
use windows::Win32::Foundation::GetStdHandle;
19+
use windows::Win32::Foundation::HANDLE_FLAG_INHERIT;
20+
use windows::Win32::Foundation::SetHandleInformation;
21+
use windows::Win32::System::Threading::CREATE_SUSPENDED;
22+
use windows::Win32::System::Threading::CREATE_UNICODE_ENVIRONMENT;
2023
use windows::Win32::System::Threading::CreateProcessAsUserW;
2124
use windows::Win32::System::Threading::DeleteProcThreadAttributeList;
25+
use windows::Win32::System::Threading::EXTENDED_STARTUPINFO_PRESENT;
2226
use windows::Win32::System::Threading::InitializeProcThreadAttributeList;
2327
use windows::Win32::System::Threading::LPPROC_THREAD_ATTRIBUTE_LIST;
24-
use windows::Win32::System::Threading::STARTUPINFOW;
25-
use windows::Win32::System::Threading::TerminateProcess;
26-
use windows::Win32::System::Threading::UpdateProcThreadAttribute;
27-
use windows::Win32::System::Threading::CREATE_SUSPENDED;
28-
use windows::Win32::System::Threading::CREATE_UNICODE_ENVIRONMENT;
29-
use windows::Win32::System::Threading::EXTENDED_STARTUPINFO_PRESENT;
30-
use windows::Win32::Foundation::HANDLE_FLAG_INHERIT;
3128
use windows::Win32::System::Threading::STARTF_USESTDHANDLES;
3229
use windows::Win32::System::Threading::STARTUPINFOEXW;
30+
use windows::Win32::System::Threading::STARTUPINFOW;
3331
use windows::Win32::System::Threading::STD_ERROR_HANDLE;
3432
use windows::Win32::System::Threading::STD_INPUT_HANDLE;
3533
use windows::Win32::System::Threading::STD_OUTPUT_HANDLE;
34+
use windows::Win32::System::Threading::TerminateProcess;
35+
use windows::Win32::System::Threading::UpdateProcThreadAttribute;
3636

3737
const PROC_THREAD_ATTRIBUTE_HANDLE_LIST: u32 = 0x00020002;
3838
const PROC_THREAD_ATTRIBUTE_MITIGATION_POLICY: u32 = 0x000020007;

‎support/pal/src/windows/security.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ use windows::Win32::Foundation::LocalFree;
2020
use windows::Win32::Security::Authorization::ConvertSecurityDescriptorToStringSecurityDescriptorW;
2121
use windows::Win32::Security::Authorization::ConvertSidToStringSidW;
2222
use windows::Win32::Security::Authorization::ConvertStringSecurityDescriptorToSecurityDescriptorW;
23-
use windows::Win32::Security::DeriveCapabilitySidsFromName;
2423
use windows::Win32::Security::DACL_SECURITY_INFORMATION;
24+
use windows::Win32::Security::DeriveCapabilitySidsFromName;
2525
use windows::Win32::Security::GROUP_SECURITY_INFORMATION;
2626
use windows::Win32::Security::LABEL_SECURITY_INFORMATION;
2727
use windows::Win32::Security::LPSECURITY_CAPABILITIES;
@@ -30,10 +30,10 @@ use windows::Win32::Security::PHANDLE;
3030
use windows::Win32::Security::PSECURITY_DESCRIPTOR;
3131
use windows::Win32::Security::PSID;
3232
use windows::Win32::Security::SACL_SECURITY_INFORMATION;
33+
use windows::Win32::Security::SDDL_REVISION_1;
3334
use windows::Win32::Security::SE_GROUP_ENABLED;
3435
use windows::Win32::Security::SECURITY_CAPABILITIES;
3536
use windows::Win32::Security::SID_AND_ATTRIBUTES;
36-
use windows::Win32::Security::SDDL_REVISION_1;
3737

3838
const MAX_SUBAUTHORITY_COUNT: usize = 15;
3939

‎support/pal/src/windows/tp.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ use windows::Win32::System::Threading::CreateThreadpoolIo;
1919
use windows::Win32::System::Threading::CreateThreadpoolTimer;
2020
use windows::Win32::System::Threading::CreateThreadpoolWait;
2121
use windows::Win32::System::Threading::CreateThreadpoolWork;
22+
use windows::Win32::System::Threading::PTP_TIMER_CALLBACK;
23+
use windows::Win32::System::Threading::PTP_WAIT_CALLBACK;
2224
use windows::Win32::System::Threading::PTP_WIN32_IO_CALLBACK;
25+
use windows::Win32::System::Threading::PTP_WORK_CALLBACK;
2326
use windows::Win32::System::Threading::SetThreadpoolTimerEx;
2427
use windows::Win32::System::Threading::SetThreadpoolWaitEx;
2528
use windows::Win32::System::Threading::StartThreadpoolIo;
2629
use windows::Win32::System::Threading::SubmitThreadpoolWork;
27-
use windows::Win32::System::Threading::PTP_TIMER_CALLBACK;
28-
use windows::Win32::System::Threading::PTP_WAIT_CALLBACK;
29-
use windows::Win32::System::Threading::PTP_WORK_CALLBACK;
3030
use windows::Win32::System::Threading::TP_IO;
3131
use windows::Win32::System::Threading::TP_TIMER;
3232
use windows::Win32::System::Threading::TP_WAIT;

0 commit comments

Comments
 (0)