diff options
| author | Sebastian Holmin <sebastian.holmin@mullvad.net> | 2025-07-10 09:50:31 +0200 |
|---|---|---|
| committer | Sebastian Holmin <sebastian.holmin@mullvad.net> | 2025-07-10 09:50:31 +0200 |
| commit | 8c3714702c0020205a5c11f19809fde644c5692b (patch) | |
| tree | 22fe8a41c6b5fa184780744388e2276e66ead9fa /desktop | |
| parent | 2cdb3c216a5ff3e0a12224666339f4444d2e18b8 (diff) | |
| parent | 527c8daed79d37e2161e0ecb9bce20bd01b9ffc4 (diff) | |
| download | mullvadvpn-8c3714702c0020205a5c11f19809fde644c5692b.tar.xz mullvadvpn-8c3714702c0020205a5c11f19809fde644c5692b.zip | |
Merge branch 'switch-to-rust-2024-des-2199'
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/packages/nseventforwarder/nseventforwarder-rs/lib.rs | 2 | ||||
| -rw-r--r-- | desktop/packages/windows-utils/windows-utils-rs/shortcut.rs | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/desktop/packages/nseventforwarder/nseventforwarder-rs/lib.rs b/desktop/packages/nseventforwarder/nseventforwarder-rs/lib.rs index 152019828e..bd73c450d5 100644 --- a/desktop/packages/nseventforwarder/nseventforwarder-rs/lib.rs +++ b/desktop/packages/nseventforwarder/nseventforwarder-rs/lib.rs @@ -2,7 +2,7 @@ #![cfg(target_os = "macos")] use std::ptr::NonNull; -use std::sync::{mpsc, Arc, Mutex}; +use std::sync::{Arc, Mutex, mpsc}; use std::thread::JoinHandle; use block2::RcBlock; diff --git a/desktop/packages/windows-utils/windows-utils-rs/shortcut.rs b/desktop/packages/windows-utils/windows-utils-rs/shortcut.rs index 3d912711e1..8d7a52af0d 100644 --- a/desktop/packages/windows-utils/windows-utils-rs/shortcut.rs +++ b/desktop/packages/windows-utils/windows-utils-rs/shortcut.rs @@ -1,14 +1,14 @@ use std::marker::PhantomData; use std::string::FromUtf16Error; -use std::sync::{mpsc, OnceLock}; +use std::sync::{OnceLock, mpsc}; use neon::prelude::*; -use windows::core::{Interface, HSTRING, PCWSTR}; use windows::Win32::System::Com::{ - CoCreateInstance, CoInitializeEx, CoUninitialize, IPersistFile, CLSCTX_INPROC_SERVER, - COINIT_APARTMENTTHREADED, STGM_READ, + CLSCTX_INPROC_SERVER, COINIT_APARTMENTTHREADED, CoCreateInstance, CoInitializeEx, + CoUninitialize, IPersistFile, STGM_READ, }; -use windows::Win32::UI::Shell::{IShellLinkW, ShellLink, SLGP_UNCPRIORITY}; +use windows::Win32::UI::Shell::{IShellLinkW, SLGP_UNCPRIORITY, ShellLink}; +use windows::core::{HSTRING, Interface, PCWSTR}; /// Messages that can be sent to the thread enum Message { |
