---

yaml
---
r: 10695
b: refs/heads/snap-stage3
c: e9f1928
h: refs/heads/master
i:
  10693: 6f900aa
  10691: 774ffeb
  10687: 9eb5911
v: v3

Author: catamorphism

[refs]

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

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

@@ -639,18 +639,6 @@ fn should_write_variant_list_with_signatures() {
          \n* `c(int)` - a\n\n");
 }
 
-#[test]
-fn should_write_resource_header() {
-    let markdown = test::render("resource r(a: bool) { }");
-    assert str::contains(markdown, "## Resource `r`");
-}
-
-#[test]
-fn should_write_resource_signature() {
-    let markdown = test::render("resource r(a: bool) { }");
-    assert str::contains(markdown, "\n    resource r(a: bool)\n");
-}
-
 fn write_iface(ctxt: ctxt, doc: doc::ifacedoc) {
     write_common(ctxt, doc.desc(), doc.sections());
     write_methods(ctxt, doc.methods);

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

@@ -9,11 +9,11 @@ fn mk_pass() -> pass {
               doc::consttag(_) { 0 }
               doc::tytag(_) { 1 }
               doc::enumtag(_) { 2 }
-              doc::ifacetag(_) { 4 }
-              doc::impltag(_) { 5 }
-              doc::fntag(_) { 6 }
-              doc::modtag(_) { 7 }
-              doc::nmodtag(_) { 8 }
+              doc::ifacetag(_) { 3 }
+              doc::impltag(_) { 4 }
+              doc::fntag(_) { 5 }
+              doc::modtag(_) { 6 }
+              doc::nmodtag(_) { 7 }
             }
         }
 
@@ -38,10 +38,10 @@ fn test() {
         assert doc.cratemod().items[0].name() == "iconst";
         assert doc.cratemod().items[1].name() == "itype";
         assert doc.cratemod().items[2].name() == "ienum";
-        assert doc.cratemod().items[4].name() == "iiface";
-        assert doc.cratemod().items[5].name() == "iimpl";
-        assert doc.cratemod().items[6].name() == "ifn";
-        assert doc.cratemod().items[7].name() == "imod";
-        assert doc.cratemod().items[8].name() == "inmod";
+        assert doc.cratemod().items[3].name() == "iiface";
+        assert doc.cratemod().items[4].name() == "iimpl";
+        assert doc.cratemod().items[5].name() == "ifn";
+        assert doc.cratemod().items[6].name() == "imod";
+        assert doc.cratemod().items[7].name() == "inmod";
     }
 }

branches/snap-stage3/src/test/bench/task-perf-alloc-unwind.rs

@@ -78,7 +78,7 @@ fn recurse_or_fail(depth: int, st: option<st>) {
                 tuple: (@cons((), first(st.tuple)),
                         ~cons((), @*second(st.tuple))),
                 vec: st.vec + [@cons((), st.vec.last())],
-                res: r(@cons((), *(st.res)))
+                res: r(@cons((), st.res._l))
             })
           }
         };