diff options
| author | Aaron Turon <aturon@mozilla.com> | 2015-03-20 00:46:13 -0700 |
|---|---|---|
| committer | Aaron Turon <aturon@mozilla.com> | 2015-03-23 11:28:54 -0700 |
| commit | 6bd3ab0d8140053475a901ad4e2e80e98955bcb0 (patch) | |
| tree | b8d6a880328d2fd590634319a047cabe66630632 /src/libstd/lib.rs | |
| parent | b0aad7dd4fad8d7e2e2f877a511a637258949597 (diff) | |
| download | rust-6bd3ab0d8140053475a901ad4e2e80e98955bcb0.tar.gz rust-6bd3ab0d8140053475a901ad4e2e80e98955bcb0.zip | |
Implement RFC 909: move thread_local into thread
This commit implements [RFC 909](https://github.com/rust-lang/rfcs/pull/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 #23547
Diffstat (limited to 'src/libstd/lib.rs')
| -rw-r--r-- | src/libstd/lib.rs | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index b055796ba54..970074f7930 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -249,30 +249,23 @@ pub mod num; /* Runtime and platform support */ #[macro_use] -pub mod thread_local; +pub mod thread; +pub mod collections; pub mod dynamic_lib; +pub mod env; pub mod ffi; -pub mod old_io; -pub mod io; pub mod fs; +pub mod io; pub mod net; +pub mod old_io; +pub mod old_path; pub mod os; -pub mod env; pub mod path; -pub mod old_path; pub mod process; pub mod rand; -pub mod time; - -/* Common data structures */ - -pub mod collections; - -/* Threads and communication */ - -pub mod thread; pub mod sync; +pub mod time; #[macro_use] #[path = "sys/common/mod.rs"] mod sys_common; @@ -305,7 +298,7 @@ mod std { pub use rt; // used for panic!() pub use vec; // used for vec![] pub use cell; // used for tls! - pub use thread_local; // used for thread_local! + pub use thread; // used for thread_local! pub use marker; // used for tls! pub use ops; // used for bitflags! |