Skip to content

Commit

Permalink
Auto merge of rust-lang#61491 - stjepang:impls-for-accesserror, r=dto…
Browse files Browse the repository at this point in the history
…lnay

Add a few trait impls for AccessError
  • Loading branch information
bors committed Aug 5, 2019
2 parents 4be0675 + d2c9c12 commit f6ecdc2
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions src/libstd/thread/local.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#![unstable(feature = "thread_local_internals", issue = "0")]

use crate::error::Error;
use crate::fmt;

/// A thread local storage key which owns its contents.
Expand Down Expand Up @@ -189,6 +190,7 @@ macro_rules! __thread_local_inner {

/// An error returned by [`LocalKey::try_with`](struct.LocalKey.html#method.try_with).
#[stable(feature = "thread_local_try_with", since = "1.26.0")]
#[derive(Clone, Copy, Eq, PartialEq)]
pub struct AccessError {
_private: (),
}
Expand All @@ -207,6 +209,9 @@ impl fmt::Display for AccessError {
}
}

#[stable(feature = "thread_local_try_with", since = "1.26.0")]
impl Error for AccessError {}

impl<T: 'static> LocalKey<T> {
#[doc(hidden)]
#[unstable(feature = "thread_local_internals",
Expand Down

0 comments on commit f6ecdc2

Please sign in to comment.