Skip to content

Commit 01f2c67

Browse files
committed
Auto merge of rust-lang#23807 - vhbit:ios-int-drop, r=alexcrichton
None
2 parents 3e7385a + 6b7c5b9 commit 01f2c67

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/libstd/sys/unix/backtrace.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,9 @@ pub fn write(w: &mut Write) -> io::Result<()> {
122122

123123
try!(writeln!(w, "stack backtrace:"));
124124
// 100 lines should be enough
125-
const SIZE: uint = 100;
125+
const SIZE: usize = 100;
126126
let mut buf: [*mut libc::c_void; SIZE] = unsafe {mem::zeroed()};
127-
let cnt = unsafe { backtrace(buf.as_mut_ptr(), SIZE as libc::c_int) as uint};
127+
let cnt = unsafe { backtrace(buf.as_mut_ptr(), SIZE as libc::c_int) as usize};
128128

129129
// skipping the first one as it is write itself
130130
let iter = (1..cnt).map(|i| {

src/libstd/sys/unix/os.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ pub fn args() -> Args {
339339
let info = objc_msgSend(klass, process_info_sel);
340340
let args = objc_msgSend(info, arguments_sel);
341341

342-
let cnt: int = mem::transmute(objc_msgSend(args, count_sel));
342+
let cnt: usize = mem::transmute(objc_msgSend(args, count_sel));
343343
for i in (0..cnt) {
344344
let tmp = objc_msgSend(args, object_at_sel, i);
345345
let utf_c_str: *const libc::c_char =

0 commit comments

Comments
 (0)