Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-13 10:54:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix renamed to into_inner() warnings

Browse source
This commit is contained in:
Matthew Rasmus 2015-01-07 20:26:49 -08:00
parent fc49e10f7e
commit b7a704b416
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/util/memory.rs
View file

@ -155,7 +155,7 @@ fn get_jemalloc_stat(name: &'static str) -> Option<u64> {
let mut oldlen = size_of::<size_t>() as size_t; let mut oldlen = size_of::<size_t>() as size_t;
let rv: c_int; let rv: c_int;
unsafe { 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 } if rv == 0 { Some(old as u64) } else { None }
} }

2
components/util/task.rs
View file

@ -33,7 +33,7 @@ pub fn spawn_named_with_send_on_failure<T: Send>(name: &'static str,
let watcher_name = format!("{}Watcher", watched_name); let watcher_name = format!("{}Watcher", watched_name);
TaskBuilder::new().named(watcher_name).spawn(proc() { TaskBuilder::new().named(watcher_name).spawn(proc() {
//rtinstrument::instrument(proc() { //rtinstrument::instrument(proc() {
match future_result.unwrap() { match future_result.into_inner() {
Ok(()) => (), Ok(()) => (),
Err(..) => { Err(..) => {
debug!("{} failed, notifying constellation", name); debug!("{} failed, notifying constellation", name);