auto merge of #17477 : vhbit/rust/ios-deprecation-fix, r=alexcrichton

rust-lang · Sep 24, 2014 · e0bd16c · e0bd16c
2 parents 9e3bf02 + cef8661
commit e0bd16c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/libstd/os.rs b/src/libstd/os.rs
@@ -1173,9 +1173,7 @@ fn real_args_as_bytes() -> Vec<Vec<u8>> {
             let utf_c_str: *const libc::c_char =
                 mem::transmute(objc_msgSend(tmp, utf8Sel));
             let s = CString::new(utf_c_str, false);
-            if s.is_not_null() {
-                res.push(s.as_bytes_no_nul().to_vec())
-            }
+            res.push(s.as_bytes_no_nul().to_vec())
         }
     }
 

diff --git a/src/libstd/rt/backtrace.rs b/src/libstd/rt/backtrace.rs
@@ -278,9 +278,10 @@ mod imp {
         let cnt = unsafe { backtrace(buf.as_mut_ptr(), SIZE as libc::c_int) as uint};
 
         // skipping the first one as it is write itself
-        result::fold_(range(1, cnt).map(|i| {
+        let iter = range(1, cnt).map(|i| {
             print(w, i as int, buf[i])
-        }))
+        });
+        result::fold(iter, (), |_, _| ())
     }
 
     #[cfg(not(target_os = "ios", target_arch = "arm"))]