about summary refs log tree commit diff
path: root/src/test/run-pass/process-spawn-with-unicode-params.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-07-10 21:41:36 +0000
committerbors <bors@rust-lang.org>2014-07-10 21:41:36 +0000
commita672456c40d28f051ecbdb2caf5bf6733371d494 (patch)
tree1ce9d7ff9d26425e9c581d7ce377531c1155da0b /src/test/run-pass/process-spawn-with-unicode-params.rs
parent8bbf598d50960087342667fc47f5d38f4a9c2165 (diff)
parentbfa853f8ed45d1908c98ec350f52c7a6790661da (diff)
downloadrust-a672456c40d28f051ecbdb2caf5bf6733371d494.tar.gz
rust-a672456c40d28f051ecbdb2caf5bf6733371d494.zip
auto merge of #15353 : aturon/rust/env-hashmap, r=alexcrichton
This commit adds `env_insert` and `env_remove` methods to the `Command`
builder, easing updates to the environment variables for the child
process. The existing method, `env`, is still available for overriding
the entire environment in one shot (after which the `env_insert` and
`env_remove` methods can be used to make further adjustments).

To support these new methods, the internal `env` representation for
`Command` has been changed to an optional `HashMap` holding owned
`CString`s (to support non-utf8 data). The `HashMap` is only
materialized if the environment is updated. The implementation does not
try hard to avoid allocation, since the cost of launching a process will
dwarf any allocation cost.

This patch also adds `PartialOrd`, `Eq`, and `Hash` implementations for
`CString`.
Diffstat (limited to 'src/test/run-pass/process-spawn-with-unicode-params.rs')
-rw-r--r--src/test/run-pass/process-spawn-with-unicode-params.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/run-pass/process-spawn-with-unicode-params.rs b/src/test/run-pass/process-spawn-with-unicode-params.rs
index 70839c18847..de86ca179b7 100644
--- a/src/test/run-pass/process-spawn-with-unicode-params.rs
+++ b/src/test/run-pass/process-spawn-with-unicode-params.rs
@@ -58,7 +58,7 @@ fn main() {
         let p = Command::new(&child_path)
                         .arg(arg)
                         .cwd(&cwd)
-                        .env(my_env.append_one(env).as_slice())
+                        .env_set_all(my_env.append_one(env).as_slice())
                         .spawn().unwrap().wait_with_output().unwrap();
 
         // display the output