---

yaml
---
r: 92215
b: refs/heads/auto
c: ebe8ac8
h: refs/heads/master
i:
  92213: 3f7775e
  92211: 8b6f679
  92207: 3fd8d8a
v: v3

Author: pcwalton

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: fdd6750570cf1434264a601fd2b749d7fe01dee8
+refs/heads/auto: ebe8ac88a7492679846827f374effff46b070278
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/librustdoc/html/render.rs

@@ -46,7 +46,6 @@ use std::io::File;
 use std::os;
 use std::str;
 use std::task;
-use std::unstable::finally::Finally;
 use std::vec;
 
 use extra::arc::RWArc;
@@ -642,6 +641,22 @@ impl<'self> Cache {
     }
 }
 
+enum Progress {
+    JobNew,
+    JobDone,
+}
+
+/// A helper object to unconditionally send a value on a chanel.
+struct ChannelGuard {
+    channel: SharedChan<Progress>,
+}
+
+impl Drop for ChannelGuard {
+    fn drop(&mut self) {
+        self.channel.send(JobDone)
+    }
+}
+
 impl Context {
     /// Recurse in the directory structure and change the "root path" to make
     /// sure it always points to the top (relatively)
@@ -674,8 +689,6 @@ impl Context {
             Die,
             Process(Context, clean::Item),
         }
-        enum Progress { JobNew, JobDone }
-
         let workers = match os::getenv("RUSTDOC_WORKERS") {
             Some(s) => {
                 match from_str::<uint>(s) {
@@ -725,16 +738,15 @@ impl Context {
                     match port.recv() {
                         Process(cx, item) => {
                             let mut cx = cx;
-                            let item = Cell::new(item);
-                            (|| {
-                                cx.item(item.take(), |cx, item| {
-                                    prog_chan.send(JobNew);
-                                    chan.send(Process(cx.clone(), item));
-                                })
-                            }).finally(|| {
-                                // If we fail, everything else should still get
-                                // completed
-                                prog_chan.send(JobDone);
+
+                            // If we fail, everything else should still get
+                            // completed.
+                            let _guard = ChannelGuard {
+                                channel: prog_chan.clone(),
+                            };
+                            cx.item(item, |cx, item| {
+                                prog_chan.send(JobNew);
+                                chan.send(Process(cx.clone(), item));
                             })
                         }
                         Die => break,