Skip to content
Permalink
Browse files

Fix `renamed to into_inner()` warnings

  • Loading branch information
mttr committed Jan 8, 2015
1 parent fc49e10 commit b7a704b416d00d9244a3e2fe3147cfd3b636713c
Showing with 2 additions and 2 deletions.
  1. +1 −1 components/util/memory.rs
  2. +1 −1 components/util/task.rs
@@ -155,7 +155,7 @@ fn get_jemalloc_stat(name: &'static str) -> Option<u64> {
let mut oldlen = size_of::<size_t>() as size_t;
let rv: c_int;
unsafe {
rv = je_mallctl(c_name.unwrap(), oldp, &mut oldlen, null_mut(), 0);
rv = je_mallctl(c_name.into_inner(), oldp, &mut oldlen, null_mut(), 0);
}
if rv == 0 { Some(old as u64) } else { None }
}
@@ -33,7 +33,7 @@ pub fn spawn_named_with_send_on_failure<T: Send>(name: &'static str,
let watcher_name = format!("{}Watcher", watched_name);
TaskBuilder::new().named(watcher_name).spawn(proc() {
//rtinstrument::instrument(proc() {
match future_result.unwrap() {
match future_result.into_inner() {
Ok(()) => (),
Err(..) => {
debug!("{} failed, notifying constellation", name);

0 comments on commit b7a704b

Please sign in to comment.
You can’t perform that action at this time.