about summary refs log tree commit diff
path: root/src/libnative
diff options
context:
space:
mode:
authorMarvin Löbel <loebel.marvin@gmail.com>2014-03-28 20:42:34 +0100
committerMarvin Löbel <loebel.marvin@gmail.com>2014-03-30 03:47:04 +0200
commitc356e3ba6a12c3294a9a428ef9120cff9306bf4b (patch)
treed5f8701b97fcf2fc596a52215ad96462c1eb981e /src/libnative
parent86890b9e7c5db28ac2da5cd63d1a51d63a5e6bec (diff)
downloadrust-c356e3ba6a12c3294a9a428ef9120cff9306bf4b.tar.gz
rust-c356e3ba6a12c3294a9a428ef9120cff9306bf4b.zip
Removed deprecated functions `map` and `flat_map` for vectors and slices.
Diffstat (limited to 'src/libnative')
-rw-r--r--src/libnative/io/process.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/libnative/io/process.rs b/src/libnative/io/process.rs
index 463f9f8bedd..b0f2495e98c 100644
--- a/src/libnative/io/process.rs
+++ b/src/libnative/io/process.rs
@@ -597,7 +597,7 @@ fn with_argv<T>(prog: &str, args: &[~str], cb: proc:(**libc::c_char) -> T) -> T
     // Next, convert each of the byte strings into a pointer. This is
     // technically unsafe as the caller could leak these pointers out of our
     // scope.
-    let mut ptrs = tmps.map(|tmp| tmp.with_ref(|buf| buf));
+    let mut ptrs: Vec<_> = tmps.iter().map(|tmp| tmp.with_ref(|buf| buf)).collect();
 
     // Finally, make sure we add a null pointer.
     ptrs.push(ptr::null());
@@ -622,7 +622,9 @@ fn with_envp<T>(env: Option<~[(~str, ~str)]>, cb: proc:(*c_void) -> T) -> T {
             }
 
             // Once again, this is unsafe.
-            let mut ptrs = tmps.map(|tmp| tmp.with_ref(|buf| buf));
+            let mut ptrs: Vec<*libc::c_char> = tmps.iter()
+                                                   .map(|tmp| tmp.with_ref(|buf| buf))
+                                                   .collect();
             ptrs.push(ptr::null());
 
             cb(ptrs.as_ptr() as *c_void)