diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-06-12 13:56:58 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-06-12 13:56:58 +0100 |
| commit | c1c2c92e47d1db2386f40c446c5a5122912048a7 (patch) | |
| tree | c32214c7a0f30d3ad2f6a641425fac10bf0053dd /crates | |
| parent | 409f5fb563bfc992e4d05245d5c17e77ff8e2762 (diff) | |
| parent | 787d980c712e0a9a41b63f44fa075e9bf9497746 (diff) | |
Merge #9229
9229: minor: squelch "unused" warning r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates')
| -rw-r--r-- | crates/profile/src/memory_usage.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/profile/src/memory_usage.rs b/crates/profile/src/memory_usage.rs index 0b0a196ae..fbcb9e3c2 100644 --- a/crates/profile/src/memory_usage.rs +++ b/crates/profile/src/memory_usage.rs | |||
| @@ -56,7 +56,7 @@ impl MemoryUsage { | |||
| 56 | } | 56 | } |
| 57 | } | 57 | } |
| 58 | 58 | ||
| 59 | #[cfg(all(target_os = "linux", target_env = "gnu"))] | 59 | #[cfg(all(target_os = "linux", target_env = "gnu", not(feature = "jemalloc")))] |
| 60 | fn memusage_linux() -> MemoryUsage { | 60 | fn memusage_linux() -> MemoryUsage { |
| 61 | // Linux/glibc has 2 APIs for allocator introspection that we can use: mallinfo and mallinfo2. | 61 | // Linux/glibc has 2 APIs for allocator introspection that we can use: mallinfo and mallinfo2. |
| 62 | // mallinfo uses `int` fields and cannot handle memory usage exceeding 2 GB. | 62 | // mallinfo uses `int` fields and cannot handle memory usage exceeding 2 GB. |