about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--src/libsyntax/parse/token.rs3
-rwxr-xr-xsrc/rustdoc/rustdoc.rs17
2 files changed, 1 insertions, 19 deletions
diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs
index a96b2be6c09..6f756c946a4 100644
--- a/src/libsyntax/parse/token.rs
+++ b/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"
diff --git a/src/rustdoc/rustdoc.rs b/src/rustdoc/rustdoc.rs
index 0b1750348e1..508497b9927 100755
--- a/src/rustdoc/rustdoc.rs
+++ b/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));