Skip to content

Commit df79026

Browse files
committed
Promote 'return' from a restricted keyword to a strict keyword
1 parent 2aa67e9 commit df79026

File tree

2 files changed

+1
-19
lines changed

2 files changed

+1
-19
lines changed

src/libsyntax/parse/token.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,6 @@ fn restricted_keyword_table() -> HashMap<~str, ()> {
415415
~"fail", ~"fn",
416416
~"impl",
417417
~"priv", ~"pub",
418-
~"return",
419418
~"struct",
420419
~"unsafe"
421420
];
@@ -438,7 +437,7 @@ fn strict_keyword_table() -> HashMap<~str, ()> {
438437
~"let", ~"log", ~"loop",
439438
~"match", ~"mod", ~"move", ~"mut",
440439
~"pure",
441-
~"ref",
440+
~"ref", ~"return",
442441
~"true", ~"trait", ~"type",
443442
~"unchecked", ~"use",
444443
~"while"

src/rustdoc/rustdoc.rs

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,6 @@ fn run_passes(
1414
doc: doc::doc,
1515
passes: ~[pass]
1616
) -> doc::doc {
17-
18-
#[doc(
19-
brief =
20-
"Run a series of passes over the document",
21-
args(
22-
srv =
23-
"The AST service to provide to the passes",
24-
doc =
25-
"The document to transform",
26-
passes =
27-
"The list of passes used to transform the document"
28-
),
29-
return =
30-
"The transformed document that results from folding the \
31-
original through each pass"
32-
)];
33-
3417
let mut passno = 0;
3518
do vec::foldl(doc, passes) |doc, pass| {
3619
log(debug, fmt!("pass #%d", passno));

0 commit comments

Comments
 (0)