diff options
| author | the8472 <the8472@users.noreply.github.com> | 2021-09-21 22:54:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-21 22:54:07 +0200 |
| commit | 17c9a22d482acfac304f8d2c61cfea7e8cde8a9a (patch) | |
| tree | dd283f65b4c5a4461bf880ee85c039e51fc7556e /library | |
| parent | 8d95bb21460be6c3c8d72c5ad4827827b90d3112 (diff) | |
| parent | e4faf17437ae3aa7609a415d061817e40d3f9ab3 (diff) | |
| download | rust-17c9a22d482acfac304f8d2c61cfea7e8cde8a9a.tar.gz rust-17c9a22d482acfac304f8d2c61cfea7e8cde8a9a.zip | |
Rollup merge of #89141 - mbartlett21:patch-2, r=kennytm
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.
Diffstat (limited to 'library')
| -rw-r--r-- | library/std/src/error.rs | 3 | ||||
| -rw-r--r-- | library/std/src/time.rs | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/library/std/src/error.rs b/library/std/src/error.rs index 8164ec56985..cc4ea27e57e 100644 --- a/library/std/src/error.rs +++ b/library/std/src/error.rs @@ -31,6 +31,7 @@ use crate::num; use crate::str; use crate::string; use crate::sync::Arc; +use crate::time; /// `Error` is a trait representing the basic expectations for error values, /// 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 {} #[unstable(feature = "duration_checked_float", issue = "83400")] -impl Error for core::time::FromSecsError {} +impl Error for time::FromSecsError {} // Copied from `any.rs`. impl dyn Error + 'static { diff --git a/library/std/src/time.rs b/library/std/src/time.rs index e9207ee3617..bf3eb5b30c7 100644 --- a/library/std/src/time.rs +++ b/library/std/src/time.rs @@ -44,6 +44,9 @@ use crate::sys_common::FromInner; #[stable(feature = "time", since = "1.3.0")] pub use core::time::Duration; +#[unstable(feature = "duration_checked_float", issue = "83400")] +pub use core::time::FromSecsError; + /// A measurement of a monotonically nondecreasing clock. /// Opaque and useful only with [`Duration`]. /// |