Unnamed repository; edit this file 'description' to name the repository.
Auto merge of #17168 - kennykerr:rust-analyzer-windows-sys, r=lnicola
Update `rust-analyzer` to use `windows-sys` crate
I noticed that the `rust-analyzer` project already depends on `windows-sys`. This update merely replaces the remaining direct dependencies on the older `winapi` crate with `windows-sys` dependencies.
Originally posted here: https://github.com/rust-lang/rust/pull/124578
| -rw-r--r-- | Cargo.lock | 6 | ||||
| -rw-r--r-- | crates/profile/Cargo.toml | 2 | ||||
| -rw-r--r-- | crates/profile/src/memory_usage.rs | 3 | ||||
| -rw-r--r-- | crates/rust-analyzer/Cargo.toml | 2 | ||||
| -rw-r--r-- | crates/rust-analyzer/src/main_loop.rs | 2 | ||||
| -rw-r--r-- | crates/stdx/Cargo.toml | 2 | ||||
| -rw-r--r-- | crates/stdx/src/process.rs | 2 |
7 files changed, 9 insertions, 10 deletions
diff --git a/Cargo.lock b/Cargo.lock index d3400eefb0..9c67be7cb9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1402,7 +1402,7 @@ dependencies = [ "perf-event", "tikv-jemalloc-ctl", "tracing", - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -1682,7 +1682,7 @@ dependencies = [ "vfs", "vfs-notify", "walkdir", - "winapi", + "windows-sys 0.52.0", "xflags", "xshell", ] @@ -1904,7 +1904,7 @@ dependencies = [ "jod-thread", "libc", "miow", - "winapi", + "windows-sys 0.52.0", ] [[package]] diff --git a/crates/profile/Cargo.toml b/crates/profile/Cargo.toml index a87b67f5c6..11a8e7af56 100644 --- a/crates/profile/Cargo.toml +++ b/crates/profile/Cargo.toml @@ -24,7 +24,7 @@ jemalloc-ctl = { version = "0.5.0", package = "tikv-jemalloc-ctl", optional = tr perf-event = "=0.4.7" [target.'cfg(windows)'.dependencies] -winapi = { version = "0.3.9", features = ["processthreadsapi", "psapi"] } +windows-sys = { version = "0.52", features = ["Win32_System_Threading", "Win32_System_ProcessStatus"] } [features] cpu_profiler = [] diff --git a/crates/profile/src/memory_usage.rs b/crates/profile/src/memory_usage.rs index f089c78e0c..660afff3dc 100644 --- a/crates/profile/src/memory_usage.rs +++ b/crates/profile/src/memory_usage.rs @@ -37,8 +37,7 @@ impl MemoryUsage { // There doesn't seem to be an API for determining heap usage, so we try to // approximate that by using the Commit Charge value. - use winapi::um::processthreadsapi::*; - use winapi::um::psapi::*; + use windows_sys::Win32::System::{Threading::*, ProcessStatus::*}; use std::mem::{MaybeUninit, size_of}; let proc = unsafe { GetCurrentProcess() }; diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml index cd3349899e..3d8e763721 100644 --- a/crates/rust-analyzer/Cargo.toml +++ b/crates/rust-analyzer/Cargo.toml @@ -69,7 +69,7 @@ vfs.workspace = true paths.workspace = true [target.'cfg(windows)'.dependencies] -winapi = "0.3.9" +windows-sys = { version = "0.52", features = ["Win32_System_Threading"] } [target.'cfg(not(target_env = "msvc"))'.dependencies] jemallocator = { version = "0.5.0", package = "tikv-jemallocator", optional = true } diff --git a/crates/rust-analyzer/src/main_loop.rs b/crates/rust-analyzer/src/main_loop.rs index aee3162308..5435be3dc2 100644 --- a/crates/rust-analyzer/src/main_loop.rs +++ b/crates/rust-analyzer/src/main_loop.rs @@ -45,7 +45,7 @@ pub fn main_loop(config: Config, connection: Connection) -> anyhow::Result<()> { // https://github.com/rust-lang/rust-analyzer/issues/2835 #[cfg(windows)] unsafe { - use winapi::um::processthreadsapi::*; + use windows_sys::Win32::System::Threading::*; let thread = GetCurrentThread(); let thread_priority_above_normal = 1; SetThreadPriority(thread, thread_priority_above_normal); diff --git a/crates/stdx/Cargo.toml b/crates/stdx/Cargo.toml index 6cca116335..99824df1f6 100644 --- a/crates/stdx/Cargo.toml +++ b/crates/stdx/Cargo.toml @@ -22,7 +22,7 @@ itertools.workspace = true [target.'cfg(windows)'.dependencies] miow = "0.6.0" -winapi = { version = "0.3.9", features = ["winerror"] } +windows-sys = { version = "0.52", features = ["Win32_Foundation"] } [features] # Uncomment to enable for the whole crate graph diff --git a/crates/stdx/src/process.rs b/crates/stdx/src/process.rs index e6935f06b2..c54d850d7b 100644 --- a/crates/stdx/src/process.rs +++ b/crates/stdx/src/process.rs @@ -162,7 +162,7 @@ mod imp { pipe::NamedPipe, Overlapped, }; - use winapi::shared::winerror::ERROR_BROKEN_PIPE; + use windows_sys::Win32::Foundation::ERROR_BROKEN_PIPE; struct Pipe<'a> { dst: &'a mut Vec<u8>, |