diff options
| author | Brian Anderson <banderson@mozilla.com> | 2014-04-15 18:18:08 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-04-15 19:47:03 -0700 |
| commit | c8f5b701dcf0b7dc4d78ef0d29f10e4f080b2517 (patch) | |
| tree | 07408024848d212dd1297d97323ab9bd812e3c3a /src/libstd | |
| parent | 4a827f588e972668c122f70790ee45e4b3660ace (diff) | |
| download | rust-c8f5b701dcf0b7dc4d78ef0d29f10e4f080b2517.tar.gz rust-c8f5b701dcf0b7dc4d78ef0d29f10e4f080b2517.zip | |
std: Remove pub use globs
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/os.rs | 32 | ||||
| -rw-r--r-- | src/libstd/rt/local_ptr.rs | 6 |
2 files changed, 25 insertions, 13 deletions
diff --git a/src/libstd/os.rs b/src/libstd/os.rs index a16113cb48f..25f503174bc 100644 --- a/src/libstd/os.rs +++ b/src/libstd/os.rs @@ -1294,37 +1294,47 @@ impl Drop for MemoryMap { /// Various useful system-specific constants. pub mod consts { #[cfg(unix)] - pub use os::consts::unix::*; + pub use os::consts::unix::FAMILY; #[cfg(windows)] - pub use os::consts::windows::*; + pub use os::consts::windows::FAMILY; #[cfg(target_os = "macos")] - pub use os::consts::macos::*; + pub use os::consts::macos::{SYSNAME, DLL_PREFIX, DLL_SUFFIX, DLL_EXTENSION}; + #[cfg(target_os = "macos")] + pub use os::consts::macos::{EXE_SUFFIX, EXE_EXTENSION}; #[cfg(target_os = "freebsd")] - pub use os::consts::freebsd::*; + pub use os::consts::freebsd::{SYSNAME, DLL_PREFIX, DLL_SUFFIX, DLL_EXTENSION}; + #[cfg(target_os = "freebsd")] + pub use os::consts::freebsd::{EXE_SUFFIX, EXE_EXTENSION}; #[cfg(target_os = "linux")] - pub use os::consts::linux::*; + pub use os::consts::linux::{SYSNAME, DLL_PREFIX, DLL_SUFFIX, DLL_EXTENSION}; + #[cfg(target_os = "linux")] + pub use os::consts::linux::{EXE_SUFFIX, EXE_EXTENSION}; #[cfg(target_os = "android")] - pub use os::consts::android::*; + pub use os::consts::android::{SYSNAME, DLL_PREFIX, DLL_SUFFIX, DLL_EXTENSION}; + #[cfg(target_os = "android")] + pub use os::consts::android::{EXE_SUFFIX, EXE_EXTENSION}; #[cfg(target_os = "win32")] - pub use os::consts::win32::*; + pub use os::consts::win32::{SYSNAME, DLL_PREFIX, DLL_SUFFIX, DLL_EXTENSION}; + #[cfg(target_os = "win32")] + pub use os::consts::win32::{EXE_SUFFIX, EXE_EXTENSION}; #[cfg(target_arch = "x86")] - pub use os::consts::x86::*; + pub use os::consts::x86::{ARCH}; #[cfg(target_arch = "x86_64")] - pub use os::consts::x86_64::*; + pub use os::consts::x86_64::{ARCH}; #[cfg(target_arch = "arm")] - pub use os::consts::arm::*; + pub use os::consts::arm::{ARCH}; #[cfg(target_arch = "mips")] - pub use os::consts::mips::*; + pub use os::consts::mips::{ARCH}; /// Constants for Unix systems. pub mod unix { diff --git a/src/libstd/rt/local_ptr.rs b/src/libstd/rt/local_ptr.rs index 6b61af1d9a2..ff82be97489 100644 --- a/src/libstd/rt/local_ptr.rs +++ b/src/libstd/rt/local_ptr.rs @@ -23,10 +23,12 @@ use ptr::RawPtr; #[cfg(windows)] // mingw-w32 doesn't like thread_local things #[cfg(target_os = "android")] // see #10686 -pub use self::native::*; +pub use self::native::{init, cleanup, put, take, try_take, unsafe_take, exists, + unsafe_borrow, try_unsafe_borrow}; #[cfg(not(windows), not(target_os = "android"))] -pub use self::compiled::*; +pub use self::compiled::{init, cleanup, put, take, try_take, unsafe_take, exists, + unsafe_borrow, try_unsafe_borrow}; /// Encapsulates a borrowed value. When this value goes out of scope, the /// pointer is returned. |