nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-27 06:14:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #24362 - alexcrichton:issue-24334, r=huonw

Browse Source 
Make sure the unstable `scoped` modules isn't named the same as the `scoped`
function.

cc #24334
This commit is contained in:
bors 2015-04-13 14:57:13 +00:00
commit 588d37c653
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libstd/thread/mod.rs
View File

@ -187,7 +187,7 @@ use time::Duration;
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#[macro_use] mod local; #[macro_use] mod local;
#[macro_use] mod scoped; #[macro_use] mod scoped_tls;
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
pub use self::local::{LocalKey, LocalKeyState}; pub use self::local::{LocalKey, LocalKeyState};
@ -195,10 +195,10 @@ pub use self::local::{LocalKey, LocalKeyState};
#[unstable(feature = "scoped_tls", #[unstable(feature = "scoped_tls",
reason = "scoped TLS has yet to have wide enough use to fully \ reason = "scoped TLS has yet to have wide enough use to fully \
consider stabilizing its interface")] consider stabilizing its interface")]
pub use self::scoped::ScopedKey; pub use self::scoped_tls::ScopedKey;
#[doc(hidden)] pub use self::local::__impl as __local; #[doc(hidden)] pub use self::local::__impl as __local;
#[doc(hidden)] pub use self::scoped::__impl as __scoped; #[doc(hidden)] pub use self::scoped_tls::__impl as __scoped;
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Builder // Builder

0
src/libstd/thread/scoped.rs → src/libstd/thread/scoped_tls.rs
View File