about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEric Huss <eric@huss.org>2022-01-07 20:21:01 -0800
committerGitHub <noreply@github.com>2022-01-07 20:21:01 -0800
commit10010685a961547746513d3d460435ddad8f2f07 (patch)
treeec47571532f8743006f60fe03f5dc8379e0a9c91
parent759b13eb6cb5288d6a81955a19158132c8ab461d (diff)
parent3632f41c78eb848f0ffae6bc347b27f7cf3eeda7 (diff)
downloadrust-10010685a961547746513d3d460435ddad8f2f07.tar.gz
rust-10010685a961547746513d3d460435ddad8f2f07.zip
Rollup merge of #92632 - yoshuawuyts:stabilize-available-parallelism, r=joshtriplett
Implement stabilization of `#[feature(available_parallelism)]`

Stabilized in https://github.com/rust-lang/rust/issues/74479#issuecomment-984379800. Closes https://github.com/rust-lang/rust/issues/74479. Thanks!

cc/ ``@rust-lang/libs-api``
-rw-r--r--library/std/src/thread/mod.rs3
-rw-r--r--library/test/src/lib.rs1
2 files changed, 1 insertions, 3 deletions
diff --git a/library/std/src/thread/mod.rs b/library/std/src/thread/mod.rs
index 9f7f10d0d00..ae4b65871ec 100644
--- a/library/std/src/thread/mod.rs
+++ b/library/std/src/thread/mod.rs
@@ -1504,7 +1504,6 @@ fn _assert_sync_and_send() {
 ///
 /// ```
 /// # #![allow(dead_code)]
-/// #![feature(available_parallelism)]
 /// use std::{io, thread};
 ///
 /// fn main() -> io::Result<()> {
@@ -1516,7 +1515,7 @@ fn _assert_sync_and_send() {
 #[doc(alias = "available_concurrency")] // Alias for a previous name we gave this API on unstable.
 #[doc(alias = "hardware_concurrency")] // Alias for C++ `std::thread::hardware_concurrency`.
 #[doc(alias = "num_cpus")] // Alias for a popular ecosystem crate which provides similar functionality.
-#[unstable(feature = "available_parallelism", issue = "74479")]
+#[stable(feature = "available_parallelism", since = "1.59.0")]
 pub fn available_parallelism() -> io::Result<NonZeroUsize> {
     imp::available_parallelism()
 }
diff --git a/library/test/src/lib.rs b/library/test/src/lib.rs
index 608e587cf34..fad83094cdf 100644
--- a/library/test/src/lib.rs
+++ b/library/test/src/lib.rs
@@ -16,7 +16,6 @@
 #![unstable(feature = "test", issue = "50297")]
 #![doc(test(attr(deny(warnings))))]
 #![feature(nll)]
-#![feature(available_parallelism)]
 #![feature(bench_black_box)]
 #![feature(internal_output_capture)]
 #![feature(staged_api)]