Implement RFC 909: move thread_local into thread #23557
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
cc @carllerche |
|
r? @brson (rust_highfive has picked a reviewer for you, use r? to override) |
| #[unstable(feature = "std_misc")] | ||
| #[deprecated(since = "1.0.0", reason = "use std::thread::ScopedKey instead")] | ||
| /// Deprecated: use `std::threaed::ScopedKey` instead. | ||
| pub use thread::ScopedKey as Key; |
There was a problem hiding this comment.
Due to pub use not actually issuing deprecation warnings, and the fact that this is such a relatively rarely imported module, I'd be fine just deleting this module.
|
Comments addressed. Thanks! |
|
@bors: r+ 218b5abf5f703555d50833af6bd3fd966c8901f6 |
|
@bors: r=alexcrichton 6143776 |
|
☔ The latest upstream changes (presumably #23512) made this pull request unmergeable. Please resolve the merge conflicts. |
|
🔒 Merge conflict |
| @@ -156,6 +190,22 @@ use time::Duration; | |||
| use sys::thread as imp; | |||
| use sys_common::{stack, thread_info}; | |||
|
|
|||
| //////////////////////////////////////////////////////////////////////////////// | |||
| // Thread-local storage | |||
There was a problem hiding this comment.
I don’t like these comments as they usually suggest the file is getting too big and should be split into more, instead of adding such comments.
This commit implements [RFC 909](rust-lang/rfcs#909): The `std::thread_local` module is now deprecated, and its contents are available directly in `std::thread` as `LocalKey`, `LocalKeyState`, and `ScopedKey`. The macros remain exactly as they were, which means little if any code should break. Nevertheless, this is technically a: [breaking-change] Closes rust-lang#23547
alexcrichton
added a commit
to alexcrichton/rust
that referenced
this pull request
Mar 23, 2015
This commit implements [RFC 909](rust-lang/rfcs#909): The `std::thread_local` module is now deprecated, and its contents are available directly in `std::thread` as `LocalKey`, `LocalKeyState`, and `ScopedKey`. The macros remain exactly as they were, which means little if any code should break. Nevertheless, this is technically a: [breaking-change] Closes rust-lang#23547
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit implements RFC 909:
The
std::thread_localmodule is now deprecated, and its contents areavailable directly in
std::threadasLocalKey,LocalKeyState, andScopedKey.The macros remain exactly as they were, which means little if any code
should break. Nevertheless, this is technically a:
[breaking-change]
Closes #23547