diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-07-30 09:14:58 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-07-30 09:14:58 +0100 |
| commit | c8573c418cb5240e0b60e93b15978b00e3ff0683 (patch) | |
| tree | 11b008556fd8d7f57bb0159f4046507dec2dd941 | |
| parent | 402433470a5f7cdb16083919c76f5d6f6f90ce3d (diff) | |
| parent | 4bab553029da31f3e90e99d8b83d160a34fdf4b2 (diff) | |
Merge #5580
5580: fix cast r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
| -rw-r--r-- | crates/ra_prof/src/memory_usage.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_prof/src/memory_usage.rs b/crates/ra_prof/src/memory_usage.rs index 22b61e4a2..c2ecbd33c 100644 --- a/crates/ra_prof/src/memory_usage.rs +++ b/crates/ra_prof/src/memory_usage.rs | |||
| @@ -26,7 +26,7 @@ impl MemoryUsage { | |||
| 26 | cfg_if! { | 26 | cfg_if! { |
| 27 | if #[cfg(target_os = "linux")] { | 27 | if #[cfg(target_os = "linux")] { |
| 28 | // Note: This is incredibly slow. | 28 | // Note: This is incredibly slow. |
| 29 | let alloc = unsafe { libc::mallinfo() }.uordblks as u32 as isize; | 29 | let alloc = unsafe { libc::mallinfo() }.uordblks as isize; |
| 30 | MemoryUsage { allocated: Bytes(alloc) } | 30 | MemoryUsage { allocated: Bytes(alloc) } |
| 31 | } else { | 31 | } else { |
| 32 | MemoryUsage { allocated: Bytes(0) } | 32 | MemoryUsage { allocated: Bytes(0) } |