Skip to content

Commit d3aec9f

Browse files
committed
Auto merge of #30454 - mmcco:size_t, r=alexcrichton
It returns sizeof(dirent_t), so I'm not sure why its return type is int. It's only used once, and that usage immediately casts it to usize.
2 parents b9fd0ca + cf03cee commit d3aec9f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/libstd/sys/unix/fs.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,11 @@ impl Iterator for ReadDir {
127127

128128
fn next(&mut self) -> Option<io::Result<DirEntry>> {
129129
extern {
130-
fn rust_dirent_t_size() -> c_int;
130+
fn rust_dirent_t_size() -> libc::size_t;
131131
}
132132

133133
let mut buf: Vec<u8> = Vec::with_capacity(unsafe {
134-
rust_dirent_t_size() as usize
134+
rust_dirent_t_size()
135135
});
136136
let ptr = buf.as_mut_ptr() as *mut libc::dirent;
137137

src/rt/rust_builtin.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ rust_readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result) {
7777
return readdir_r(dirp, entry, result);
7878
}
7979

80-
int
80+
size_t
8181
rust_dirent_t_size() {
8282
return sizeof(struct dirent);
8383
}

0 commit comments

Comments
 (0)