---

yaml
---
r: 28442
b: refs/heads/try
c: df79026
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
-refs/heads/try: 2aa67e9aa9a29e9302337dd56313c4a2023a8900
+refs/heads/try: df790261696fb85c0cc4dee3950d7ba89804eb49
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df

branches/try/src/libsyntax/parse/token.rs

@@ -415,7 +415,6 @@ fn restricted_keyword_table() -> HashMap<~str, ()> {
         ~"fail", ~"fn",
         ~"impl",
         ~"priv", ~"pub",
-        ~"return",
         ~"struct",
         ~"unsafe"
     ];
@@ -438,7 +437,7 @@ fn strict_keyword_table() -> HashMap<~str, ()> {
         ~"let", ~"log", ~"loop",
         ~"match", ~"mod", ~"move", ~"mut",
         ~"pure",
-        ~"ref",
+        ~"ref", ~"return",
         ~"true", ~"trait", ~"type",
         ~"unchecked", ~"use",
         ~"while"

branches/try/src/rustdoc/rustdoc.rs

@@ -14,23 +14,6 @@ fn run_passes(
     doc: doc::doc,
     passes: ~[pass]
 ) -> doc::doc {
-
-    #[doc(
-        brief =
-        "Run a series of passes over the document",
-        args(
-            srv =
-            "The AST service to provide to the passes",
-            doc =
-            "The document to transform",
-            passes =
-            "The list of passes used to transform the document"
-        ),
-        return =
-        "The transformed document that results from folding the \
-         original through each pass"
-    )];
-
     let mut passno = 0;
     do vec::foldl(doc, passes) |doc, pass| {
         log(debug, fmt!("pass #%d", passno));