---

yaml
---
r: 142679
b: refs/heads/try2
c: f604686
h: refs/heads/master
i:
  142677: 27792cf
  142675: e552906
  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: c5b19f0bf9c2f32f368b0f2565a06ae0271a96c1
+refs/heads/try2: f60468629566ae896e90039f89ef5bb63f920aef
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

@@ -264,7 +264,7 @@ impl IoFactory for UvIoFactory {
     fn udp_bind(&mut self, addr: IpAddr) -> Result<~RtioUdpSocketObject, IoError> {
         let /*mut*/ watcher = UdpWatcher::new(self.uv_loop());
         match watcher.bind(addr) {
-            Ok(_) => Ok(~UvUdpSocket { watcher: watcher }),
+            Ok(_) => Ok(~UvUdpSocket(watcher)),
             Err(uverr) => {
                 let scheduler = Local::take::<Scheduler>();
                 do scheduler.deschedule_running_task_and_then |_, task| {
@@ -451,22 +451,15 @@ impl RtioTcpStream for UvTcpStream {
     }
 }
 
-pub struct UvUdpSocket {
-    watcher: UdpWatcher
-}
-
-impl UvUdpSocket {
-    fn watcher(&self) -> UdpWatcher { self.watcher }
-}
+pub struct UvUdpSocket(UdpWatcher);
 
 impl Drop for UvUdpSocket {
     fn finalize(&self) {
         rtdebug!("closing udp socket");
-        let watcher = self.watcher();
         let scheduler = Local::take::<Scheduler>();
         do scheduler.deschedule_running_task_and_then |_, task| {
             let task_cell = Cell::new(task);
-            do watcher.close {
+            do self.close {
                 let scheduler = Local::take::<Scheduler>();
                 scheduler.resume_task_immediately(task_cell.take());
             }
@@ -481,14 +474,13 @@ impl RtioUdpSocket for UvUdpSocket {
 
         let scheduler = Local::take::<Scheduler>();
         assert!(scheduler.in_task_context());
-        let watcher = self.watcher();
         let buf_ptr: *&mut [u8] = &buf;
         do scheduler.deschedule_running_task_and_then |sched, task| {
             rtdebug!("recvfrom: entered scheduler context");
             assert!(!sched.in_task_context());
             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| {
+            do self.recv_start(alloc) |watcher, nread, _buf, addr, flags, status| {
                 let _ = flags; // NOTE add handling for partials?
 
                 watcher.recv_stop();
@@ -517,12 +509,11 @@ impl RtioUdpSocket for UvUdpSocket {
         let result_cell_ptr: *Cell<Result<(), IoError>> = &result_cell;
         let scheduler = Local::take::<Scheduler>();
         assert!(scheduler.in_task_context());
-        let watcher = self.watcher();
         let buf_ptr: *&[u8] = &buf;
         do scheduler.deschedule_running_task_and_then |_, task| {
             let task_cell = Cell::new(task);
             let buf = unsafe { slice_to_uv_buf(*buf_ptr) };
-            do watcher.send(buf, dst) |_watcher, status| {
+            do self.send(buf, dst) |_watcher, status| {
 
                 let result = match status {
                     None => Ok(()),