---

yaml
---
r: 30433
b: refs/heads/incoming
c: 528373b
h: refs/heads/master
i:
  30431: bd18dca
v: v3

Author: brson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: f53c2948aa6bd0ffc47527e977cb278d48467a75
+refs/heads/incoming: 528373b79b63ef9104325bb71cfcf39752352b80
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

@@ -382,12 +382,7 @@ fn keyword_table() -> hashmap<~str, ()> {
 fn contextual_keyword_table() -> hashmap<~str, ()> {
     let words = str_hash();
     let keys = ~[
-        ~"as",
-        ~"else",
-        ~"move",
-        ~"priv", ~"pub",
         ~"self", ~"static",
-        ~"use"
     ];
     for keys.each |word| {
         words.insert(word, ());
@@ -412,6 +407,7 @@ fn contextual_keyword_table() -> hashmap<~str, ()> {
 fn restricted_keyword_table() -> hashmap<~str, ()> {
     let words = str_hash();
     let keys = ~[
+        ~"as",
         ~"assert",
         ~"break",
         ~"const", ~"copy",
@@ -421,11 +417,11 @@ fn restricted_keyword_table() -> hashmap<~str, ()> {
         ~"if", ~"impl", ~"import",
         ~"let", ~"log", ~"loop",
         ~"match", ~"mod", ~"move", ~"mut",
-        ~"pure",
+        ~"priv", ~"pub", ~"pure",
         ~"ref", ~"return",
         ~"struct",
         ~"true", ~"trait", ~"type",
-        ~"unchecked", ~"unsafe",
+        ~"unchecked", ~"unsafe", ~"use",
         ~"while"
     ];
     for keys.each |word| {