---

yaml
---
r: 11404
b: refs/heads/master
c: 96e3031
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: d6095dc6b5baa44c8d15db76dee185170b7be4b6
+refs/heads/master: 96e3031675aba427c1cff8967f2c1cbbcdb6b5ff
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustdoc/astsrv.rs

@@ -32,26 +32,33 @@ type ctxt = {
     exp_map: resolve::exp_map
 };
 
+type srv_owner<T> = fn(srv: srv) -> T;
 type ctxt_handler<T> = fn~(ctxt: ctxt) -> T;
 
 type srv = {
     ctxt: ctxt
 };
 
-fn from_str(source: str) -> srv {
+fn from_str<T>(source: str, owner: srv_owner<T>) -> T {
     let (sess, ignore_errors) = build_session();
-    {
+
+    let srv = {
         ctxt: build_ctxt(sess, parse::from_str_sess(sess, source),
                          ignore_errors)
-    }
+    };
+
+    owner(srv)
 }
 
-fn from_file(file: str) -> srv {
+fn from_file<T>(file: str, owner: srv_owner<T>) -> T {
     let (sess, ignore_errors) = build_session();
-    {
+
+    let srv = {
         ctxt: build_ctxt(sess, parse::from_file_sess(sess, file),
                          ignore_errors)
-    }
+    };
+
+    owner(srv)
 }
 
 fn build_ctxt(sess: session::session, ast: @ast::crate,
@@ -172,28 +179,31 @@ fn build_error_handlers(
 #[test]
 fn should_prune_unconfigured_items() {
     let source = "#[cfg(shut_up_and_leave_me_alone)]fn a() { }";
-    let srv = from_str(source);
-    exec(srv) {|ctxt|
-        assert vec::is_empty(ctxt.ast.node.module.items);
+    from_str(source) {|srv|
+        exec(srv) {|ctxt|
+            assert vec::is_empty(ctxt.ast.node.module.items);
+        }
     }
 }
 
 #[test]
 fn srv_should_build_ast_map() {
     let source = "fn a() { }";
-    let srv = from_str(source);
-    exec(srv) {|ctxt|
-        assert ctxt.ast_map.size() != 0u
-    };
+    from_str(source) {|srv|
+        exec(srv) {|ctxt|
+            assert ctxt.ast_map.size() != 0u
+        };
+    }
 }
 
 #[test]
 fn srv_should_build_reexport_map() {
     let source = "import a::b; export b; mod a { mod b { } }";
-    let srv = from_str(source);
-    exec(srv) {|ctxt|
-        assert ctxt.exp_map.size() != 0u
-    };
+    from_str(source) {|srv|
+        exec(srv) {|ctxt|
+            assert ctxt.exp_map.size() != 0u
+        };
+    }
 }
 
 #[test]
@@ -202,34 +212,34 @@ fn srv_should_resolve_external_crates() {
                   fn f() -> std::sha1::sha1 {\
                   std::sha1::mk_sha1() }";
     // Just testing that resolve doesn't crash
-    from_str(source);
+    from_str(source) {|_srv| }
 }
 
 #[test]
 fn srv_should_resolve_core_crate() {
     let source = "fn a() -> option { fail }";
     // Just testing that resolve doesn't crash
-    from_str(source);
+    from_str(source) {|_srv| }
 }
 
 #[test]
 fn srv_should_resolve_non_existant_imports() {
     // We want to ignore things we can't resolve. Shouldn't
     // need to be able to find external crates to create docs.
     let source = "import wooboo; fn a() { }";
-    from_str(source);
+    from_str(source) {|_srv| }
 }
 
 #[test]
 fn srv_should_resolve_non_existant_uses() {
     let source = "use forble; fn a() { }";
-    from_str(source);
+    from_str(source) {|_srv| }
 }
 
 #[test]
 fn should_ignore_external_import_paths_that_dont_exist() {
     let source = "use forble; import forble::bippy;";
-    from_str(source);
+    from_str(source) {|_srv| }
 }
 
 fn exec<T:send>(
@@ -242,7 +252,8 @@ fn exec<T:send>(
 #[test]
 fn srv_should_return_request_result() {
     let source = "fn a() { }";
-    let srv = from_str(source);
-    let result = exec(srv) {|_ctxt| 1000};
-    assert result == 1000;
+    from_str(source) {|srv|
+        let result = exec(srv) {|_ctxt| 1000};
+        assert result == 1000;
+    }
 }

trunk/src/rustdoc/attr_pass.rs

@@ -183,23 +183,25 @@ fn should_extract_fn_arg_attributes() {
 #[test]
 fn should_extract_fn_return_attributes() {
     let source = "#[doc(return = \"what\")] fn a() -> int { }";
-    let srv = astsrv::from_str(source);
-    let doc = extract::from_srv(srv, "");
-    let doc = tystr_pass::mk_pass()(srv, doc);
-    let fold = fold::default_seq_fold(srv);
-    let doc = fold_fn(fold, doc.topmod.fns()[0]);
-    assert doc.return.desc == some("what");
+    astsrv::from_str(source) {|srv|
+        let doc = extract::from_srv(srv, "");
+        let doc = tystr_pass::mk_pass()(srv, doc);
+        let fold = fold::default_seq_fold(srv);
+        let doc = fold_fn(fold, doc.topmod.fns()[0]);
+        assert doc.return.desc == some("what");
+    }
 }
 
 #[test]
 fn should_preserve_fn_sig() {
     let source = "fn a() -> int { }";
-    let srv = astsrv::from_str(source);
-    let doc = extract::from_srv(srv, "");
-    let doc = tystr_pass::mk_pass()(srv, doc);
-    let fold = fold::default_seq_fold(srv);
-    let doc = fold_fn(fold, doc.topmod.fns()[0]);
-    assert doc.sig == some("fn a() -> int");
+    astsrv::from_str(source) {|srv|
+        let doc = extract::from_srv(srv, "");
+        let doc = tystr_pass::mk_pass()(srv, doc);
+        let fold = fold::default_seq_fold(srv);
+        let doc = fold_fn(fold, doc.topmod.fns()[0]);
+        assert doc.sig == some("fn a() -> int");
+    }
 }
 
 #[test]
@@ -448,8 +450,9 @@ fn should_extract_type_docs() {
 #[cfg(test)]
 mod test {
     fn mk_doc(source: str) -> doc::cratedoc {
-        let srv = astsrv::from_str(source);
-        let doc = extract::from_srv(srv, "");
-        run(srv, doc)
+        astsrv::from_str(source) {|srv|
+            let doc = extract::from_srv(srv, "");
+            run(srv, doc)
+        }
     }
 }

trunk/src/rustdoc/desc_pass.rs

@@ -279,9 +279,10 @@ fn should_execute_op_on_type_desc() {
 #[cfg(test)]
 mod test {
     fn mk_doc(source: str) -> doc::cratedoc {
-        let srv = astsrv::from_str(source);
-        let doc = extract::from_srv(srv, "");
-        let doc = attr_pass::mk_pass()(srv, doc);
-        mk_pass(str::trim)(srv, doc)
+        astsrv::from_str(source) {|srv|
+            let doc = extract::from_srv(srv, "");
+            let doc = attr_pass::mk_pass()(srv, doc);
+            mk_pass(str::trim)(srv, doc)
+        }
     }
 }

trunk/src/rustdoc/desc_to_brief_pass.rs

@@ -147,10 +147,11 @@ fn should_promote_type_desc() {
 #[cfg(test)]
 mod test {
     fn mk_doc(source: str) -> doc::cratedoc {
-        let srv = astsrv::from_str(source);
-        let doc = extract::from_srv(srv, "");
-        let doc = attr_pass::mk_pass()(srv, doc);
-        run(srv, doc)
+        astsrv::from_str(source) {|srv|
+            let doc = extract::from_srv(srv, "");
+            let doc = attr_pass::mk_pass()(srv, doc);
+            run(srv, doc)
+        }
     }
 }
 

trunk/src/rustdoc/extract.rs

@@ -379,8 +379,9 @@ mod test {
     #[test]
     fn extract_from_seq_srv() {
         let source = "";
-        let srv = astsrv::from_str(source);
-        let doc = from_srv(srv, "name");
-        assert doc.topmod.name() == "name";
+        astsrv::from_str(source) {|srv|
+            let doc = from_srv(srv, "name");
+            assert doc.topmod.name() == "name";
+        }
     }
 }

trunk/src/rustdoc/markdown_pass.rs

@@ -790,16 +790,17 @@ mod test {
     }
 
     fn create_doc_srv(source: str) -> (astsrv::srv, doc::cratedoc) {
-        let srv = astsrv::from_str(source);
-        let doc = extract::from_srv(srv, "");
-        #debug("doc (extract): %?", doc);
-        let doc = tystr_pass::mk_pass()(srv, doc);
-        #debug("doc (tystr): %?", doc);
-        let doc = path_pass::mk_pass()(srv, doc);
-        #debug("doc (path): %?", doc);
-        let doc = attr_pass::mk_pass()(srv, doc);
-        #debug("doc (attr): %?", doc);
-        (srv, doc)
+        astsrv::from_str(source) {|srv|
+            let doc = extract::from_srv(srv, "");
+            #debug("doc (extract): %?", doc);
+            let doc = tystr_pass::mk_pass()(srv, doc);
+            #debug("doc (tystr): %?", doc);
+            let doc = path_pass::mk_pass()(srv, doc);
+            #debug("doc (path): %?", doc);
+            let doc = attr_pass::mk_pass()(srv, doc);
+            #debug("doc (attr): %?", doc);
+            (srv, doc)
+        }
     }
 
     fn create_doc(source: str) -> doc::cratedoc {
@@ -836,11 +837,12 @@ mod test {
 
     #[test]
     fn write_markdown_should_write_crate_header() {
-        let srv = astsrv::from_str("");
-        let doc = extract::from_srv(srv, "belch");
-        let doc = attr_pass::mk_pass()(srv, doc);
-        let markdown = write_markdown_str(doc);
-        assert str::contains(markdown, "# Crate belch");
+        astsrv::from_str("") {|srv|
+            let doc = extract::from_srv(srv, "belch");
+            let doc = attr_pass::mk_pass()(srv, doc);
+            let markdown = write_markdown_str(doc);
+            assert str::contains(markdown, "# Crate belch");
+        }
     }
 
     #[test]

trunk/src/rustdoc/path_pass.rs

@@ -45,18 +45,20 @@ fn fold_mod(fold: fold::fold<ctxt>, doc: doc::moddoc) -> doc::moddoc {
 #[test]
 fn should_record_mod_paths() {
     let source = "mod a { mod b { mod c { } } mod d { mod e { } } }";
-    let srv = astsrv::from_str(source);
-    let doc = extract::from_srv(srv, "");
-    let doc = run(srv, doc);
-    assert doc.topmod.mods()[0].mods()[0].mods()[0].path() == ["a", "b"];
-    assert doc.topmod.mods()[0].mods()[1].mods()[0].path() == ["a", "d"];
+    astsrv::from_str(source) {|srv|
+        let doc = extract::from_srv(srv, "");
+        let doc = run(srv, doc);
+        assert doc.topmod.mods()[0].mods()[0].mods()[0].path() == ["a", "b"];
+        assert doc.topmod.mods()[0].mods()[1].mods()[0].path() == ["a", "d"];
+    }
 }
 
 #[test]
 fn should_record_fn_paths() {
     let source = "mod a { fn b() { } }";
-    let srv = astsrv::from_str(source);
-    let doc = extract::from_srv(srv, "");
-    let doc = run(srv, doc);
-    assert doc.topmod.mods()[0].fns()[0].path() == ["a"];
+    astsrv::from_str(source) {|srv|
+        let doc = extract::from_srv(srv, "");
+        let doc = run(srv, doc);
+        assert doc.topmod.mods()[0].fns()[0].path() == ["a"];
+    }
 }

trunk/src/rustdoc/prune_undoc_details_pass.rs

@@ -64,12 +64,13 @@ fn should_elide_undocumented_arguments() {
 #[test]
 fn should_elide_undocumented_return_values() {
     let source = "#[doc = \"fonz\"] fn a() -> int { }";
-    let srv = astsrv::from_str(source);
-    let doc = extract::from_srv(srv, "");
-    let doc = tystr_pass::mk_pass()(srv, doc);
-    let doc = attr_pass::mk_pass()(srv, doc);
-    let doc = run(srv, doc);
-    assert doc.topmod.fns()[0].return.ty == none;
+    astsrv::from_str(source) {|srv|
+        let doc = extract::from_srv(srv, "");
+        let doc = tystr_pass::mk_pass()(srv, doc);
+        let doc = attr_pass::mk_pass()(srv, doc);
+        let doc = run(srv, doc);
+        assert doc.topmod.fns()[0].return.ty == none;
+    }
 }
 
 fn fold_res(
@@ -154,9 +155,10 @@ fn should_elide_undocumented_impl_method_return_values() {
 #[cfg(test)]
 mod test {
     fn mk_doc(source: str) -> doc::cratedoc {
-        let srv = astsrv::from_str(source);
-        let doc = extract::from_srv(srv, "");
-        let doc = attr_pass::mk_pass()(srv, doc);
-        run(srv, doc)
+        astsrv::from_str(source) {|srv|
+            let doc = extract::from_srv(srv, "");
+            let doc = attr_pass::mk_pass()(srv, doc);
+            run(srv, doc)
+        }
     }
 }

trunk/src/rustdoc/prune_undoc_items_pass.rs

@@ -365,9 +365,10 @@ fn should_elide_undocumented_types() {
 #[cfg(test)]
 mod test {
     fn mk_doc(source: str) -> doc::cratedoc {
-        let srv = astsrv::from_str(source);
-        let doc = extract::from_srv(srv, "");
-        let doc = attr_pass::mk_pass()(srv, doc);
-        run(srv, doc)
+        astsrv::from_str(source) {|srv|
+            let doc = extract::from_srv(srv, "");
+            let doc = attr_pass::mk_pass()(srv, doc);
+            run(srv, doc)
+        }
     }
 }

trunk/src/rustdoc/prune_unexported_pass.rs

@@ -229,8 +229,9 @@ fn should_prune_unexported_types() {
 #[cfg(test)]
 mod test {
     fn mk_doc(source: str) -> doc::cratedoc {
-        let srv = astsrv::from_str(source);
-        let doc = extract::from_srv(srv, "");
-        run(srv, doc)
+        astsrv::from_str(source) {|srv|
+            let doc = extract::from_srv(srv, "");
+            run(srv, doc)
+        }
     }
 }