diff --git a/src/components/util/memory.rs b/src/components/util/memory.rs index 7dc98013912..1484b1cfd9f 100644 --- a/src/components/util/memory.rs +++ b/src/components/util/memory.rs @@ -156,7 +156,7 @@ fn get_jemalloc_stat(name: &'static str) -> Option { unsafe { rv = je_mallctl(c_name.unwrap(), oldp, &mut oldlen, mut_null(), 0); } - if rv == 0 { Some(old) } else { None } + if rv == 0 { Some(old as u64) } else { None } } // Like std::macros::try!, but for Option<>. diff --git a/src/support/stringcache/string-cache b/src/support/stringcache/string-cache index 00caade7269..8828119c5d7 160000 --- a/src/support/stringcache/string-cache +++ b/src/support/stringcache/string-cache @@ -1 +1 @@ -Subproject commit 00caade726945dd8a7bbe81d4f8e77c0177d8ee3 +Subproject commit 8828119c5d789452685c82fa71a1dec7f6bd4b0e