Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update rustc. #17080

Merged
merged 2 commits into from May 30, 2017
Merged

Update rustc. #17080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74ff7f9
Update rustc to 03bed655142dd5e42ba4539de53b3663d8a123e0.
jdm May 29, 2017
be98fef
Conditionally define macro that's only used in Linux builds.
jdm May 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions components/profile/mem.rs
View file
Open in desktop
Expand Up @@ -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 {
Expand All @@ -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());
Expand Down
2 changes: 1 addition & 1 deletion rust-commit-hash
View file
Open in desktop
@@ -1 +1 @@
e17a1227ac779a181b2839998e26a7e4e434c2a0
03bed655142dd5e42ba4539de53b3663d8a123e0