Skip to content

Add std::process::Command::envs() #38856

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 25, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 36 additions & 1 deletion src/libstd/process.rs
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,9 @@ impl Command {
/// .expect("ls command failed to start");
/// ```
#[stable(feature = "process", since = "1.0.0")]
pub fn args<S: AsRef<OsStr>>(&mut self, args: &[S]) -> &mut Command {
pub fn args<I, S>(&mut self, args: I) -> &mut Command
where I: IntoIterator<Item=S>, S: AsRef<OsStr>
{
for arg in args {
self.arg(arg.as_ref());
}
Expand Down Expand Up @@ -377,6 +379,39 @@ impl Command {
self
}

/// Add or update multiple environment variable mappings.
///
/// # Examples
///
/// Basic usage:
/// ```no_run
/// use std::process::{Command, Stdio};
/// use std::env;
/// use std::collections::HashMap;
///
/// let filtered_env : HashMap<String, String> =
/// env::vars().filter(|&(ref k, _)|
/// k == "TERM" || k == "TZ" || k == "LANG" || k == "PATH"
/// ).collect();
///
/// Command::new("printenv")
/// .stdin(Stdio::null())
/// .stdout(Stdio::inherit())
/// .env_clear()
/// .envs(&filtered_env)
/// .spawn()
/// .expect("printenv failed to start");
/// ```
#[unstable(feature = "command_envs", issue = "38526")]
pub fn envs<I, K, V>(&mut self, vars: I) -> &mut Command
where I: IntoIterator<Item=(K, V)>, K: AsRef<OsStr>, V: AsRef<OsStr>
{
for (ref key, ref val) in vars {
self.inner.env(key.as_ref(), val.as_ref());
}
self
}

/// Removes an environment variable mapping.
///
/// # Examples
Expand Down
62 changes: 62 additions & 0 deletions src/test/run-pass/process-envs.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
// Copyright 2014, 2017 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// 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 {
Command::new("env")
}
#[cfg(target_os="android")]
pub fn env_cmd() -> Command {
let mut cmd = Command::new("/system/bin/sh");
cmd.arg("-c").arg("set");
cmd
}

#[cfg(windows)]
pub fn env_cmd() -> Command {
let mut cmd = Command::new("cmd");
cmd.arg("/c").arg("set");
cmd
}

fn main() {
// save original environment
let old_env = env::var_os("RUN_TEST_NEW_ENV");

env::set_var("RUN_TEST_NEW_ENV", "123");

// create filtered environment vector
let filtered_env : HashMap<String, String> =
env::vars().filter(|&(ref k, _)| k == "PATH").collect();

let mut cmd = env_cmd();
cmd.env_clear();
cmd.envs(&filtered_env);

// restore original environment
match old_env {
None => env::remove_var("RUN_TEST_NEW_ENV"),
Some(val) => env::set_var("RUN_TEST_NEW_ENV", &val)
}

let result = cmd.output().unwrap();
let output = String::from_utf8_lossy(&result.stdout);

assert!(!output.contains("RUN_TEST_NEW_ENV"),
"found RUN_TEST_NEW_ENV inside of:\n\n{}", output);
}
3 changes: 1 addition & 2 deletions src/test/run-pass/process-remove-from-env.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down