Skip to content

Commit 462693d

Browse files
committed
---
yaml --- r: 155391 b: refs/heads/try2 c: 4d69696 h: refs/heads/master i: 155389: 50b7b55 155387: 9df40d7 155383: f381a3b 155375: 3f1a507 155359: 202c9da 155327: 8da230e 155263: 23efc64 155135: 3f30dba v: v3
1 parent ef66dd5 commit 462693d

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: fd52224e78fe14828f8750fed469cc5c40f260e7
8+
refs/heads/try2: 4d69696ff62fb9f069fd8f64eaa0defe4c8c9cf7
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libstd/os.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,9 +1173,7 @@ fn real_args_as_bytes() -> Vec<Vec<u8>> {
11731173
let utf_c_str: *const libc::c_char =
11741174
mem::transmute(objc_msgSend(tmp, utf8Sel));
11751175
let s = CString::new(utf_c_str, false);
1176-
if s.is_not_null() {
1177-
res.push(s.as_bytes_no_nul().to_vec())
1178-
}
1176+
res.push(s.as_bytes_no_nul().to_vec())
11791177
}
11801178
}
11811179

branches/try2/src/libstd/rt/backtrace.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,9 +278,10 @@ mod imp {
278278
let cnt = unsafe { backtrace(buf.as_mut_ptr(), SIZE as libc::c_int) as uint};
279279

280280
// skipping the first one as it is write itself
281-
result::fold_(range(1, cnt).map(|i| {
281+
let iter = range(1, cnt).map(|i| {
282282
print(w, i as int, buf[i])
283-
}))
283+
});
284+
result::fold(iter, (), |_, _| ())
284285
}
285286

286287
#[cfg(not(target_os = "ios", target_arch = "arm"))]

0 commit comments

Comments
 (0)