diff --git a/src/libstd/env.rs b/src/libstd/env.rs index ed34c1204b3..27bf326631f 100644 --- a/src/libstd/env.rs +++ b/src/libstd/env.rs @@ -956,8 +956,7 @@ mod arch { mod tests { use super::*; - use ffi::OsStr; - use path::{Path, PathBuf}; + use path::Path; #[test] #[cfg_attr(target_os = "emscripten", ignore)] @@ -980,6 +979,8 @@ mod tests { #[test] #[cfg(windows)] fn split_paths_windows() { + use path::PathBuf; + fn check_parse(unparsed: &str, parsed: &[&str]) -> bool { split_paths(unparsed).collect::>() == parsed.iter().map(|s| PathBuf::from(*s)).collect::>() @@ -1000,6 +1001,8 @@ mod tests { #[test] #[cfg(unix)] fn split_paths_unix() { + use path::PathBuf; + fn check_parse(unparsed: &str, parsed: &[&str]) -> bool { split_paths(unparsed).collect::>() == parsed.iter().map(|s| PathBuf::from(*s)).collect::>() @@ -1015,6 +1018,8 @@ mod tests { #[test] #[cfg(unix)] fn join_paths_unix() { + use ffi::OsStr; + fn test_eq(input: &[&str], output: &str) -> bool { &*join_paths(input.iter().cloned()).unwrap() == OsStr::new(output) @@ -1031,6 +1036,8 @@ mod tests { #[test] #[cfg(windows)] fn join_paths_windows() { + use ffi::OsStr; + fn test_eq(input: &[&str], output: &str) -> bool { &*join_paths(input.iter().cloned()).unwrap() == OsStr::new(output) diff --git a/src/libstd/fs.rs b/src/libstd/fs.rs index f40aed2478a..82ba1a8774c 100644 --- a/src/libstd/fs.rs +++ b/src/libstd/fs.rs @@ -1981,7 +1981,7 @@ impl AsInnerMut for DirBuilder { } } -#[cfg(all(test, not(target_os = "emscripten")))] +#[cfg(all(test, not(any(target_os = "cloudabi", target_os = "emscripten"))))] mod tests { use io::prelude::*; diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs index 539ff1df187..78235ea1b4b 100644 --- a/src/libstd/net/tcp.rs +++ b/src/libstd/net/tcp.rs @@ -885,7 +885,7 @@ impl fmt::Debug for TcpListener { } } -#[cfg(all(test, not(target_os = "emscripten")))] +#[cfg(all(test, not(any(target_os = "cloudabi", target_os = "emscripten"))))] mod tests { use io::ErrorKind; use io::prelude::*; diff --git a/src/libstd/net/udp.rs b/src/libstd/net/udp.rs index 84ceaa65951..fc7f9205d06 100644 --- a/src/libstd/net/udp.rs +++ b/src/libstd/net/udp.rs @@ -786,7 +786,7 @@ impl fmt::Debug for UdpSocket { } } -#[cfg(all(test, not(target_os = "emscripten")))] +#[cfg(all(test, not(any(target_os = "cloudabi", target_os = "emscripten"))))] mod tests { use io::ErrorKind; use net::*; diff --git a/src/libstd/process.rs b/src/libstd/process.rs index 33e8a87a0b6..5c66ac6ddde 100644 --- a/src/libstd/process.rs +++ b/src/libstd/process.rs @@ -1392,7 +1392,7 @@ pub fn id() -> u32 { ::sys::os::getpid() } -#[cfg(all(test, not(target_os = "emscripten")))] +#[cfg(all(test, not(any(target_os = "cloudabi", target_os = "emscripten"))))] mod tests { use io::prelude::*;