---

yaml
---
r: 32503
b: refs/heads/dist-snap
c: ef9aa80
h: refs/heads/master
i:
  32501: cd9787e
  32499: 9951bc6
  32495: 400305f
v: v3

Author: brson

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 233e595b617d3eb1fe50b9aba0b4844369d42398
+refs/heads/dist-snap: ef9aa80438c61c1080269ca8b379decc96b49dd5
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/libsyntax/parse/token.rs

@@ -411,22 +411,13 @@ fn contextual_keyword_table() -> hashmap<~str, ()> {
 fn restricted_keyword_table() -> hashmap<~str, ()> {
     let words = str_hash();
     let keys = ~[
-        ~"as",
-        ~"assert",
-        ~"break",
         ~"const", ~"copy",
-        ~"do", ~"drop",
-        ~"else", ~"enum", ~"export", ~"extern",
-        ~"fail", ~"false", ~"fn", ~"for",
-        ~"if", ~"impl", ~"import",
-        ~"let", ~"log", ~"loop",
-        ~"match", ~"mod", ~"move", ~"mut",
-        ~"priv", ~"pub", ~"pure",
-        ~"ref", ~"return",
+        ~"fail", ~"fn",
+        ~"impl",
+        ~"priv", ~"pub",
+        ~"return",
         ~"struct",
-        ~"true", ~"trait", ~"type",
-        ~"unchecked", ~"unsafe", ~"use",
-        ~"while"
+        ~"unsafe"
     ];
     for keys.each |word| {
         words.insert(word, ());
@@ -438,6 +429,19 @@ fn restricted_keyword_table() -> hashmap<~str, ()> {
 fn strict_keyword_table() -> hashmap<~str, ()> {
     let words = str_hash();
     let keys = ~[
+        ~"as", ~"assert",
+        ~"break",
+        ~"do", ~"drop",
+        ~"else", ~"enum", ~"export", ~"extern",
+        ~"false", ~"for",
+        ~"if", ~"import",
+        ~"let", ~"log", ~"loop",
+        ~"match", ~"mod", ~"move", ~"mut",
+        ~"pure",
+        ~"ref",
+        ~"true", ~"trait", ~"type",
+        ~"unchecked", ~"use",
+        ~"while"
     ];
     for keys.each |word| {
         words.insert(word, ());

branches/dist-snap/src/test/compile-fail/bad-value-ident-false.rs

@@ -1,2 +1,2 @@
-fn false() { } //~ ERROR found `false` in restricted position
+fn false() { } //~ ERROR found `false` in ident position
 fn main() { }

branches/dist-snap/src/test/compile-fail/bad-value-ident-true.rs

@@ -1,2 +1,2 @@
-fn true() { } //~ ERROR found `true` in restricted position
+fn true() { } //~ ERROR found `true` in ident position
 fn main() { }

branches/dist-snap/src/test/compile-fail/keyword.rs

@@ -0,0 +1,3 @@
+mod break {
+    //~^ ERROR found `break` in ident position
+}

branches/dist-snap/src/test/compile-fail/restricted-keyword1.rs

@@ -1,7 +1,7 @@
-// error-pattern:found `let` in restricted position
+// error-pattern:found `fail` in restricted position
 
 fn main() {
     match true {
-      {let} { }
+      {fail} { }
     }
 }

branches/dist-snap/src/test/compile-fail/restricted-keyword2.rs

@@ -1,5 +1,5 @@
-// error-pattern:found `let` in restricted position
+// error-pattern:found `fail` in restricted position
 
 fn main() {
-    enum let = int;
+    enum fail = int;
 }

branches/dist-snap/src/test/run-pass/module-polymorphism4-files/trait.rs renamed to branches/dist-snap/src/test/run-pass/module-polymorphism4-files/trait_.rs

@@ -7,8 +7,8 @@ mod cat {
     #[path = "cat.rs"]
     mod inst;
 
-    #[path = "trait.rs"]
-    mod trait;
+    #[path = "trait_.rs"]
+    mod trait_;
 
 }
 
@@ -20,7 +20,7 @@ mod dog {
     #[path = "dog.rs"]
     mod inst;
 
-    #[path = "trait.rs"]
-    mod trait;
+    #[path = "trait_.rs"]
+    mod trait_;
 
 }