---

yaml
---
r: 13763
b: refs/heads/try
c: dc69355
h: refs/heads/master
i:
  13761: da5a6ea
  13759: 4d20d7e
v: v3

Author: brson

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 3310112169ddbc0a12043635e0ed81204d15b9c0
+refs/heads/try: dc69355e999d6c923507ccae4d877fa4370c872d
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rustdoc/gen.rs

@@ -116,6 +116,7 @@ fn write_fn(
     write_desc(ctxt, doc.desc);
     write_args(ctxt, doc.args);
     write_return(ctxt, doc.return);
+    write_failure(ctxt, doc.failure);
 }
 
 fn write_sig(ctxt: ctxt, sig: option<str>) {
@@ -304,6 +305,25 @@ fn should_write_return_description_on_same_line_as_type() {
     assert str::contains(markdown, "Returns `int` - blorp");
 }
 
+fn write_failure(ctxt: ctxt, str: option<str>) {
+    alt str {
+      some(str) {
+        ctxt.w.write_line(#fmt("Failure conditions: %s", str));
+        ctxt.w.write_line("");
+      }
+      none { }
+    }
+}
+
+#[test]
+fn should_write_failure_conditions() {
+    let markdown = test::render(
+        "#[doc(failure = \"it's the fail\")] fn a () { }");
+    assert str::contains(
+        markdown,
+        "\n\nFailure conditions: it's the fail\n\n");
+}
+
 fn write_const(
     ctxt: ctxt,
     doc: doc::constdoc