Skip to content

Commit ebe5b0e

Browse files
committed
---
yaml --- r: 32383 b: refs/heads/dist-snap c: ab9cf45 h: refs/heads/master i: 32381: 1a5c0e9 32379: bad9a30 32375: 577d68b 32367: 15b0295 32351: f1c55c2 32319: 8460f32 32255: 5359ee3 v: v3
1 parent 418cba6 commit ebe5b0e

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
99
refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
10-
refs/heads/dist-snap: 8415515cbee679ddd2a17bbb152da10f1d947359
10+
refs/heads/dist-snap: ab9cf45a7ce839cee58e745d8b3472db2e707731
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,6 @@ fn contextual_keyword_table() -> hashmap<~str, ()> {
386386
~"as",
387387
~"else",
388388
~"move",
389-
~"of",
390389
~"priv", ~"pub",
391390
~"self", ~"send", ~"static",
392391
~"use",
@@ -417,7 +416,7 @@ fn restricted_keyword_table() -> hashmap<~str, ()> {
417416
let keys = ~[
418417
~"again", ~"assert",
419418
~"break",
420-
~"check", ~"const", ~"copy",
419+
~"const", ~"copy",
421420
~"do", ~"drop",
422421
~"else", ~"enum", ~"export", ~"extern",
423422
~"fail", ~"false", ~"fn", ~"for",

0 commit comments

Comments
 (0)