Skip to content

Commit 99a6fc6

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

File tree

8 files changed

+34
-34
lines changed

8 files changed

+34
-34
lines changed

‎support/pal/src/windows.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -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;
60+
use windows::Win32::Foundation::INFINITE;
6061
use windows::Win32::Foundation::INVALID_HANDLE_VALUE;
6162
use windows::Win32::Foundation::NTSTATUS;
6263
use windows::Win32::Foundation::STATUS_PENDING;
63-
use windows::Win32::Foundation::INFINITE;
64+
use windows::Win32::Networking::WinSock::IOC_IN;
65+
use windows::Win32::Networking::WinSock::IOC_VENDOR;
66+
use windows::Win32::Storage::FileSystem::SetFileCompletionNotificationModes;
6467
use windows::Win32::System::ErrorReporting::GetErrorMode;
65-
use windows::Win32::System::ErrorReporting::SetErrorMode;
6668
use windows::Win32::System::ErrorReporting::SEM_FAILCRITICALERRORS;
69+
use windows::Win32::System::ErrorReporting::SetErrorMode;
6770
use windows::Win32::System::IO::CreateIoCompletionPort;
6871
use windows::Win32::System::IO::GetQueuedCompletionStatusEx;
69-
use windows::Win32::System::IO::PostQueuedCompletionStatus;
7072
use windows::Win32::System::IO::OVERLAPPED;
7173
use windows::Win32::System::IO::OVERLAPPED_ENTRY;
74+
use windows::Win32::System::IO::PostQueuedCompletionStatus;
7275
use windows::Win32::System::Memory::GetProcessHeap;
7376
use windows::Win32::System::Threading::GetCurrentProcess;
7477
use windows::Win32::System::Threading::GetExitCodeProcess;
7578
use windows::Win32::System::Threading::GetProcessId;
79+
use windows::Win32::System::Threading::STD_OUTPUT_HANDLE;
7680
use windows::Win32::System::Threading::SetStdHandle;
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)]

‎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/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;

‎support/term/src/lib.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,18 @@ pub enum Error {
2121
pub fn enable_vt_and_utf8() {
2222
use windows::Win32::Foundation::GetStdHandle;
2323
use windows::Win32::Foundation::STD_OUTPUT_HANDLE;
24+
use windows::Win32::System::Console::CP_UTF8;
25+
use windows::Win32::System::Console::ENABLE_VIRTUAL_TERMINAL_PROCESSING;
2426
use windows::Win32::System::Console::GetConsoleMode;
2527
use windows::Win32::System::Console::SetConsoleMode;
2628
use windows::Win32::System::Console::SetConsoleOutputCP;
27-
use windows::Win32::System::Console::ENABLE_VIRTUAL_TERMINAL_PROCESSING;
28-
use windows::Win32::System::Console::CP_UTF8;
2929
// SAFETY: calling Windows APIs as documented.
3030
unsafe {
3131
let conout = GetStdHandle(STD_OUTPUT_HANDLE);
3232
let mut mode = 0;
3333
if GetConsoleMode(conout, &mut mode) != 0 {
3434
if mode & ENABLE_VIRTUAL_TERMINAL_PROCESSING.0 == 0 {
35-
SetConsoleMode(
36-
conout,
37-
mode | ENABLE_VIRTUAL_TERMINAL_PROCESSING.0,
38-
);
35+
SetConsoleMode(conout, mode | ENABLE_VIRTUAL_TERMINAL_PROCESSING.0);
3936
}
4037
SetConsoleOutputCP(CP_UTF8);
4138
}

‎vm/devices/storage/disk_vhdmp/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ mod virtdisk {
3434
)]
3535

3636
use std::os::windows::prelude::*;
37-
use windows::core::GUID;
3837
use windows::Win32::Foundation::BOOL;
39-
use windows::Win32::System::IO::OVERLAPPED;
4038
use windows::Win32::Security::SECURITY_DESCRIPTOR;
39+
use windows::Win32::System::IO::OVERLAPPED;
40+
use windows::core::GUID;
4141

4242
#[repr(C)]
4343
#[derive(Copy, Clone)]

0 commit comments

Comments
 (0)