squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

core::rt: Warnings

Browse source
This commit is contained in:
Brian Anderson 2013-05-13 14:25:56 -07:00
parent 390dde571e
commit 1c1f11e649
7 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libcore/rt/io/extensions.rs
View file

@ -17,6 +17,7 @@ use vec;
use rt::io::Reader;
use option::{Option, Some, None};
use unstable::finally::Finally;
use util;
pub trait ReaderUtil {
@ -60,11 +61,12 @@ impl<T: Reader> ReaderUtil for T {
fn read_byte(&mut self) -> Option<u8> {
let mut buf = [0];
match self.read(buf) {
Some(nread) if nread == 0 => {
Some(0) => {
debug!("read 0 bytes. trying again");
self.read_byte()
}
Some(nread) => Some(buf[0]),
Some(1) => Some(buf[0]),
Some(_) => util::unreachable(),
None => None
}
}

2
src/libcore/rt/io/net/tcp.rs
View file

@ -243,7 +243,7 @@ mod test {
}
do spawntask_immediately {
let stream = TcpStream::connect(addr);
let _stream = TcpStream::connect(addr);
// Close
}
}

4
src/libcore/rt/sched.rs
View file

@ -19,10 +19,6 @@ use super::context::Context;
use super::local_services::LocalServices;
use cell::Cell;
#[cfg(test)] use rt::uv::uvio::UvEventLoop;
#[cfg(test)] use unstable::run_in_bare_thread;
#[cfg(test)] use int;
// A more convenient name for external callers, e.g. `local_sched::take()`
pub mod local_sched;

2
src/libcore/rt/uv/idle.rs
View file

@ -71,7 +71,7 @@ pub impl IdleWatcher {
unsafe {
let mut idle_watcher: IdleWatcher = NativeHandle::from_native_handle(handle);
{
let mut data = idle_watcher.get_watcher_data();
let data = idle_watcher.get_watcher_data();
data.close_cb.swap_unwrap()();
}
idle_watcher.drop_watcher_data();

4
src/libcore/rt/uv/net.rs
View file

@ -131,7 +131,7 @@ pub impl StreamWatcher {
extern fn close_cb(handle: *uvll::uv_stream_t) {
let mut stream_watcher: StreamWatcher = NativeHandle::from_native_handle(handle);
{
let mut data = stream_watcher.get_watcher_data();
let data = stream_watcher.get_watcher_data();
data.close_cb.swap_unwrap()();
}
stream_watcher.drop_watcher_data();
@ -373,7 +373,7 @@ mod test {
assert!(status.is_none());
let mut server_stream_watcher = server_stream_watcher;
let mut loop_ = loop_;
let mut client_tcp_watcher = TcpWatcher::new(&mut loop_);
let client_tcp_watcher = TcpWatcher::new(&mut loop_);
let mut client_tcp_watcher = client_tcp_watcher.as_stream();
server_stream_watcher.accept(client_tcp_watcher);
let count_cell = Cell(0);

9
src/libcore/rt/uv/timer.rs
View file

@ -69,7 +69,7 @@ impl TimerWatcher {
extern fn close_cb(handle: *uvll::uv_timer_t) {
let mut watcher: TimerWatcher = NativeHandle::from_native_handle(handle);
{
let mut data = watcher.get_watcher_data();
let data = watcher.get_watcher_data();
data.close_cb.swap_unwrap()();
}
watcher.drop_watcher_data();
@ -125,7 +125,6 @@ mod test {
assert!(status.is_none());
unsafe { *count_ptr += 1 };
do timer.start(10, 0) |timer, status| {
let mut timer = timer;
assert!(status.is_none());
unsafe { *count_ptr += 1 };
timer.close(||());
@ -159,18 +158,16 @@ mod test {
let mut loop_ = timer.event_loop();
let mut timer2 = TimerWatcher::new(&mut loop_);
do timer2.start(10, 0) |timer2, status| {
do timer2.start(10, 0) |timer2, _| {
unsafe { *count_ptr += 1; }
let mut timer2 = timer2;
timer2.close(||());
// Restart the original timer
let mut timer = timer;
do timer.start(10, 0) |timer, status| {
do timer.start(10, 0) |timer, _| {
unsafe { *count_ptr += 1; }
let mut timer = timer;
timer.close(||());
}
}

3
src/libcore/rt/uv/uvio.rs
View file

@ -77,7 +77,6 @@ impl EventLoop for UvEventLoop {
let mut timer = TimerWatcher::new(self.uvio.uv_loop());
do timer.start(ms, 0) |timer, status| {
assert!(status.is_none());
let mut timer = timer;
timer.close(||());
f();
}
@ -235,7 +234,7 @@ impl RtioTcpListener for UvTcpListener {
let maybe_stream = if status.is_none() {
let mut server_stream_watcher = server_stream_watcher;
let mut loop_ = server_stream_watcher.event_loop();
let mut client_tcp_watcher = TcpWatcher::new(&mut loop_);
let client_tcp_watcher = TcpWatcher::new(&mut loop_);
let client_tcp_watcher = client_tcp_watcher.as_stream();
// XXX: Need's to be surfaced in interface
server_stream_watcher.accept(client_tcp_watcher);