diff options
| author | bors <bors@rust-lang.org> | 2015-03-03 02:05:18 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-03-03 02:05:18 +0000 |
| commit | 5457eab3c5f1abeb0ba4e9275d55a398f6a09134 (patch) | |
| tree | 03faf98dc680da1c6cb4cff46593d295c971df07 /src/libstd/sys | |
| parent | b4c965ee803a4521d8b4575f634e036f93e408f3 (diff) | |
| parent | 76e9fa63ba0b6d892aa880db9c8373ede3e67c03 (diff) | |
| download | rust-5457eab3c5f1abeb0ba4e9275d55a398f6a09134.tar.gz rust-5457eab3c5f1abeb0ba4e9275d55a398f6a09134.zip | |
Auto merge of #22600 - brson:num, r=Gankro
* count_ones/zeros, trailing_ones/zeros return u32, not usize * rotate_left/right take u32, not usize * RADIX, MANTISSA_DIGITS, DIGITS, BITS, BYTES are u32, not usize Doesn't touch pow because there's another PR for it. cc https://github.com/rust-lang/rust/issues/22240 r? @Gankro
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/unix/c.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/sys/unix/c.rs b/src/libstd/sys/unix/c.rs index 14394a653b0..4e9f9c80a18 100644 --- a/src/libstd/sys/unix/c.rs +++ b/src/libstd/sys/unix/c.rs @@ -194,12 +194,12 @@ mod select { #[repr(C)] pub struct fd_set { // FIXME: shouldn't this be a c_ulong? - fds_bits: [libc::uintptr_t; (FD_SETSIZE / usize::BITS)] + fds_bits: [libc::uintptr_t; (FD_SETSIZE / usize::BITS as usize)] } pub fn fd_set(set: &mut fd_set, fd: i32) { let fd = fd as uint; - set.fds_bits[fd / usize::BITS] |= 1 << (fd % usize::BITS); + set.fds_bits[fd / usize::BITS as usize] |= 1 << (fd % usize::BITS as usize); } } |