diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-04-12 21:42:59 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-04-12 21:43:25 -0700 |
| commit | dc1f216227490a244c799a410a8c00db4ed058f5 (patch) | |
| tree | 086a388c3659552e97981c909c2739ea18789a02 | |
| parent | 47def3ef27a2e027f1a93ef7870ff131ee7926fd (diff) | |
| download | rust-dc1f216227490a244c799a410a8c00db4ed058f5.tar.gz rust-dc1f216227490a244c799a410a8c00db4ed058f5.zip | |
std: Work around a stability bug in thread
Make sure the unstable `scoped` modules isn't named the same as the `scoped` function. cc #24334
| -rw-r--r-- | src/libstd/thread/mod.rs | 6 | ||||
| -rw-r--r-- | src/libstd/thread/scoped_tls.rs (renamed from src/libstd/thread/scoped.rs) | 0 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs index f893ae243bb..0e5fee27ffe 100644 --- a/src/libstd/thread/mod.rs +++ b/src/libstd/thread/mod.rs @@ -187,7 +187,7 @@ use time::Duration; //////////////////////////////////////////////////////////////////////////////// #[macro_use] mod local; -#[macro_use] mod scoped; +#[macro_use] mod scoped_tls; #[stable(feature = "rust1", since = "1.0.0")] pub use self::local::{LocalKey, LocalKeyState}; @@ -195,10 +195,10 @@ pub use self::local::{LocalKey, LocalKeyState}; #[unstable(feature = "scoped_tls", reason = "scoped TLS has yet to have wide enough use to fully \ 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::scoped::__impl as __scoped; +#[doc(hidden)] pub use self::scoped_tls::__impl as __scoped; //////////////////////////////////////////////////////////////////////////////// // Builder diff --git a/src/libstd/thread/scoped.rs b/src/libstd/thread/scoped_tls.rs index fa980954c2f..fa980954c2f 100644 --- a/src/libstd/thread/scoped.rs +++ b/src/libstd/thread/scoped_tls.rs |