diff options
| author | bors <bors@rust-lang.org> | 2022-01-08 06:01:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-01-08 06:01:37 +0000 |
| commit | 84abaf3f7dc2b7c2b453deb18890d00d28ebd844 (patch) | |
| tree | c5b746f779fe6bd06d5859d8dcd95a7fddd60fa3 /library/std | |
| parent | e012a191d768adeda1ee36a99ef8b92d51920154 (diff) | |
| parent | 05cfc4f4a90bb87288d5a85df401af452f2269e0 (diff) | |
| download | rust-84abaf3f7dc2b7c2b453deb18890d00d28ebd844.tar.gz rust-84abaf3f7dc2b7c2b453deb18890d00d28ebd844.zip | |
Auto merge of #92664 - ehuss:rollup-t9yrvk5, r=ehuss
Rollup of 8 pull requests
Successful merges:
- #84640 (Implement `TryFrom<char>` for `u8`)
- #92336 (Remove &self from PrintState::to_string)
- #92375 (Consolidate checking for msvc when generating debuginfo)
- #92568 (Add note about non_exhaustive to variant_count)
- #92600 (Add some missing `#[must_use]` to some `f{32,64}` operations)
- #92610 (Create CSS class instead of using inline style for search results)
- #92632 (Implement stabilization of `#[feature(available_parallelism)]`)
- #92650 (Fix typo in `StableCrateId` docs)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'library/std')
| -rw-r--r-- | library/std/src/error.rs | 3 | ||||
| -rw-r--r-- | library/std/src/thread/mod.rs | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/library/std/src/error.rs b/library/std/src/error.rs index 6ae0bc47a94..ea0c230fa42 100644 --- a/library/std/src/error.rs +++ b/library/std/src/error.rs @@ -478,6 +478,9 @@ impl Error for char::DecodeUtf16Error { } } +#[stable(feature = "u8_from_char", since = "1.59.0")] +impl Error for char::TryFromCharError {} + #[unstable(feature = "map_try_insert", issue = "82766")] impl<'a, K: Debug + Ord, V: Debug> Error for crate::collections::btree_map::OccupiedError<'a, K, V> 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() } |