diff options
| author | Chayim Refael Friedman <chayimfr@gmail.com> | 2025-04-16 14:08:37 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-16 14:08:37 +0000 |
| commit | 70ff4124259a3c9d4bffcdaf20d6f1ecd64b5286 (patch) | |
| tree | 2bf05059147e5844b57d11812da24f28358fbb92 | |
| parent | 54c61eb8491061f6a19ce214dc6f347aa9b097e2 (diff) | |
| parent | 6ac25306fddb5bbf8637d8cf1376cd691e56c52f (diff) | |
| download | rust-70ff4124259a3c9d4bffcdaf20d6f1ecd64b5286.tar.gz rust-70ff4124259a3c9d4bffcdaf20d6f1ecd64b5286.zip | |
Merge pull request #19605 from ChayimFriedman2/fix-sig
minor: Fix signature of libc memory usage function on Linux
| -rw-r--r-- | src/tools/rust-analyzer/crates/profile/src/memory_usage.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/rust-analyzer/crates/profile/src/memory_usage.rs b/src/tools/rust-analyzer/crates/profile/src/memory_usage.rs index f5b8eca060f..1462259d627 100644 --- a/src/tools/rust-analyzer/crates/profile/src/memory_usage.rs +++ b/src/tools/rust-analyzer/crates/profile/src/memory_usage.rs @@ -78,7 +78,8 @@ fn memusage_linux() -> MemoryUsage { let alloc = unsafe { libc::mallinfo() }.uordblks as isize; MemoryUsage { allocated: Bytes(alloc) } } else { - let mallinfo2: fn() -> libc::mallinfo2 = unsafe { std::mem::transmute(mallinfo2) }; + let mallinfo2: extern "C" fn() -> libc::mallinfo2 = + unsafe { std::mem::transmute(mallinfo2) }; let alloc = mallinfo2().uordblks as isize; MemoryUsage { allocated: Bytes(alloc) } } |