diff options
| author | bors <bors@rust-lang.org> | 2015-04-13 14:57:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-04-13 14:57:13 +0000 |
| commit | 588d37c653ddac491c2c1cb8974f56781533b173 (patch) | |
| tree | 9e25416e1858c1d9914a3e5fbe81c21d4fab6ff6 /src | |
| parent | b9ed9e2a326cafa6f2445aec7221dc419089cf5f (diff) | |
| parent | dc1f216227490a244c799a410a8c00db4ed058f5 (diff) | |
| download | rust-588d37c653ddac491c2c1cb8974f56781533b173.tar.gz rust-588d37c653ddac491c2c1cb8974f56781533b173.zip | |
Auto merge of #24362 - alexcrichton:issue-24334, r=huonw
Make sure the unstable `scoped` modules isn't named the same as the `scoped` function. cc #24334
Diffstat (limited to 'src')
| -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 |