diff options
| author | bors <bors@rust-lang.org> | 2019-09-25 01:49:46 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-09-25 01:49:46 +0000 |
| commit | b7820b28937ba875521a2525cf75223c80faf9f2 (patch) | |
| tree | c22d390654ed86c407d5c5ed67489da0f2a5934d /src/libstd/thread | |
| parent | dcd473d7b554a82013913244da8aba1e22a002a9 (diff) | |
| parent | fa6dfc995e2b0719d874d0f29352657814ef0873 (diff) | |
| download | rust-b7820b28937ba875521a2525cf75223c80faf9f2.tar.gz rust-b7820b28937ba875521a2525cf75223c80faf9f2.zip | |
Auto merge of #64754 - Centril:rollup-iwtb5xd, r=Centril
Rollup of 7 pull requests Successful merges: - #64324 (rustc: Fix mixing crates with different `share_generics`) - #64428 (Error explanation e0524) - #64481 (A more explanatory thread local storage panic message) - #64599 (Rustdoc render async function re-export) - #64743 (Update cargo) - #64746 (Remove blanket silencing of "type annotation needed" errors) - #64753 (Don't emit explain with json short messages.) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd/thread')
| -rw-r--r-- | src/libstd/thread/local.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/thread/local.rs b/src/libstd/thread/local.rs index f85b5d632f1..e92c0d1c58e 100644 --- a/src/libstd/thread/local.rs +++ b/src/libstd/thread/local.rs @@ -236,8 +236,8 @@ impl<T: 'static> LocalKey<T> { #[stable(feature = "rust1", since = "1.0.0")] pub fn with<F, R>(&'static self, f: F) -> R where F: FnOnce(&T) -> R { - self.try_with(f).expect("cannot access a TLS value during or \ - after it is destroyed") + self.try_with(f).expect("cannot access a Thread Local Storage value \ + during or after destruction") } /// Acquires a reference to the value in this TLS key. |
