mirror of
https://github.com/servo/servo.git
synced 2025-06-24 17:14:33 +01:00
Auto merge of #17080 - jdm:updaterust, r=nox
Update rustc. This brings in https://github.com/rust-lang/rust/issues/39160 which significantly improves the default debugging experience on macOS. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17080) <!-- Reviewable:end -->
This commit is contained in:
commit
ad4a5411a9
2 changed files with 6 additions and 6 deletions
|
@ -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());
|
||||
|
|
|
@ -1 +1 @@
|
|||
e17a1227ac779a181b2839998e26a7e4e434c2a0
|
||||
03bed655142dd5e42ba4539de53b3663d8a123e0
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue