diff options
| author | bors <bors@rust-lang.org> | 2017-07-13 10:50:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-07-13 10:50:23 +0000 |
| commit | b2c0707872082c890f332178f59fd02eea5b98f3 (patch) | |
| tree | e6c9eaa93dfbb471c9aaa96965d6265c1a3965de /src/libstd/thread/mod.rs | |
| parent | 06ffdeb7816ae62175febdfa18534290bf5ad573 (diff) | |
| parent | a301f84b6afc30c58dede5ddd804890f7a6f20a5 (diff) | |
| download | rust-b2c0707872082c890f332178f59fd02eea5b98f3.tar.gz rust-b2c0707872082c890f332178f59fd02eea5b98f3.zip | |
Auto merge of #43158 - PlasmaPower:thread-local-try-with, r=alexcrichton
Thread local try with https://github.com/rust-lang/rfcs/pull/2030 was turned into this PR (the RFC was closed, but it looks like just a PR should be good). See also: state stabilization issue: #27716 `try_with` is used in two places in std: stdio and thread_info. In stdio, it would be better if the result was passed to the closure, but in thread_info, it's better as is where the result is returned from the function call. I'm not sure which is better, but I prefer the current way as it better represents the scope.
Diffstat (limited to 'src/libstd/thread/mod.rs')
| -rw-r--r-- | src/libstd/thread/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs index f4fe52ca3b3..07a3a01ce86 100644 --- a/src/libstd/thread/mod.rs +++ b/src/libstd/thread/mod.rs @@ -159,7 +159,7 @@ use time::Duration; #[macro_use] mod local; #[stable(feature = "rust1", since = "1.0.0")] -pub use self::local::{LocalKey, LocalKeyState}; +pub use self::local::{LocalKey, LocalKeyState, AccessError}; // The types used by the thread_local! macro to access TLS keys. Note that there // are two types, the "OS" type and the "fast" type. The OS thread local key |