diff options
Diffstat (limited to 'src/libcore/os.rs')
| -rw-r--r-- | src/libcore/os.rs | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/libcore/os.rs b/src/libcore/os.rs index e93888f3eaf..b2e3606eff9 100644 --- a/src/libcore/os.rs +++ b/src/libcore/os.rs @@ -1167,14 +1167,6 @@ pub mod consts { #[cfg(windows)] pub use os::consts::windows::*; - pub mod unix { - pub static FAMILY: &'static str = "unix"; - } - - pub mod windows { - pub static FAMILY: &'static str = "windows"; - } - #[cfg(target_os = "macos")] pub use os::consts::macos::*; @@ -1190,6 +1182,26 @@ pub mod consts { #[cfg(target_os = "win32")] pub use os::consts::win32::*; + #[cfg(target_arch = "x86")] + pub use os::consts::x86::*; + + #[cfg(target_arch = "x86_64")] + pub use os::consts::x86_64::*; + + #[cfg(target_arch = "arm")] + pub use os::consts::arm::*; + + #[cfg(target_arch = "mips")] + use os::consts::mips::*; + + pub mod unix { + pub static FAMILY: &'static str = "unix"; + } + + pub mod windows { + pub static FAMILY: &'static str = "windows"; + } + pub mod macos { pub static SYSNAME: &'static str = "macos"; pub static DLL_PREFIX: &'static str = "lib"; @@ -1226,18 +1238,6 @@ pub mod consts { } - #[cfg(target_arch = "x86")] - pub use os::consts::x86::*; - - #[cfg(target_arch = "x86_64")] - pub use os::consts::x86_64::*; - - #[cfg(target_arch = "arm")] - pub use os::consts::arm::*; - - #[cfg(target_arch = "mips")] - use os::consts::mips::*; - pub mod x86 { pub static ARCH: &'static str = "x86"; } |
