Skip to content

Commit 501c4ee

Browse files
committed
---
yaml --- r: 15637 b: refs/heads/try c: 08d0707 h: refs/heads/master i: 15635: 0c6e962 v: v3
1 parent 78c5350 commit 501c4ee

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
5-
refs/heads/try: 98ac8d46251cbe8807e5db54e8f0c2f23b7288d5
5+
refs/heads/try: 08d0707556e5aafed0368350e4c1396b2507ece7
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/librustsyntax/parse/token.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,6 @@ fn keyword_table() -> hashmap<str, ()> {
213213
"as",
214214
"bind",
215215
"else",
216-
"false",
217216
"implements",
218217
"move",
219218
"of",
@@ -222,7 +221,6 @@ fn keyword_table() -> hashmap<str, ()> {
222221
"send",
223222
"static",
224223
"to",
225-
"true",
226224
"use",
227225
"with"
228226
];
@@ -241,9 +239,9 @@ fn bad_expr_word_table() -> hashmap<str, ()> {
241239
let words = str_hash();
242240
let keys = ["alt", "assert", "be", "break", "check", "claim",
243241
"class", "const", "cont", "copy", "crust", "do", "else",
244-
"enum", "export", "fail", "fn", "for", "if", "iface",
245-
"impl", "import", "let", "log", "loop", "mod",
246-
"mut", "native", "new", "pure", "resource",
242+
"enum", "export", "fail", "false", "fn", "for", "if",
243+
"iface", "impl", "import", "let", "log", "loop", "mod",
244+
"mut", "native", "new", "pure", "resource", "true",
247245
"ret", "trait", "type", "unchecked", "unsafe", "while"];
248246
for keys.each {|word|
249247
words.insert(word, ());
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
fn false() { } //! ERROR found `false` in expression position
2+
fn main() { }
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
fn true() { } //! ERROR found `true` in expression position
2+
fn main() { }

0 commit comments

Comments
 (0)