diff options
| author | Corey Farwell <coreyf@rwell.org> | 2017-02-05 09:14:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-05 09:14:45 -0500 |
| commit | 65b24779a95d306ac9abd73bf430380e925e765e (patch) | |
| tree | 57ea8308bbbb9640b475daa483f7dd232ea531a4 /src/libstd/thread | |
| parent | 5cfd5eda97d69e04cd4f92d500dbcbbc114178f4 (diff) | |
| parent | 9128f6100c9bfe2c2c22d85ccec92f01166f5d25 (diff) | |
| download | rust-65b24779a95d306ac9abd73bf430380e925e765e.tar.gz rust-65b24779a95d306ac9abd73bf430380e925e765e.zip | |
Rollup merge of #39393 - ollie27:stab_impls, r=alexcrichton
Fix a few impl stability attributes The versions show up in rustdoc.
Diffstat (limited to 'src/libstd/thread')
| -rw-r--r-- | src/libstd/thread/local.rs | 3 | ||||
| -rw-r--r-- | src/libstd/thread/mod.rs | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/libstd/thread/local.rs b/src/libstd/thread/local.rs index 01584979aab..5166ddf8a21 100644 --- a/src/libstd/thread/local.rs +++ b/src/libstd/thread/local.rs @@ -99,7 +99,7 @@ pub struct LocalKey<T: 'static> { init: fn() -> T, } -#[stable(feature = "std_debug", since = "1.15.0")] +#[stable(feature = "std_debug", since = "1.16.0")] impl<T: 'static> fmt::Debug for LocalKey<T> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { f.pad("LocalKey { .. }") @@ -332,7 +332,6 @@ pub mod os { marker: marker::PhantomData<Cell<T>>, } - #[stable(feature = "std_debug", since = "1.15.0")] impl<T> fmt::Debug for Key<T> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { f.pad("Key { .. }") diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs index 8789006436c..93e320c4522 100644 --- a/src/libstd/thread/mod.rs +++ b/src/libstd/thread/mod.rs @@ -698,7 +698,7 @@ impl ThreadId { } } -#[stable(feature = "std_debug", since = "1.15.0")] +#[unstable(feature = "thread_id", issue = "21507")] impl fmt::Debug for ThreadId { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { f.pad("ThreadId { .. }") @@ -1002,7 +1002,7 @@ impl<T> IntoInner<imp::Thread> for JoinHandle<T> { fn into_inner(self) -> imp::Thread { self.0.native.unwrap() } } -#[stable(feature = "std_debug", since = "1.15.0")] +#[stable(feature = "std_debug", since = "1.16.0")] impl<T> fmt::Debug for JoinHandle<T> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { f.pad("JoinHandle { .. }") |