Skip to content

Commit

Permalink
Rollup merge of #89141 - mbartlett21:patch-2, r=kennytm
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
the8472 authored Sep 21, 2021
2 parents 8d95bb2 + e4faf17 commit 17c9a22
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
3 changes: 2 additions & 1 deletion library/std/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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>`].
Expand Down Expand Up @@ -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 {
Expand Down
3 changes: 3 additions & 0 deletions library/std/src/time.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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`].
///
Expand Down

0 comments on commit 17c9a22

Please sign in to comment.