mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #89141 - mbartlett21:patch-2, r=kennytm

Browse Source 
Impl `Error` for `FromSecsError` without foreign type

Using it through the crate-local path in `std` means that it shouldn't make an "Implementations on Foreign Types" section in the `std::error::Error` docs.
This commit is contained in:
the8472 2021-09-21 22:54:07 +02:00 committed by GitHub
commit 17c9a22d48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
library/std/src/error.rs
View File

@ -31,6 +31,7 @@ use crate::num;
use crate::str; use crate::str;
use crate::string; use crate::string;
use crate::sync::Arc; use crate::sync::Arc;
use crate::time;
/// `Error` is a trait representing the basic expectations for error values, /// `Error` is a trait representing the basic expectations for error values,
/// i.e., values of type `E` in [`Result<T, E>`]. /// i.e., values of type `E` in [`Result<T, E>`].
@ -598,7 +599,7 @@ impl Error for char::ParseCharError {
impl Error for alloc::collections::TryReserveError {} impl Error for alloc::collections::TryReserveError {}
#[unstable(feature = "duration_checked_float", issue = "83400")] #[unstable(feature = "duration_checked_float", issue = "83400")]
impl Error for core::time::FromSecsError {} impl Error for time::FromSecsError {}
// Copied from `any.rs`. // Copied from `any.rs`.
impl dyn Error + 'static { impl dyn Error + 'static {

3
library/std/src/time.rs
View File

@ -44,6 +44,9 @@ use crate::sys_common::FromInner;
#[stable(feature = "time", since = "1.3.0")] #[stable(feature = "time", since = "1.3.0")]
pub use core::time::Duration; pub use core::time::Duration;
#[unstable(feature = "duration_checked_float", issue = "83400")]
pub use core::time::FromSecsError;
/// A measurement of a monotonically nondecreasing clock. /// A measurement of a monotonically nondecreasing clock.
/// Opaque and useful only with [`Duration`]. /// Opaque and useful only with [`Duration`].
/// ///