diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-02-10 08:41:30 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-02-10 08:41:30 -0800 |
| commit | 6cf75ca05aba0874ad78b62d6ead6f20f00d5d9f (patch) | |
| tree | ee52c79ad5ebf8fc67bd8b08e0d44bacc3569c8f /src/libsyntax/parse | |
| parent | dff8182ed259e28ecc0b8ce1a49cf7821332f242 (diff) | |
| parent | 8f7c2d518d1892c98d2ef57992a65669834f24e2 (diff) | |
| download | rust-6cf75ca05aba0874ad78b62d6ead6f20f00d5d9f.tar.gz rust-6cf75ca05aba0874ad78b62d6ead6f20f00d5d9f.zip | |
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
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/token.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index 45f4f044ea4..4c988164528 100644 --- 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"); |