@@ -359,7 +359,7 @@ impl UdpWatcher {
359
359
}
360
360
}
361
361
362
- pub fn bind ( & self , address : IpAddr ) -> Result < ( ) , UvError > {
362
+ pub fn bind ( & mut self , address : IpAddr ) -> Result < ( ) , UvError > {
363
363
do ip_as_uv_ip ( address) |addr| {
364
364
let result = unsafe {
365
365
match addr {
@@ -374,10 +374,9 @@ impl UdpWatcher {
374
374
}
375
375
}
376
376
377
- pub fn recv_start ( & self , alloc : AllocCallback , cb : UdpReceiveCallback ) {
377
+ pub fn recv_start ( & mut self , alloc : AllocCallback , cb : UdpReceiveCallback ) {
378
378
{
379
- let mut this = * self ;
380
- let data = this. get_watcher_data ( ) ;
379
+ let data = self . get_watcher_data ( ) ;
381
380
data. alloc_cb = Some ( alloc) ;
382
381
data. udp_recv_cb = Some ( cb) ;
383
382
}
@@ -409,14 +408,13 @@ impl UdpWatcher {
409
408
}
410
409
}
411
410
412
- pub fn recv_stop ( & self ) {
411
+ pub fn recv_stop ( & mut self ) {
413
412
unsafe { uvll:: udp_recv_stop ( self . native_handle ( ) ) ; }
414
413
}
415
414
416
- pub fn send( & self , buf : Buf , address : IpAddr , cb : UdpSendCallback ) {
415
+ pub fn send( & mut self , buf : Buf , address : IpAddr , cb : UdpSendCallback ) {
417
416
{
418
- let mut this = * self ;
419
- let data = this. get_watcher_data ( ) ;
417
+ let data = self . get_watcher_data ( ) ;
420
418
assert ! ( data. udp_send_cb. is_none( ) ) ;
421
419
data. udp_send_cb = Some ( cb) ;
422
420
}
@@ -620,7 +618,7 @@ mod test {
620
618
fn udp_bind_close_ip4() {
621
619
do run_in_bare_thread() {
622
620
let mut loop_ = Loop::new();
623
- let udp_watcher = { UdpWatcher::new(&mut loop_) };
621
+ let mut udp_watcher = { UdpWatcher::new(&mut loop_) };
624
622
let addr = next_test_ip4();
625
623
udp_watcher.bind(addr);
626
624
udp_watcher.close(||());
@@ -633,7 +631,7 @@ mod test {
633
631
fn udp_bind_close_ip6() {
634
632
do run_in_bare_thread() {
635
633
let mut loop_ = Loop::new();
636
- let udp_watcher = { UdpWatcher::new(&mut loop_) };
634
+ let mut udp_watcher = { UdpWatcher::new(&mut loop_) };
637
635
let addr = next_test_ip6();
638
636
udp_watcher.bind(addr);
639
637
udp_watcher.close(||());
@@ -798,15 +796,15 @@ mod test {
798
796
let server_addr = next_test_ip4();
799
797
let client_addr = next_test_ip4();
800
798
801
- let server = UdpWatcher::new(&loop_);
799
+ let mut server = UdpWatcher::new(&loop_);
802
800
assert!(server.bind(server_addr).is_ok());
803
801
804
802
rtdebug!(" starting read");
805
803
let alloc: AllocCallback = |size| {
806
804
vec_to_uv_buf(vec::from_elem(size, 0u8))
807
805
};
808
806
809
- do server.recv_start(alloc) |server, nread, buf, src, flags, status| {
807
+ do server.recv_start(alloc) |mut server, nread, buf, src, flags, status| {
810
808
server.recv_stop();
811
809
rtdebug!(" i' m reading!");
812
810
assert!(status.is_none());
@@ -830,7 +828,7 @@ mod test {
830
828
831
829
do Thread::start {
832
830
let mut loop_ = Loop::new();
833
- let client = UdpWatcher::new(&loop_);
831
+ let mut client = UdpWatcher::new(&loop_);
834
832
assert!(client.bind(client_addr).is_ok());
835
833
let msg = ~[0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
836
834
let buf = slice_to_uv_buf(msg);
@@ -857,15 +855,15 @@ mod test {
857
855
let server_addr = next_test_ip6();
858
856
let client_addr = next_test_ip6();
859
857
860
- let server = UdpWatcher::new(&loop_);
858
+ let mut server = UdpWatcher::new(&loop_);
861
859
assert!(server.bind(server_addr).is_ok());
862
860
863
861
rtdebug!(" starting read");
864
862
let alloc: AllocCallback = |size| {
865
863
vec_to_uv_buf(vec::from_elem(size, 0u8))
866
864
};
867
865
868
- do server.recv_start(alloc) |server, nread, buf, src, flags, status| {
866
+ do server.recv_start(alloc) |mut server, nread, buf, src, flags, status| {
869
867
server.recv_stop();
870
868
rtdebug!(" i' m reading!");
871
869
assert!(status.is_none());
@@ -889,7 +887,7 @@ mod test {
889
887
890
888
do Thread::start {
891
889
let mut loop_ = Loop::new();
892
- let client = UdpWatcher::new(&loop_);
890
+ let mut client = UdpWatcher::new(&loop_);
893
891
assert!(client.bind(client_addr).is_ok());
894
892
let msg = ~[0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
895
893
let buf = slice_to_uv_buf(msg);
0 commit comments