Merge rust-lang#9229

bors[bot] · matklad · web-flow · commit c1c2c92e47d1 · 2021-06-12T12:56:58.000Z
9229: minor: squelch "unused" warning r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov &lt;aleksey.kladov@gmail.com&gt;
diff --git a/crates/profile/src/memory_usage.rs b/crates/profile/src/memory_usage.rs
@@ -56,7 +56,7 @@ impl MemoryUsage {
     }
 }
 
-#[cfg(all(target_os = "linux", target_env = "gnu"))]
+#[cfg(all(target_os = "linux", target_env = "gnu", not(feature = "jemalloc")))]
 fn memusage_linux() -> MemoryUsage {
     // Linux/glibc has 2 APIs for allocator introspection that we can use: mallinfo and mallinfo2.
     // mallinfo uses `int` fields and cannot handle memory usage exceeding 2 GB.

Original file line number	Diff line number	Diff line change
`@@ -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`	`60`	`fn memusage_linux() -> MemoryUsage {`
`61`	`61`	`// Linux/glibc has 2 APIs for allocator introspection that we can use: mallinfo and mallinfo2.`
`62`	`62`	// mallinfo uses `int` fields and cannot handle memory usage exceeding 2 GB.