85 lines
2.8 KiB
Plaintext
85 lines
2.8 KiB
Plaintext
From 0bb583ffd38715fe48644e1ef9cbe9387578ac2c Mon Sep 17 00:00:00 2001
|
|
From: Niels Sascha Reedijk <niels.reedijk@gmail.com>
|
|
Date: Wed, 25 Dec 2019 14:21:38 +0100
|
|
Subject: Haiku-specific patches for Rust 1.40.0
|
|
|
|
|
|
diff --git a/Cargo.lock b/Cargo.lock
|
|
index f44ed3d..db0550e 100644
|
|
--- a/Cargo.lock
|
|
+++ b/Cargo.lock
|
|
@@ -1644,9 +1644,9 @@ dependencies = [
|
|
|
|
[[package]]
|
|
name = "libssh2-sys"
|
|
-version = "0.2.11"
|
|
+version = "0.2.13"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
-checksum = "126a1f4078368b163bfdee65fbab072af08a1b374a5551b21e87ade27b1fbf9d"
|
|
+checksum = "5fcd5a428a31cbbfe059812d74f4b6cd3b9b7426c2bdaec56993c5365da1c328"
|
|
dependencies = [
|
|
"cc",
|
|
"libc",
|
|
diff --git a/src/libstd/sys/unix/thread.rs b/src/libstd/sys/unix/thread.rs
|
|
index 72b0ac4..f97db49 100644
|
|
--- a/src/libstd/sys/unix/thread.rs
|
|
+++ b/src/libstd/sys/unix/thread.rs
|
|
@@ -177,8 +177,7 @@ impl Thread {
|
|
unsafe {
|
|
let ret = libc::pthread_join(self.id, ptr::null_mut());
|
|
mem::forget(self);
|
|
- assert!(ret == 0,
|
|
- "failed to join thread: {}", io::Error::from_raw_os_error(ret));
|
|
+ debug_assert_eq!(ret, 0);
|
|
}
|
|
}
|
|
|
|
diff --git a/src/libstd/sys/windows/c.rs b/src/libstd/sys/windows/c.rs
|
|
index b1f9d97..c07af0f 100644
|
|
--- a/src/libstd/sys/windows/c.rs
|
|
+++ b/src/libstd/sys/windows/c.rs
|
|
@@ -254,7 +254,6 @@ pub const FILE_END: DWORD = 2;
|
|
|
|
pub const WAIT_OBJECT_0: DWORD = 0x00000000;
|
|
pub const WAIT_TIMEOUT: DWORD = 258;
|
|
-pub const WAIT_FAILED: DWORD = 0xFFFFFFFF;
|
|
|
|
pub const PIPE_ACCESS_INBOUND: DWORD = 0x00000001;
|
|
pub const PIPE_ACCESS_OUTBOUND: DWORD = 0x00000002;
|
|
diff --git a/src/libstd/sys/windows/thread.rs b/src/libstd/sys/windows/thread.rs
|
|
index ebdf361..de198a6 100644
|
|
--- a/src/libstd/sys/windows/thread.rs
|
|
+++ b/src/libstd/sys/windows/thread.rs
|
|
@@ -58,11 +58,7 @@ impl Thread {
|
|
}
|
|
|
|
pub fn join(self) {
|
|
- let rc = unsafe { c::WaitForSingleObject(self.handle.raw(), c::INFINITE) };
|
|
- if rc == c::WAIT_FAILED {
|
|
- panic!("failed to join on thread: {}",
|
|
- io::Error::last_os_error());
|
|
- }
|
|
+ unsafe { c::WaitForSingleObject(self.handle.raw(), c::INFINITE); }
|
|
}
|
|
|
|
pub fn yield_now() {
|
|
diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs
|
|
index 0ffa6ac..490cb00 100644
|
|
--- a/src/libstd/thread/mod.rs
|
|
+++ b/src/libstd/thread/mod.rs
|
|
@@ -1435,11 +1435,6 @@ impl<T> JoinHandle<T> {
|
|
/// [`panic`]: ../../std/macro.panic.html
|
|
/// [atomic memory orderings]: ../../std/sync/atomic/index.html
|
|
///
|
|
- /// # Panics
|
|
- ///
|
|
- /// This function may panic on some platforms if a thread attempts to join
|
|
- /// itself or otherwise may create a deadlock with joining threads.
|
|
- ///
|
|
/// # Examples
|
|
///
|
|
/// ```
|
|
--
|
|
2.19.0
|
|
|