diff options
| author | bors <bors@rust-lang.org> | 2017-08-27 04:20:28 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-08-27 04:20:28 +0000 |
| commit | 93cdf5e3c45a0578c79afe8563065d07e5f6984f (patch) | |
| tree | 89335a69e7db0057a54ade2e1365349fa26a9c0d /src/libstd/sys/unix | |
| parent | 3e964612302e649e3c59a0b556001d801357306d (diff) | |
| parent | dc7c7ba0c9f401f5597a245e05ee9e8d760715d3 (diff) | |
| download | rust-93cdf5e3c45a0578c79afe8563065d07e5f6984f.tar.gz rust-93cdf5e3c45a0578c79afe8563065d07e5f6984f.zip | |
Auto merge of #44112 - alexcrichton:thread-join, r=sfackler
std: Handle OS errors when joining threads Also add to the documentation that the `join` method can panic. cc #34971 cc #43539
Diffstat (limited to 'src/libstd/sys/unix')
| -rw-r--r-- | src/libstd/sys/unix/thread.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstd/sys/unix/thread.rs b/src/libstd/sys/unix/thread.rs index 15747746611..40f1d6a6db1 100644 --- a/src/libstd/sys/unix/thread.rs +++ b/src/libstd/sys/unix/thread.rs @@ -168,7 +168,8 @@ impl Thread { unsafe { let ret = libc::pthread_join(self.id, ptr::null_mut()); mem::forget(self); - debug_assert_eq!(ret, 0); + assert!(ret == 0, + "failed to join thread: {}", io::Error::from_raw_os_error(ret)); } } |