---

yaml
---
r: 7774
b: refs/heads/snap-stage3
c: efc0679
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 6d8058451b71f3e5a8178ca21856b529655df032
+refs/heads/snap-stage3: efc067952dc907f3f9646d4effc1f3891e582557
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/snap-stage3/src/rustdoc/attr_pass.rs

@@ -135,7 +135,8 @@ fn fold_fn(
             brief: attrs.brief,
             desc: attrs.desc,
             args: merge_arg_attrs(doc.args, attrs.args),
-            return: merge_ret_attrs(doc.return, attrs.return)
+            return: merge_ret_attrs(doc.return, attrs.return),
+            failure: attrs.failure
             with *doc
         };
     }
@@ -213,6 +214,16 @@ fn fold_fn_should_preserve_sig() {
     assert doc.sig == some("fn a() -> int");
 }
 
+#[test]
+fn fold_fn_should_extract_failure_conditions() {
+    let source = "#[doc(failure = \"what\")] fn a() { }";
+    let srv = astsrv::mk_srv_from_str(source);
+    let doc = extract::from_srv(srv, "");
+    let fold = fold::default_seq_fold(srv);
+    let doc = fold_fn(fold, doc.topmod.fns[0]);
+    assert doc.failure == some("what");
+}
+
 fn fold_const(
     fold: fold::fold<astsrv::srv>,
     doc: doc::constdoc

branches/snap-stage3/src/rustdoc/doc.rs

@@ -32,6 +32,7 @@ type fndoc = ~{
     desc: option<str>,
     args: [argdoc],
     return: retdoc,
+    failure: option<str>,
     sig: option<str>
 };
 

branches/snap-stage3/src/rustdoc/extract.rs

@@ -95,6 +95,7 @@ fn fndoc_from_fn(
             desc: none,
             ty: none
         },
+        failure: none,
         sig: none
     }
 }