diff options
| author | Zack Weinberg <zackw@panix.com> | 2017-01-10 13:00:07 -0500 |
|---|---|---|
| committer | Zack Weinberg <zackw@panix.com> | 2017-01-10 13:00:07 -0500 |
| commit | c74efddc89859b9ddfbdccf8ccb2fa9862a1681d (patch) | |
| tree | d378e39b2af09e5a92f7c0c4370e5ff8d2d8f1eb /src | |
| parent | 55a6fdb7fdadd09ca93f91bb661a57942fd6ed8b (diff) | |
| download | rust-c74efddc89859b9ddfbdccf8ccb2fa9862a1681d.tar.gz rust-c74efddc89859b9ddfbdccf8ccb2fa9862a1681d.zip | |
Fixes:
* give the new feature its own feature tag * correct a lifetime problem in the test * use .output() instead of .spawn() in the test so that output is actually collected * correct the same error in the test whose skeleton I cribbed
Diffstat (limited to 'src')
| -rw-r--r-- | src/libstd/process.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/process-envs.rs | 9 | ||||
| -rw-r--r-- | src/test/run-pass/process-remove-from-env.rs | 3 |
3 files changed, 6 insertions, 8 deletions
diff --git a/src/libstd/process.rs b/src/libstd/process.rs index 676ae286eaa..1b1f2291826 100644 --- a/src/libstd/process.rs +++ b/src/libstd/process.rs @@ -399,7 +399,7 @@ impl Command { /// .spawn() /// .expect("printenv failed to start"); /// ``` - #[stable(feature = "process", since = "1.16.0")] + #[stable(feature = "command_envs", since = "1.16.0")] pub fn envs<K, V>(&mut self, vars: &[(K, V)]) -> &mut Command where K: AsRef<OsStr>, V: AsRef<OsStr> { diff --git a/src/test/run-pass/process-envs.rs b/src/test/run-pass/process-envs.rs index 229f8488f19..80ff16aadb2 100644 --- a/src/test/run-pass/process-envs.rs +++ b/src/test/run-pass/process-envs.rs @@ -41,9 +41,9 @@ fn main() { let filtered_env : Vec<(String, String)> = env::vars().filter(|&(ref k, _)| k == "PATH").collect(); - let mut cmd = env_cmd() - .env_clear() - .envs(&filtered_env); + let mut cmd = env_cmd(); + cmd.env_clear(); + cmd.envs(&filtered_env); // restore original environment match old_env { @@ -51,8 +51,7 @@ fn main() { Some(val) => env::set_var("RUN_TEST_NEW_ENV", &val) } - let prog = cmd.spawn().unwrap(); - let result = prog.wait_with_output().unwrap(); + let result = cmd.output().unwrap(); let output = String::from_utf8_lossy(&result.stdout); assert!(!output.contains("RUN_TEST_NEW_ENV"), diff --git a/src/test/run-pass/process-remove-from-env.rs b/src/test/run-pass/process-remove-from-env.rs index cce5ef4fe17..b7f296a65c2 100644 --- a/src/test/run-pass/process-remove-from-env.rs +++ b/src/test/run-pass/process-remove-from-env.rs @@ -46,8 +46,7 @@ fn main() { Some(val) => env::set_var("RUN_TEST_NEW_ENV", &val) } - let prog = cmd.spawn().unwrap(); - let result = prog.wait_with_output().unwrap(); + let result = cmd.output().unwrap(); let output = String::from_utf8_lossy(&result.stdout); assert!(!output.contains("RUN_TEST_NEW_ENV"), |