diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-02-11 11:47:53 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-02-11 13:46:35 -0800 |
| commit | a828e7948069f310dc5b33be8edb65e5e8e0cf9a (patch) | |
| tree | 9806752d95d3ddeb06276eae62fe7b97fe0b1e4e /src/libtest | |
| parent | 446bc899b28e988f4252beca0d1858e7f7d866b1 (diff) | |
| download | rust-a828e7948069f310dc5b33be8edb65e5e8e0cf9a.tar.gz rust-a828e7948069f310dc5b33be8edb65e5e8e0cf9a.zip | |
std: Tweak the std::env OsString/String interface
This commit tweaks the interface of the `std::env` module to make it more ergonomic for common usage: * `env::var` was renamed to `env::var_os` * `env::var_string` was renamed to `env::var` * `env::args` was renamed to `env::args_os` * `env::args` was re-added as a panicking iterator over string values * `env::vars` was renamed to `env::vars_os` * `env::vars` was re-added as a panicking iterator over string values. This should make common usage (e.g. unicode values everywhere) more ergonomic as well as "the default". This is also a breaking change due to the differences of what's yielded from each of these functions, but migration should be fairly easy as the defaults operate over `String` which is a common type to use. [breaking-change]
Diffstat (limited to 'src/libtest')
| -rw-r--r-- | src/libtest/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs index f3edd90b4fa..e7a70ed0d69 100644 --- a/src/libtest/lib.rs +++ b/src/libtest/lib.rs @@ -385,7 +385,7 @@ pub fn parse_opts(args: &[String]) -> Option<OptRes> { let mut nocapture = matches.opt_present("nocapture"); if !nocapture { - nocapture = env::var("RUST_TEST_NOCAPTURE").is_some(); + nocapture = env::var("RUST_TEST_NOCAPTURE").is_ok(); } let color = match matches.opt_str("color").as_ref().map(|s| &**s) { @@ -811,7 +811,7 @@ fn run_tests<F>(opts: &TestOpts, fn get_concurrency() -> uint { use std::rt; - match env::var_string("RUST_TEST_TASKS") { + match env::var("RUST_TEST_TASKS") { Ok(s) => { let opt_n: Option<uint> = s.parse().ok(); match opt_n { |
