diff options
| author | bors <bors@rust-lang.org> | 2015-03-28 17:14:44 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-03-28 17:14:44 +0000 |
| commit | 01f2c67c966297279e42be5285ccae9f5b43703e (patch) | |
| tree | ed38af07464cafb361b0ef49bcebb4948bb491b7 /src/libstd/sys | |
| parent | 3e7385aae9d58c8e12137d7c07aad48551048c13 (diff) | |
| parent | 6b7c5b9f08bba3b58d322322f630c6f7be5c7cfe (diff) | |
| download | rust-01f2c67c966297279e42be5285ccae9f5b43703e.tar.gz rust-01f2c67c966297279e42be5285ccae9f5b43703e.zip | |
Auto merge of #23807 - vhbit:ios-int-drop, r=alexcrichton
None
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/unix/backtrace.rs | 4 | ||||
| -rw-r--r-- | src/libstd/sys/unix/os.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/sys/unix/backtrace.rs b/src/libstd/sys/unix/backtrace.rs index b46d390826c..99a554a835f 100644 --- a/src/libstd/sys/unix/backtrace.rs +++ b/src/libstd/sys/unix/backtrace.rs @@ -122,9 +122,9 @@ pub fn write(w: &mut Write) -> io::Result<()> { try!(writeln!(w, "stack backtrace:")); // 100 lines should be enough - const SIZE: uint = 100; + const SIZE: usize = 100; let mut buf: [*mut libc::c_void; SIZE] = unsafe {mem::zeroed()}; - let cnt = unsafe { backtrace(buf.as_mut_ptr(), SIZE as libc::c_int) as uint}; + 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| { diff --git a/src/libstd/sys/unix/os.rs b/src/libstd/sys/unix/os.rs index 724156d81d8..fab443feebd 100644 --- a/src/libstd/sys/unix/os.rs +++ b/src/libstd/sys/unix/os.rs @@ -339,7 +339,7 @@ pub fn args() -> Args { let info = objc_msgSend(klass, process_info_sel); let args = objc_msgSend(info, arguments_sel); - let cnt: int = mem::transmute(objc_msgSend(args, count_sel)); + let cnt: usize = mem::transmute(objc_msgSend(args, count_sel)); for i in (0..cnt) { let tmp = objc_msgSend(args, object_at_sel, i); let utf_c_str: *const libc::c_char = |
