diff options
| author | bors <bors@rust-lang.org> | 2014-06-25 02:02:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-06-25 02:02:00 +0000 |
| commit | 91be86af0952aebb1f7c1811a6abcccd7bd1c26e (patch) | |
| tree | 45fd08bfce0007e8e32453b94fd3229d1a13fba3 /src/libnative | |
| parent | 05ca9f747d62c9385cc142daa3c24a32d32a3f16 (diff) | |
| parent | cdccecb24f5c467282b73413494343d3848b4e5a (diff) | |
| download | rust-91be86af0952aebb1f7c1811a6abcccd7bd1c26e.tar.gz rust-91be86af0952aebb1f7c1811a6abcccd7bd1c26e.zip | |
auto merge of #15163 : alexcrichton/rust/rollup, r=alexcrichton
Diffstat (limited to 'src/libnative')
| -rw-r--r-- | src/libnative/io/c_unix.rs | 2 | ||||
| -rw-r--r-- | src/libnative/task.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libnative/io/c_unix.rs b/src/libnative/io/c_unix.rs index 7a52c048498..b1bc36e0b05 100644 --- a/src/libnative/io/c_unix.rs +++ b/src/libnative/io/c_unix.rs @@ -93,7 +93,7 @@ mod select { } pub fn fd_set(set: &mut fd_set, fd: i32) { - set.fds_bits[(fd / 32) as uint] |= 1 << (fd % 32); + set.fds_bits[(fd / 32) as uint] |= 1 << ((fd % 32) as uint); } } diff --git a/src/libnative/task.rs b/src/libnative/task.rs index 88e581a4791..8b7c8e61bc3 100644 --- a/src/libnative/task.rs +++ b/src/libnative/task.rs @@ -328,7 +328,7 @@ mod tests { fn yield_test() { let (tx, rx) = channel(); spawn(proc() { - for _ in range(0, 10) { task::deschedule(); } + for _ in range(0u, 10) { task::deschedule(); } tx.send(()); }); rx.recv(); |