diff --git a/servo/components/profile/mem.rs b/servo/components/profile/mem.rs index 5fed9835414fc..6046d84145c17 100644 --- a/servo/components/profile/mem.rs +++ b/servo/components/profile/mem.rs @@ -505,11 +505,6 @@ mod system_reporter { None } - // Like std::macros::try!, but for Option<>. - macro_rules! option_try( - ($e:expr) => (match $e { Some(e) => e, None => return None }) - ); - #[cfg(target_os = "linux")] fn page_size() -> usize { unsafe { @@ -522,6 +517,11 @@ mod system_reporter { use std::fs::File; use std::io::Read; + // Like std::macros::try!, but for Option<>. + macro_rules! option_try( + ($e:expr) => (match $e { Some(e) => e, None => return None }) + ); + let mut f = option_try!(File::open("/proc/self/statm").ok()); let mut contents = String::new(); option_try!(f.read_to_string(&mut contents).ok()); diff --git a/servo/rust-commit-hash b/servo/rust-commit-hash index 22a3daa7544d9..ac9c5bcdd5567 100644 --- a/servo/rust-commit-hash +++ b/servo/rust-commit-hash @@ -1 +1 @@ -e17a1227ac779a181b2839998e26a7e4e434c2a0 +03bed655142dd5e42ba4539de53b3663d8a123e0