}
fn merge_ret_attrs(
- doc: option<doc::retdoc>,
+ doc: doc::retdoc,
attrs: option<str>
- ) -> option<doc::retdoc> {
- alt doc {
- some(doc) {
- some({
- desc: attrs
- with doc
- })
- }
- none {
- // FIXME: Warning about documenting nil?
- none
- }
+ ) -> doc::retdoc {
+ {
+ desc: attrs
+ with doc
}
}
}
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 option::get(doc.return).desc == some("what");
+ assert doc.return.desc == some("what");
}
#[test]
brief: option<str>,
desc: option<str>,
args: [argdoc],
- return: option<retdoc>,
+ return: retdoc,
sig: option<str>
};
brief: none,
desc: none,
args: argdocs_from_args(decl.inputs),
- return: none,
+ return: {
+ desc: none,
+ ty: none
+ },
sig: none
}
}
fn write_return(
ctxt: ctxt,
- return: option<doc::retdoc>
+ doc: doc::retdoc
) {
- alt return {
- some(doc) {
- alt doc.ty {
- some(ty) {
- ctxt.w.write_line(#fmt("Returns `%s`", ty));
+ alt doc.ty {
+ some(ty) {
+ ctxt.w.write_line(#fmt("Returns `%s`", ty));
+ ctxt.w.write_line("");
+ alt doc.desc {
+ some(d) {
+ ctxt.w.write_line(d);
ctxt.w.write_line("");
- alt doc.desc {
- some(d) {
- ctxt.w.write_line(d);
- ctxt.w.write_line("");
- }
- none { }
- }
}
- none { fail "unimplemented"; }
+ none { }
}
}
none { }
fold.ctxt.have_docs =
doc.brief != none
|| doc.desc != none
- || doc.return != none;
+ || doc.return.desc != none;
ret doc;
}
fn merge_ret_ty(
srv: astsrv::srv,
fn_id: doc::ast_id,
- doc: option<doc::retdoc>
-) -> option<doc::retdoc> {
- alt doc {
- some(doc) {
- fail "unimplemented";
- }
- none {
- alt get_ret_ty(srv, fn_id) {
- some(ty) {
- some({
- desc: none,
- ty: some(ty)
- })
- }
- none { none }
+ doc: doc::retdoc
+) -> doc::retdoc {
+ alt get_ret_ty(srv, fn_id) {
+ some(ty) {
+ {
+ ty: some(ty)
+ with doc
}
}
+ none { doc }
}
}
let srv = astsrv::mk_srv_from_str(source);
let doc = extract::from_srv(srv, "");
let doc = run(srv, doc);
- assert option::get(doc.topmod.fns[0].return).ty == some("int");
+ assert doc.topmod.fns[0].return.ty == some("int");
}
#[test]
let srv = astsrv::mk_srv_from_str(source);
let doc = extract::from_srv(srv, "");
let doc = run(srv, doc);
- assert doc.topmod.fns[0].return == none;
+ assert doc.topmod.fns[0].return.ty == none;
}
fn merge_arg_tys(