---

yaml
---
r: 12631
b: refs/heads/master
c: 08d0707
h: refs/heads/master
i:
  12629: 039ceda
  12627: e4b4401
  12623: 100e83c
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 98ac8d46251cbe8807e5db54e8f0c2f23b7288d5
+refs/heads/master: 08d0707556e5aafed0368350e4c1396b2507ece7
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/librustsyntax/parse/token.rs

@@ -213,7 +213,6 @@ fn keyword_table() -> hashmap<str, ()> {
         "as",
         "bind",
         "else",
-        "false",
         "implements",
         "move",
         "of",
@@ -222,7 +221,6 @@ fn keyword_table() -> hashmap<str, ()> {
         "send",
         "static",
         "to",
-        "true",
         "use",
         "with"
     ];
@@ -241,9 +239,9 @@ fn bad_expr_word_table() -> hashmap<str, ()> {
     let words = str_hash();
     let keys = ["alt", "assert", "be", "break", "check", "claim",
                 "class", "const", "cont", "copy", "crust", "do", "else",
-                "enum", "export", "fail", "fn", "for", "if",  "iface",
-                "impl", "import", "let", "log", "loop", "mod",
-                "mut", "native", "new", "pure", "resource",
+                "enum", "export", "fail", "false", "fn", "for", "if",
+                "iface", "impl", "import", "let", "log", "loop", "mod",
+                "mut", "native", "new", "pure", "resource", "true",
                 "ret", "trait", "type", "unchecked", "unsafe", "while"];
     for keys.each {|word|
         words.insert(word, ());

trunk/src/test/compile-fail/bad-value-ident-false.rs

@@ -0,0 +1,2 @@
+fn false() { } //! ERROR found `false` in expression position
+fn main() { }

trunk/src/test/compile-fail/bad-value-ident-true.rs

@@ -0,0 +1,2 @@
+fn true() { } //! ERROR found `true` in expression position
+fn main() { }