Add extensions for ScopedJoinHandle like for JoinHandle

Author: Rosdf

library/std/src/os/unix/thread.rs

@@ -7,7 +7,7 @@
 #[allow(deprecated)]
 use crate::os::unix::raw::pthread_t;
 use crate::sys_common::{AsInner, IntoInner};
-use crate::thread::JoinHandle;
+use crate::thread::{JoinHandle, ScopedJoinHandle};
 
 #[stable(feature = "thread_extensions", since = "1.9.0")]
 #[allow(deprecated)]
@@ -39,3 +39,14 @@ impl<T> JoinHandleExt for JoinHandle<T> {
         self.into_inner().into_id() as RawPthread
     }
 }
+
+#[stable(feature = "scoped_thread_extensions", since = "CURRENT_RUSTC_VERSION")]
+impl<T> JoinHandleExt for ScopedJoinHandle<'_, T> {
+    fn as_pthread_t(&self) -> RawPthread {
+        self.as_inner().id() as RawPthread
+    }
+
+    fn into_pthread_t(self) -> RawPthread {
+        self.into_inner().into_id() as RawPthread
+    }
+}

library/std/src/os/windows/io/handle.rs

@@ -660,3 +660,19 @@ impl<T> From<crate::thread::JoinHandle<T>> for OwnedHandle {
         join_handle.into_inner().into_handle().into_inner()
     }
 }
+
+#[stable(feature = "scoped_thread_extensions", since = "CURRENT_RUSTC_VERSION")]
+impl<T> AsHandle for crate::thread::ScopedJoinHandle<'_, T> {
+    #[inline]
+    fn as_handle(&self) -> BorrowedHandle<'_> {
+        unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
+    }
+}
+
+#[stable(feature = "scoped_thread_extensions", since = "CURRENT_RUSTC_VERSION")]
+impl<T> From<crate::thread::ScopedJoinHandle<'_, T>> for OwnedHandle {
+    #[inline]
+    fn from(join_handle: crate::thread::ScopedJoinHandle<'_, T>) -> OwnedHandle {
+        join_handle.into_inner().into_handle().into_inner()
+    }
+}

library/std/src/os/windows/thread.rs

@@ -23,3 +23,19 @@ impl<T> IntoRawHandle for thread::JoinHandle<T> {
         self.into_inner().into_handle().into_raw_handle() as *mut _
     }
 }
+
+#[stable(feature = "scoped_thread_extensions", since = "CURRENT_RUSTC_VERSION")]
+impl<T> AsRawHandle for thread::ScopedJoinHandle<'_, T> {
+    #[inline]
+    fn as_raw_handle(&self) -> RawHandle {
+        self.as_inner().handle().as_raw_handle() as *mut _
+    }
+}
+
+#[stable(feature = "scoped_thread_extensions", since = "CURRENT_RUSTC_VERSION")]
+impl<T> IntoRawHandle for thread::ScopedJoinHandle<'_, T> {
+    #[inline]
+    fn into_raw_handle(self) -> RawHandle {
+        self.into_inner().into_handle().into_raw_handle() as *mut _
+    }
+}

library/std/src/thread/scoped.rs

@@ -1,9 +1,10 @@
-use super::{Builder, JoinInner, Result, Thread, current_or_unnamed};
+use super::{Builder, JoinInner, Result, Thread, current_or_unnamed, imp};
 use crate::marker::PhantomData;
 use crate::panic::{AssertUnwindSafe, catch_unwind, resume_unwind};
 use crate::sync::Arc;
 use crate::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
 use crate::{fmt, io};
+use crate::sys_common::{AsInner, IntoInner};
 
 /// A scope to spawn scoped threads in.
 ///
@@ -347,3 +348,15 @@ impl<'scope, T> fmt::Debug for ScopedJoinHandle<'scope, T> {
         f.debug_struct("ScopedJoinHandle").finish_non_exhaustive()
     }
 }
+
+impl<T> AsInner<imp::Thread> for ScopedJoinHandle<'_, T> {
+    fn as_inner(&self) -> &imp::Thread {
+        &self.0.native
+    }
+}
+
+impl<T> IntoInner<imp::Thread> for ScopedJoinHandle<'_, T> {
+    fn into_inner(self) -> imp::Thread {
+        self.0.native
+    }
+}