diff options
| author | bors <bors@rust-lang.org> | 2022-03-31 05:12:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-03-31 05:12:45 +0000 |
| commit | ffaf6f0d0ccfbc76da00baded073d10f05ffcbd1 (patch) | |
| tree | c52a1a6ff3a746fa75dc69b5edd1a15c7dfcfaae /library/std/src | |
| parent | a39ac5ae175e0f9f910b1800a430b488ec0f2105 (diff) | |
| parent | 1b7d6dbd3043a002279e9ebafc0b082f4d891200 (diff) | |
| download | rust-ffaf6f0d0ccfbc76da00baded073d10f05ffcbd1.tar.gz rust-ffaf6f0d0ccfbc76da00baded073d10f05ffcbd1.zip | |
Auto merge of #95506 - Dylan-DPC:rollup-b6kxzjc, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #95130 (Stabilize thread::is_finished) - #95263 (Restore `impl Future<Output = Type>` to async blocks) - #95471 (Don't ICE when opaque types get their hidden type constrained again.) - #95491 (Stabilize feature vec_retain_mut on Vec and VecDeque) - #95497 (Spellchecking compiler comments) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/thread/mod.rs | 2 | ||||
| -rw-r--r-- | library/std/src/thread/scoped.rs | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/library/std/src/thread/mod.rs b/library/std/src/thread/mod.rs index ae292caaed9..5309dc47ac4 100644 --- a/library/std/src/thread/mod.rs +++ b/library/std/src/thread/mod.rs @@ -1471,7 +1471,7 @@ impl<T> JoinHandle<T> { /// /// This function does not block. To block while waiting on the thread to finish, /// use [`join`][Self::join]. - #[unstable(feature = "thread_is_running", issue = "90470")] + #[stable(feature = "thread_is_running", since = "1.61.0")] pub fn is_finished(&self) -> bool { Arc::strong_count(&self.0.packet) == 1 } diff --git a/library/std/src/thread/scoped.rs b/library/std/src/thread/scoped.rs index 07e113f3b62..eeccc99b3a3 100644 --- a/library/std/src/thread/scoped.rs +++ b/library/std/src/thread/scoped.rs @@ -316,7 +316,6 @@ impl<'scope, T> ScopedJoinHandle<'scope, T> { /// /// This function does not block. To block while waiting on the thread to finish, /// use [`join`][Self::join]. - #[unstable(feature = "thread_is_running", issue = "90470")] pub fn is_finished(&self) -> bool { Arc::strong_count(&self.0.packet) == 1 } |