---

yaml
---
r: 11612
b: refs/heads/master
c: 0b2ffa8
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 2cdb662022a7427f9eff569fc211b1aed6f632ec
+refs/heads/master: 0b2ffa854fd243055e3e41c7a6cd5116531afc9a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustdoc/markdown_pass.rs

@@ -6,19 +6,9 @@ import markdown_writer::writer_util;
 export mk_pass;
 export header_kind, header_name, header_text;
 
-fn mk_pass(config: config::config) -> pass {
-    mk_pass_(config, markdown_writer::make_writer(config))
-}
-
-// FIXME: This is a really convoluted interface to work around trying
-// to get a writer into a unique closure and then being able to test
-// what was written afterward
-fn mk_pass_(
-    config: config::config,
-    writer: writer
-) -> pass {
+fn mk_pass(writer: writer) -> pass {
     let f = fn~(srv: astsrv::srv, doc: doc::doc) -> doc::doc {
-        run(srv, doc, config, writer)
+        run(srv, doc, writer)
     };
 
     {
@@ -30,7 +20,6 @@ fn mk_pass_(
 fn run(
     srv: astsrv::srv,
     doc: doc::doc,
-    _config: config::config,
     writer: writer
 ) -> doc::doc {
 
@@ -969,7 +958,7 @@ mod test {
             with config::default_config("")
         };
         let (writer, future) = markdown_writer::future_writer();
-        let pass = mk_pass_(config, writer);
+        let pass = mk_pass(writer);
         pass.f(srv, doc);
         ret future::get(future);
     }

trunk/src/rustdoc/rustdoc.rs

@@ -156,7 +156,9 @@ fn run(config: config::config) {
             sort_item_name_pass::mk_pass(),
             sort_item_type_pass::mk_pass(),
             markdown_index_pass::mk_pass(),
-            markdown_pass::mk_pass(config)
+            markdown_pass::mk_pass(
+                markdown_writer::make_writer(config)
+            )
         ]);
     }
 }