diff options
| author | bors <bors@rust-lang.org> | 2015-03-04 12:16:51 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-03-04 12:16:51 +0000 |
| commit | bdf6e4fcf5ed8b8fe3c281040414e4f6a6afb8d6 (patch) | |
| tree | 609f5fc3b538d928ad4f36691110c2928779c358 /src/libstd/process.rs | |
| parent | 6e055c3f0041067000dfae7bbc2b0383a8fed19e (diff) | |
| parent | 55ce45e7b52a0a360cf88cba71f59f7d3e9b2346 (diff) | |
| download | rust-bdf6e4fcf5ed8b8fe3c281040414e4f6a6afb8d6.tar.gz rust-bdf6e4fcf5ed8b8fe3c281040414e4f6a6afb8d6.zip | |
Auto merge of #22920 - tshepang:remove-some-warnings, r=huonw
Diffstat (limited to 'src/libstd/process.rs')
| -rw-r--r-- | src/libstd/process.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libstd/process.rs b/src/libstd/process.rs index b578b5e3d60..79028f49e68 100644 --- a/src/libstd/process.rs +++ b/src/libstd/process.rs @@ -803,14 +803,13 @@ mod tests { #[cfg(not(target_os="android"))] #[test] fn test_inherit_env() { - use os; + use std::env; if running_on_valgrind() { return; } let result = env_cmd().output().unwrap(); let output = String::from_utf8(result.stdout).unwrap(); - let r = os::env(); - for &(ref k, ref v) in &r { + for (ref k, ref v) in env::vars() { // don't check windows magical empty-named variables assert!(k.is_empty() || output.contains(format!("{}={}", *k, *v).as_slice()), |