diff options
| author | bors <bors@rust-lang.org> | 2018-06-27 23:41:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-06-27 23:41:23 +0000 |
| commit | 266afeb17c993f83d01d8129e97981a57bb442e0 (patch) | |
| tree | 9674856da47b18f31a9b7918ce89a6e6163f43c7 /src/libstd/thread | |
| parent | cd494c1f0915da00a63c03454a96d504afe764ff (diff) | |
| parent | 99a0d6bf0e478f7ad0dd06ccf2c4d83da69d3167 (diff) | |
| download | rust-266afeb17c993f83d01d8129e97981a57bb442e0.tar.gz rust-266afeb17c993f83d01d8129e97981a57bb442e0.zip | |
Auto merge of #51859 - kennytm:rollup, r=kennytm
Rollup of 7 pull requests Successful merges: - #49987 (Add str::split_ascii_whitespace.) - #50342 (Document round-off error in `.mod_euc()`-method, see issue #50179) - #51658 (Only do sanity check with debug assertions on) - #51799 (Lower case some feature gate error messages) - #51800 (Add a compiletest header for edition) - #51824 (Fix the error reference for LocalKey::try_with) - #51842 (Document that Layout::from_size_align does not allow align=0) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd/thread')
| -rw-r--r-- | src/libstd/thread/local.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/thread/local.rs b/src/libstd/thread/local.rs index 40d3280baa6..a170abb2628 100644 --- a/src/libstd/thread/local.rs +++ b/src/libstd/thread/local.rs @@ -276,7 +276,7 @@ impl<T: 'static> LocalKey<T> { /// /// This will lazily initialize the value if this thread has not referenced /// this key yet. If the key has been destroyed (which may happen if this is called - /// in a destructor), this function will return a `ThreadLocalError`. + /// in a destructor), this function will return an [`AccessError`](struct.AccessError.html). /// /// # Panics /// |