diff options
| author | bors <bors@rust-lang.org> | 2014-02-16 07:11:34 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-02-16 07:11:34 -0800 |
| commit | 0ba6d4885fc71ca7156e1fe689edb939e1d9d418 (patch) | |
| tree | 157894361cfedb2ef3cd231a6b7b2d144a5db8dd /src/libnative | |
| parent | 6fe775e2b5eaa77dd49c1d9a234c67d52e5f9087 (diff) | |
| parent | f450b2b379794ba9f367f9dadbd2d70913da8560 (diff) | |
| download | rust-0ba6d4885fc71ca7156e1fe689edb939e1d9d418.tar.gz rust-0ba6d4885fc71ca7156e1fe689edb939e1d9d418.zip | |
auto merge of #12313 : bjz/rust/tuple, r=huonw
This renames the `n*` and `n*_ref` tuple getters to `val*` and `ref*` respectively, and adds `mut*` getters. It also removes the `CloneableTuple` and `ImmutableTuple` traits.
Diffstat (limited to 'src/libnative')
| -rw-r--r-- | src/libnative/io/process.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libnative/io/process.rs b/src/libnative/io/process.rs index 2a061c5f9b2..b796535371f 100644 --- a/src/libnative/io/process.rs +++ b/src/libnative/io/process.rs @@ -529,7 +529,7 @@ fn with_envp<T>(env: Option<~[(~str, ~str)]>, cb: |*c_void| -> T) -> T { let mut tmps = vec::with_capacity(env.len()); for pair in env.iter() { - let kv = format!("{}={}", pair.first(), pair.second()); + let kv = format!("{}={}", *pair.ref0(), *pair.ref1()); tmps.push(kv.to_c_str()); } @@ -553,7 +553,7 @@ fn with_envp<T>(env: Option<~[(~str, ~str)]>, cb: |*mut c_void| -> T) -> T { let mut blk = ~[]; for pair in env.iter() { - let kv = format!("{}={}", pair.first(), pair.second()); + let kv = format!("{}={}", *pair.ref0(), *pair.ref1()); blk.push_all(kv.as_bytes()); blk.push(0); } |
