diff options
| author | Zack Weinberg <zackw@panix.com> | 2017-01-21 11:01:11 -0500 |
|---|---|---|
| committer | Zack Weinberg <zackw@panix.com> | 2017-01-21 11:01:11 -0500 |
| commit | 2580950fcd7c516ebd2fc090443b5406a18f77bb (patch) | |
| tree | 4632a369d5d734c9c923aa3c2972ff27d52591e5 /src/test | |
| parent | c74efddc89859b9ddfbdccf8ccb2fa9862a1681d (diff) | |
| download | rust-2580950fcd7c516ebd2fc090443b5406a18f77bb.tar.gz rust-2580950fcd7c516ebd2fc090443b5406a18f77bb.zip | |
Generalize envs() and args() to iterators.
* Command::envs() now takes anything that is IntoIterator<Item=(K, V)> where both K and V are AsRef<OsStr>. * Since we're not 100% sure that's the right signature, envs() is now marked unstable. (You can use envs() with HashMap<str, str> but not Vec<(str, str)>, for instance.) * Update the test to match. * By analogy, args() now takes any IntoIterator<Item=S>, S: AsRef<OsStr>. This should be uncontroversial.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/run-pass/process-envs.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/test/run-pass/process-envs.rs b/src/test/run-pass/process-envs.rs index 80ff16aadb2..a131dcbe4dd 100644 --- a/src/test/run-pass/process-envs.rs +++ b/src/test/run-pass/process-envs.rs @@ -10,8 +10,11 @@ // ignore-emscripten +#![feature(command_envs)] + use std::process::Command; use std::env; +use std::collections::HashMap; #[cfg(all(unix, not(target_os="android")))] pub fn env_cmd() -> Command { @@ -38,7 +41,7 @@ fn main() { env::set_var("RUN_TEST_NEW_ENV", "123"); // create filtered environment vector - let filtered_env : Vec<(String, String)> = + let filtered_env : HashMap<String, String> = env::vars().filter(|&(ref k, _)| k == "PATH").collect(); let mut cmd = env_cmd(); |
