about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-07-18 08:25:10 +0000
committerbors <bors@rust-lang.org>2015-07-18 08:25:10 +0000
commite0e18598198a4a370547d3ec65bc21219df81371 (patch)
treeb627f97650ea05f8efe2a51f6d1bed2cdd63d859 /src/libstd
parent3f50dca3865fa510a1d80c94f2272c5ff78dc373 (diff)
parent5f9a1dfa7e8fd668aa323a057c6ebf118f73f5a0 (diff)
downloadrust-e0e18598198a4a370547d3ec65bc21219df81371.tar.gz
rust-e0e18598198a4a370547d3ec65bc21219df81371.zip
Auto merge of #27088 - tamird:fix-ios-build, r=alexcrichton
Fixes #26939.
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/sys/unix/backtrace.rs10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/libstd/sys/unix/backtrace.rs b/src/libstd/sys/unix/backtrace.rs
index a5d1595cfeb..ed6421f3670 100644
--- a/src/libstd/sys/unix/backtrace.rs
+++ b/src/libstd/sys/unix/backtrace.rs
@@ -107,8 +107,6 @@ use sys_common::backtrace::*;
 #[cfg(all(target_os = "ios", target_arch = "arm"))]
 #[inline(never)]
 pub fn write(w: &mut Write) -> io::Result<()> {
-    use result;
-
     extern {
         fn backtrace(buf: *mut *mut libc::c_void,
                      sz: libc::c_int) -> libc::c_int;
@@ -127,10 +125,10 @@ pub fn write(w: &mut Write) -> io::Result<()> {
     let cnt = unsafe { backtrace(buf.as_mut_ptr(), SIZE as libc::c_int) as usize};
 
     // skipping the first one as it is write itself
-    let iter = (1..cnt).map(|i| {
-        print(w, i as isize, buf[i], buf[i])
-    });
-    result::fold(iter, (), |_, _| ())
+    for i in 1..cnt {
+        try!(print(w, i as isize, buf[i], buf[i]))
+    }
+    Ok(())
 }
 
 #[cfg(not(all(target_os = "ios", target_arch = "arm")))]