diff options
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/ascii.rs | 4 | ||||
| -rw-r--r-- | src/libstd/lib.rs | 4 | ||||
| -rw-r--r-- | src/libstd/path/mod.rs | 32 | ||||
| -rw-r--r-- | src/libstd/rand/mod.rs | 4 | ||||
| -rw-r--r-- | src/libstd/sync/mod.rs | 2 |
5 files changed, 23 insertions, 23 deletions
diff --git a/src/libstd/ascii.rs b/src/libstd/ascii.rs index e5f42bd65a3..b31baa88e0c 100644 --- a/src/libstd/ascii.rs +++ b/src/libstd/ascii.rs @@ -27,10 +27,10 @@ use to_string::IntoStr; use vec::Vec; #[deprecated="this trait has been renamed to `AsciiExt`"] -pub use StrAsciiExt = self::AsciiExt; +pub use self::AsciiExt as StrAsciiExt; #[deprecated="this trait has been renamed to `OwnedAsciiExt`"] -pub use OwnedStrAsciiExt = self::OwnedAsciiExt; +pub use self::OwnedAsciiExt as OwnedStrAsciiExt; /// Datatype to hold one ascii character. It wraps a `u8`, with the highest bit always zero. diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index fb6599d808c..d35b644b643 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -175,7 +175,7 @@ pub use core::option; pub use alloc::boxed; #[deprecated = "use boxed instead"] -pub use owned = boxed; +pub use boxed as owned; pub use alloc::rc; @@ -289,7 +289,7 @@ mod std { pub use vec; // used for vec![] // The test runner calls ::std::os::args() but really wants realstd - #[cfg(test)] pub use os = realstd::os; + #[cfg(test)] pub use realstd::os as os; // The test runner requires std::slice::Vector, so re-export std::slice just for it. #[cfg(test)] pub use slice; diff --git a/src/libstd/path/mod.rs b/src/libstd/path/mod.rs index d24c2e2266d..38d04324fe4 100644 --- a/src/libstd/path/mod.rs +++ b/src/libstd/path/mod.rs @@ -80,59 +80,59 @@ use vec::Vec; /// Typedef for POSIX file paths. /// See `posix::Path` for more info. -pub use PosixPath = self::posix::Path; +pub use self::posix::Path as PosixPath; /// Typedef for Windows file paths. /// See `windows::Path` for more info. -pub use WindowsPath = self::windows::Path; +pub use self::windows::Path as WindowsPath; /// Typedef for the platform-native path type #[cfg(unix)] -pub use Path = self::posix::Path; +pub use self::posix::Path as Path; /// Typedef for the platform-native path type #[cfg(windows)] -pub use Path = self::windows::Path; +pub use self::windows::Path as Path; /// Typedef for the platform-native component iterator #[cfg(unix)] -pub use Components = self::posix::Components; +pub use self::posix::Components as Components; /// Typedef for the platform-native component iterator #[cfg(windows)] -pub use Components = self::windows::Components; +pub use self::windows::Components as Components; /// Typedef for the platform-native str component iterator #[cfg(unix)] -pub use StrComponents = self::posix::StrComponents; +pub use self::posix::StrComponents as StrComponents; /// Typedef for the platform-native str component iterator #[cfg(windows)] -pub use StrComponents = self::windows::StrComponents; +pub use self::windows::StrComponents as StrComponents; /// Alias for the platform-native separator character. #[cfg(unix)] -pub use SEP = self::posix::SEP; +pub use self::posix::SEP as SEP; /// Alias for the platform-native separator character. #[cfg(windows)] -pub use SEP = self::windows::SEP; +pub use self::windows::SEP as SEP; /// Alias for the platform-native separator byte. #[cfg(unix)] -pub use SEP_BYTE = self::posix::SEP_BYTE; +pub use self::posix::SEP_BYTE as SEP_BYTE; /// Alias for the platform-native separator byte. #[cfg(windows)] -pub use SEP_BYTE = self::windows::SEP_BYTE; +pub use self::windows::SEP_BYTE as SEP_BYTE; /// Typedef for the platform-native separator char func #[cfg(unix)] -pub use is_sep = self::posix::is_sep; +pub use self::posix::is_sep as is_sep; /// Typedef for the platform-native separator char func #[cfg(windows)] -pub use is_sep = self::windows::is_sep; +pub use self::windows::is_sep as is_sep; /// Typedef for the platform-native separator byte func #[cfg(unix)] -pub use is_sep_byte = self::posix::is_sep_byte; +pub use self::posix::is_sep_byte as is_sep_byte; /// Typedef for the platform-native separator byte func #[cfg(windows)] -pub use is_sep_byte = self::windows::is_sep_byte; +pub use self::windows::is_sep_byte as is_sep_byte; pub mod posix; pub mod windows; diff --git a/src/libstd/rand/mod.rs b/src/libstd/rand/mod.rs index 40d8f80171c..c02a97e09a4 100644 --- a/src/libstd/rand/mod.rs +++ b/src/libstd/rand/mod.rs @@ -185,9 +185,9 @@ use result::{Ok, Err}; use vec::Vec; #[cfg(not(target_word_size="64"))] -use IsaacWordRng = core_rand::IsaacRng; +use core_rand::IsaacRng as IsaacWordRng; #[cfg(target_word_size="64")] -use IsaacWordRng = core_rand::Isaac64Rng; +use core_rand::Isaac64Rng as IsaacWordRng; pub use core_rand::{Rand, Rng, SeedableRng, Open01, Closed01}; pub use core_rand::{XorShiftRng, IsaacRng, Isaac64Rng}; diff --git a/src/libstd/sync/mod.rs b/src/libstd/sync/mod.rs index c9526a64f46..8cfa1ebd598 100644 --- a/src/libstd/sync/mod.rs +++ b/src/libstd/sync/mod.rs @@ -27,7 +27,7 @@ pub use core_sync::{Semaphore, SemaphoreGuard}; pub use core_sync::one::{Once, ONCE_INIT}; #[deprecated = "use atomic instead"] -pub use atomics = core_sync::atomic; +pub use core_sync::atomic as atomics; pub use self::future::Future; pub use self::task_pool::TaskPool; |
