summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorValerii Hiora <valerii.hiora@gmail.com>2015-02-20 18:03:10 +0200
committerValerii Hiora <valerii.hiora@gmail.com>2015-02-20 18:05:17 +0200
commit46b2c9ac7ffb9e69d72225f287503ee78565e89d (patch)
tree64a8be6d9aacb90bee1664a521ac756eaf5b17ca /src/libstd
parent522d09dfecbeca1595f25ac58c6d0178bbd21d7d (diff)
downloadrust-46b2c9ac7ffb9e69d72225f287503ee78565e89d.tar.gz
rust-46b2c9ac7ffb9e69d72225f287503ee78565e89d.zip
iOS: CStr fallout
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/os.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/os.rs b/src/libstd/os.rs
index f181fc5df57..0ab80b73264 100644
--- a/src/libstd/os.rs
+++ b/src/libstd/os.rs
@@ -595,7 +595,7 @@ fn real_args_as_bytes() -> Vec<Vec<u8>> {
 // res
 #[cfg(target_os = "ios")]
 fn real_args_as_bytes() -> Vec<Vec<u8>> {
-    use ffi::c_str_to_bytes;
+    use ffi::CStr;
     use iter::range;
     use mem;
 
@@ -630,7 +630,7 @@ fn real_args_as_bytes() -> Vec<Vec<u8>> {
             let tmp = objc_msgSend(args, objectAtSel, i);
             let utf_c_str: *const libc::c_char =
                 mem::transmute(objc_msgSend(tmp, utf8Sel));
-            res.push(c_str_to_bytes(&utf_c_str).to_vec());
+            res.push(CStr::from_ptr(utf_c_str).to_bytes().to_vec());
         }
     }