rollup merge of #21918: ranma42/replace-be

Conflicts: src/test/compile-fail/reserved-be.rs src/test/compile-fail/reserved-become.rs src/test/parse-fail/reserved-be.rs
2015-02-10 08:41:30 -08:00
parent dff8182ed2 8f7c2d518d
commit 6cf75ca05a
4 changed files with 6 additions and 6 deletions
--- a/src/libsyntax/parse/token.rs
+++ b/src/libsyntax/parse/token.rs
@@ -562,7 +562,7 @@ declare_special_idents_and_keywords! {
        (45,                         Where,      "where");
        'reserved:
        (46,                         Alignof,    "alignof");
-        (47,                         Be,         "be");
+        (47,                         Become,     "become");
        (48,                         Offsetof,   "offsetof");
        (49,                         Priv,       "priv");
        (50,                         Pure,       "pure");