---

yaml
---
r: 142675
b: refs/heads/try2
c: f202713
h: refs/heads/master
i:
  142673: efc6976
  142671: 21d6ed5
v: v3

Author: Eric Reed

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 1af20163586d13f505492865f70fe9767f35a306
+refs/heads/try2: f202713b73559941ad64c539dc10b71655879403
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libstd/rt/io/net/udp.rs

@@ -84,7 +84,7 @@ impl UdpStream {
 }
 
 impl Reader for UdpStream {
-    fn read(&mut self, buf: &mut [u8]) -> Option<uint> { 
+    fn read(&mut self, buf: &mut [u8]) -> Option<uint> {
         do self.as_socket |sock| {
             match sock.recvfrom(buf) {
                 Some((_nread, src)) if src != self.connectedTo => Some(0),
@@ -131,7 +131,7 @@ mod test {
         }
     }
 
-    #[test] 
+    #[test]
     fn socket_smoke_test() {
         do run_in_newsched_task {
             let server_ip = next_test_ip4();

branches/try2/src/libstd/rt/uv/net.rs

@@ -50,12 +50,12 @@ pub fn uv_ip4_to_ip4(addr: *sockaddr_in) -> IpAddr {
     let port = unsafe { ip4_port(addr) };
     let ip_str = str::from_bytes_slice(buf).trim_right_chars(&'\x00');
     let ip: ~[u8] = ip_str.split_iter('.')
-                          .transform(|s: &str| -> u8 { 
-                                        let x = FromStr::from_str(s); 
+                          .transform(|s: &str| -> u8 {
+                                        let x = FromStr::from_str(s);
                                         assert!(x.is_some());
                                         x.unwrap() })
                           .collect();
-    assert!(ip.len() >= 4); 
+    assert!(ip.len() >= 4);
     Ipv4(ip[0], ip[1], ip[2], ip[3], port as u16)
 }
 
@@ -304,7 +304,7 @@ impl UdpWatcher {
                     }
                 }
             }
-            _ => fail!() // TODO ipv6
+            _ => fail!() // NOTE ipv6
         }
     }
 
@@ -325,9 +325,10 @@ impl UdpWatcher {
             return (*alloc_cb)(suggested_size as uint);
         }
 
-        /* TODO the socket address should actually be a pointer to either a sockaddr_in or sockaddr_in6.
+        /* NOTE the socket address should actually be a pointer to
+           either a sockaddr_in or sockaddr_in6.
            In libuv, the udp_recv callback takes a struct *sockaddr */
-        extern fn recv_cb(handle: *uvll::uv_udp_t, nread: ssize_t, buf: Buf, 
+        extern fn recv_cb(handle: *uvll::uv_udp_t, nread: ssize_t, buf: Buf,
                           addr: *uvll::sockaddr_in, flags: c_uint) {
             rtdebug!("buf addr: %x", buf.base as uint);
             rtdebug!("buf len: %d", buf.len as int);
@@ -364,7 +365,7 @@ impl UdpWatcher {
                     }
                 }
             }
-            _ => fail!() // TODO ipv6
+            _ => fail!() // NOTE ipv6
         }
 
         extern fn send_cb(req: *uvll::uv_udp_send_t, status: c_int) {
@@ -490,7 +491,9 @@ impl UdpSendRequest {
 
     pub fn handle(&self) -> UdpWatcher {
         unsafe {
-            NativeHandle::from_native_handle(uvll::get_udp_handle_from_send_req(self.native_handle()))
+            NativeHandle::from_native_handle(
+                uvll::get_udp_handle_from_send_req(
+                    self.native_handle()))
         }
     }
 
@@ -544,7 +547,7 @@ mod test {
         }
     }
 
-    #[test] 
+    #[test]
     fn udp_bind_close() {
         do run_in_bare_thread() {
             let mut loop_ = Loop::new();
@@ -633,7 +636,7 @@ mod test {
         }
     }
 
-    #[test] 
+    #[test]
     fn udp_recv() {
         do run_in_bare_thread() {
             static MAX: int = 10;

branches/try2/src/libstd/rt/uv/uvio.rs

@@ -489,7 +489,7 @@ impl RtioUdpSocket for UvUdpSocket {
             let task_cell = Cell::new(task);
             let alloc: AllocCallback = |_| unsafe { slice_to_uv_buf(*buf_ptr) };
             do watcher.recv_start(alloc) |watcher, nread, _buf, addr, flags, status| {
-                let _ = flags; // TODO add handling for partials?
+                let _ = flags; // NOTE add handling for partials?
 
                 watcher.recv_stop();
 
@@ -596,7 +596,7 @@ fn test_simple_tcp_server_and_client() {
     }
 }
 
-#[test] 
+#[test]
 fn test_simple_udp_server_and_client() {
     do run_in_newsched_task {
         let server_addr = next_test_ip4();

branches/try2/src/libstd/rt/uv/uvll.rs

@@ -218,7 +218,8 @@ pub unsafe fn udp_send6<T>(req: *uv_udp_send_t, handle: *T, buf_in: &[uv_buf_t],
     return rust_uv_udp_send6(req, handle as *c_void, buf_ptr, buf_cnt, addr, cb);
 }
 
-pub unsafe fn udp_recv_start(server: *uv_udp_t, on_alloc: uv_alloc_cb, on_recv: uv_udp_recv_cb) -> c_int {
+pub unsafe fn udp_recv_start(server: *uv_udp_t, on_alloc: uv_alloc_cb,
+                             on_recv: uv_udp_recv_cb) -> c_int {
     return rust_uv_udp_recv_start(server, on_alloc, on_recv);
 }
 

branches/try2/src/rt/rust_uv.cpp

@@ -309,13 +309,13 @@ rust_uv_udp_bind6(uv_udp_t* server, sockaddr_in6* addr_ptr, unsigned flags) {
 }
 
 extern "C" int
-rust_uv_udp_send(uv_udp_send_t* req, uv_udp_t* handle, uv_buf_t* buf_in, 
+rust_uv_udp_send(uv_udp_send_t* req, uv_udp_t* handle, uv_buf_t* buf_in,
                  int buf_cnt, sockaddr_in* addr_ptr, uv_udp_send_cb cb) {
     return uv_udp_send(req, handle, buf_in, buf_cnt, *addr_ptr, cb);
 }
 
 extern "C" int
-rust_uv_udp_send6(uv_udp_send_t* req, uv_udp_t* handle, uv_buf_t* buf_in, 
+rust_uv_udp_send6(uv_udp_send_t* req, uv_udp_t* handle, uv_buf_t* buf_in,
                   int buf_cnt, sockaddr_in6* addr_ptr, uv_udp_send_cb cb) {
     return uv_udp_send6(req, handle, buf_in, buf_cnt, *addr_ptr, cb);
 }