servo: Merge #17080 - Update rustc (from jdm:updaterust); r=nox
authorJosh Matthews <josh@joshmatthews.net>
Tue, 30 May 2017 08:54:49 -0500
changeset 409450 2b4844f7a38ef8973b937690fc041ca63c496c2f
parent 409449 3c2d9164782ae36180f607c484a036395616adfa
child 409451 0710e3c80efacf47fa68a3a25379f6cc33dbe1af
push id7391
push usermtabara@mozilla.com
push dateMon, 12 Jun 2017 13:08:53 +0000
treeherdermozilla-beta@2191d7f87e2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnox
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
servo: Merge #17080 - Update rustc (from jdm:updaterust); r=nox This brings in https://github.com/rust-lang/rust/issues/39160 which significantly improves the default debugging experience on macOS. Source-Repo: https://github.com/servo/servo Source-Revision: ad4a5411a9620cee5cd93d5fe1a3dbad02cc0812
servo/components/profile/mem.rs
servo/rust-commit-hash
--- a/servo/components/profile/mem.rs
+++ b/servo/components/profile/mem.rs
@@ -500,33 +500,33 @@ mod system_reporter {
         Some(value as usize)
     }
 
     #[cfg(target_os = "windows")]
     fn jemalloc_stat(_value_name: &str) -> Option<usize> {
         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 {
             ::libc::sysconf(::libc::_SC_PAGESIZE) as usize
         }
     }
 
     #[cfg(target_os = "linux")]
     fn proc_self_statm_field(field: usize) -> Option<usize> {
         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());
         let s = option_try!(contents.split_whitespace().nth(field));
         let npages = option_try!(s.parse::<usize>().ok());
         Some(npages * page_size())
     }
 
--- a/servo/rust-commit-hash
+++ b/servo/rust-commit-hash
@@ -1,1 +1,1 @@
-e17a1227ac779a181b2839998e26a7e4e434c2a0
+03bed655142dd5e42ba4539de53b3663d8a123e0