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 | |
| 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
| -rw-r--r-- | src/doc/grammar.md | 2 | ||||
| -rw-r--r-- | src/doc/reference.md | 2 | ||||
| -rw-r--r-- | src/libsyntax/parse/token.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/reserved-become.rs (renamed from src/test/parse-fail/reserved-be.rs) | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/doc/grammar.md b/src/doc/grammar.md index 59a1c8f828b..b4e023c2039 100644 --- a/src/doc/grammar.md +++ b/src/doc/grammar.md @@ -157,7 +157,7 @@ token : simple_token | ident | literal | symbol | whitespace token ; | | | | | | |----------|----------|----------|----------|--------| -| abstract | alignof | as | be | box | +| abstract | alignof | as | become | box | | break | const | continue | crate | do | | else | enum | extern | false | final | | fn | for | if | impl | in | diff --git a/src/doc/reference.md b/src/doc/reference.md index 999efc95c0e..e5ad4f8200b 100644 --- a/src/doc/reference.md +++ b/src/doc/reference.md @@ -189,7 +189,7 @@ grammar as double-quoted strings. Other tokens have exact rules given. | | | | | | |----------|----------|----------|----------|---------| -| abstract | alignof | as | be | box | +| abstract | alignof | as | become | box | | break | const | continue | crate | do | | else | enum | extern | false | final | | fn | for | if | impl | in | 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"); diff --git a/src/test/parse-fail/reserved-be.rs b/src/test/compile-fail/reserved-become.rs index 386d53cc16e..82e9ebc10d1 100644 --- a/src/test/parse-fail/reserved-be.rs +++ b/src/test/compile-fail/reserved-become.rs @@ -1,4 +1,4 @@ -// Copyright 2012 The Rust Project Developers. See the COPYRIGHT +// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT // file at the top-level directory of this distribution and at // http://rust-lang.org/COPYRIGHT. // @@ -9,6 +9,6 @@ // except according to those terms. fn main() { - let be = 0; - //~^ ERROR `be` is a reserved keyword + let become = 0; + //~^ ERROR `become` is a reserved keyword } |