Auto merge of #36944 - brson:modos, r=alexcrichton

Fix mod declarations on untested platforms

r? @alexcrichton
This commit is contained in:
bors 2016-10-05 09:14:02 -07:00 committed by GitHub
commit 3210fd5c20

View File

@ -140,7 +140,7 @@ pub mod os {
} }
#[cfg(target_os = "haiku")] #[cfg(target_os = "haiku")]
mod os { pub mod os {
pub const FAMILY: &'static str = "unix"; pub const FAMILY: &'static str = "unix";
pub const OS: &'static str = "haiku"; pub const OS: &'static str = "haiku";
pub const DLL_PREFIX: &'static str = "lib"; pub const DLL_PREFIX: &'static str = "lib";
@ -151,7 +151,7 @@ mod os {
} }
#[cfg(all(target_os = "emscripten", target_arch = "asmjs"))] #[cfg(all(target_os = "emscripten", target_arch = "asmjs"))]
mod os { pub mod os {
pub const FAMILY: &'static str = "unix"; pub const FAMILY: &'static str = "unix";
pub const OS: &'static str = "emscripten"; pub const OS: &'static str = "emscripten";
pub const DLL_PREFIX: &'static str = "lib"; pub const DLL_PREFIX: &'static str = "lib";
@ -162,7 +162,7 @@ mod os {
} }
#[cfg(all(target_os = "emscripten", target_arch = "wasm32"))] #[cfg(all(target_os = "emscripten", target_arch = "wasm32"))]
mod os { pub mod os {
pub const FAMILY: &'static str = "unix"; pub const FAMILY: &'static str = "unix";
pub const OS: &'static str = "emscripten"; pub const OS: &'static str = "emscripten";
pub const DLL_PREFIX: &'static str = "lib"; pub const DLL_PREFIX: &'static str = "lib";