From b7a704b416d00d9244a3e2fe3147cfd3b636713c Mon Sep 17 00:00:00 2001
From: Matthew Rasmus <mattr@zzntd.com>
Date: Wed, 7 Jan 2015 20:26:49 -0800
Subject: [PATCH] Fix `renamed to into_inner()` warnings

---
 components/util/memory.rs | 2 +-
 components/util/task.rs   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/util/memory.rs b/components/util/memory.rs
index ce7933714c7..0c1d1dac3b1 100644
--- a/components/util/memory.rs
+++ b/components/util/memory.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 }
 }
diff --git a/components/util/task.rs b/components/util/task.rs
index 384e045fb38..2d07be08da3 100644
--- a/components/util/task.rs
+++ b/components/util/task.rs
@@ -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);