diff options
| author | Oliver Schneider <git-spam-no-reply9815368754983@oli-obk.de> | 2017-12-11 10:01:29 +0100 |
|---|---|---|
| committer | Oliver Schneider <git-spam-no-reply9815368754983@oli-obk.de> | 2017-12-11 10:01:29 +0100 |
| commit | 7e5583b7f88c609492bf4f7b3a08313bc501b0ad (patch) | |
| tree | e23b45097d08976bd6f288402d6ec2ddbd8a982e /src/libstd/sys | |
| parent | 0f6b5b0423fed8c630f1b97968c3aebbed816f60 (diff) | |
| parent | 5f3bd73d8143f093c58f367b46434c2d555ef62d (diff) | |
| download | rust-7e5583b7f88c609492bf4f7b3a08313bc501b0ad.tar.gz rust-7e5583b7f88c609492bf4f7b3a08313bc501b0ad.zip | |
Merge remote-tracking branch 'origin/master' into miri
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/unix/thread.rs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/libstd/sys/unix/thread.rs b/src/libstd/sys/unix/thread.rs index 9da33f5adac..cb249af4254 100644 --- a/src/libstd/sys/unix/thread.rs +++ b/src/libstd/sys/unix/thread.rs @@ -255,10 +255,7 @@ pub mod guard { pub unsafe fn init() -> Option<usize> { let psize = os::page_size(); - let mut stackaddr = match get_stack_start() { - Some(addr) => addr, - None => return None, - }; + let mut stackaddr = get_stack_start()?; // Ensure stackaddr is page aligned! A parent process might // have reset RLIMIT_STACK to be non-page aligned. The |